Bharadwaja G
|
6200948eec
|
Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master
Conflicts:
app/Http/Controllers/BookController.php
resources/lang/en/common.php
resources/views/books/create.blade.php
resources/views/books/form.blade.php
resources/views/books/index.blade.php
resources/views/users/edit.blade.php
tests/Entity/EntityTest.php
|
2017-08-29 12:19:00 +05:30 |
Dan Brown
|
55759bd22a
|
Added ability to set a page to view on the homepage.
Relates to #372 and #126
|
2017-08-28 13:38:32 +01:00 |
|
Dan Brown
|
baea92b206
|
Migrated entity selector out of angular
|
2017-08-27 14:31:34 +01:00 |
|
Bharadwaja G
|
7f902e41c7
|
Resolved conflicts
|
2017-08-24 12:21:43 +05:30 |
|
Dan Brown
|
28a9bd514f
|
Updated header design
|
2017-08-19 15:33:22 +01:00 |
|
Dan Brown
|
ab07f7df6c
|
Converted image manager into vue component
|
2017-08-09 21:33:00 +01:00 |
|
Dan Brown
|
2a069880cd
|
Converted jQuery bits into raw JS components
|
2017-08-06 21:08:03 +01:00 |
Abijeet
|
f37509062e
|
Merge pull request #8 from OsmosysSoftware/feature-181
Issue 181
|
2017-07-12 18:41:35 +05:30 |
Nilesh Deepak
|
7a724f9134
|
Updated modifications.
|
2017-07-12 13:44:37 +05:30 |
|
Dan Brown
|
de6d8a811c
|
Added quick lang-selection options to code editor
|
2017-07-01 15:50:28 +01:00 |
|
Dan Brown
|
968e7b8b72
|
Finished off main functionality of custom tinymce code editor
|
2017-07-01 13:23:46 +01:00 |
|
Dan Brown
|
c9700e38e2
|
Created solution for JS translations
Also tidied up existing components and JS
|
2016-12-31 14:27:40 +00:00 |
|
Dan Brown
|
05316c90ba
|
converted image picker to blade-based component
Also updated some other JS translations
|
2016-12-24 15:21:19 +00:00 |
|
Dan Brown
|
242dc21876
|
Converted toggle switch into a blade/jquery template
|
2016-12-22 19:41:32 +00:00 |