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
|
d8e1f52ddd
|
Made new sidebar layout responsive
|
2017-08-27 15:16:51 +01:00 |
|
Dan Brown
|
baea92b206
|
Migrated entity selector out of angular
|
2017-08-27 14:31:34 +01:00 |
|
Dan Brown
|
cfc05c1b22
|
Improved primary color control in settings
|
2017-08-27 12:59:56 +01:00 |
|
Dan Brown
|
4cb4c9e568
|
Updated remaining views to 2017 design update.
Also fixed issue with duplicate confirmation email.
|
2017-08-26 17:17:04 +01:00 |
|
Dan Brown
|
36f524a354
|
Updated page view styles to align with 2017 update
|
2017-08-26 15:41:33 +01:00 |
|
Dan Brown
|
b60d2190ac
|
Updated error views for redesign
|
2017-08-26 14:53:23 +01:00 |
|
Dan Brown
|
2f8b8c580d
|
Resolved current failing tests
|
2017-08-26 14:41:46 +01:00 |
|
Dan Brown
|
5187d3fa78
|
Updated chapter views with new design
|
2017-08-26 14:36:48 +01:00 |
|
Dan Brown
|
8fcbe44d3e
|
Updated styles for auth and books views.
Also added sourcemaps to gulp sass build
|
2017-08-26 13:24:55 +01:00 |
|
Bharadwaja G
|
7f902e41c7
|
Resolved conflicts
|
2017-08-24 12:21:43 +05:30 |
|
Dan Brown
|
3da8c01c1f
|
Rolled out new design further
|
2017-08-20 13:57:25 +01:00 |
|
Dan Brown
|
295f520f21
|
Started design update
|
2017-08-19 18:32:24 +01:00 |
|
Dan Brown
|
28a9bd514f
|
Updated header design
|
2017-08-19 15:33:22 +01:00 |
|
Dan Brown
|
039ee5d06c
|
Aligned entity dash name and fixed chapter toggle on dash
|
2017-08-19 14:04:38 +01:00 |
|
Dan Brown
|
afc66b3c3d
|
Migrated attachment manager to vue
|
2017-08-19 13:55:56 +01:00 |
|
Dan Brown
|
d3e4a1a6f9
|
Converted tag autosuggestion to vue component
|
2017-08-13 13:25:30 +01:00 |
|
Dan Brown
|
b023699f1b
|
Converted tag manager to be fully vue based
|
2017-08-13 11:50:40 +01:00 |
|
Dan Brown
|
f338dbe3f8
|
Started vueifying tag system
|
2017-08-10 20:11:25 +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 |
|
Dan Brown
|
e9831a7507
|
Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master
|
2017-08-01 19:24:33 +01:00 |
|
Dan Brown
|
21247e10d0
|
Reverted travis changes and added html escaping
|
2017-07-27 16:28:23 +01:00 |
|
Dan Brown
|
c1fc06ae34
|
Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master
|
2017-07-27 16:20:38 +01:00 |
|
Dan Brown
|
ec83f83017
|
Added breadcrumbs to pages in entity select
Fixes #391
|
2017-07-27 16:10:58 +01:00 |
|
Dan Brown
|
433cb9b3b2
|
Improved breadcrumb responsiveness
Closes #426
|
2017-07-22 15:20:36 +01:00 |
|
Dan Brown
|
b12e2ceada
|
Added included content into page's text view
Allows rendered content to be shown in listings and used in searches.
Also prevented angular tags in content being parsed in listings.
Fixes #442
|
2017-07-22 14:21:56 +01:00 |
Nilesh Deepak
|
dd4d2f4696
|
Resolves book heading issues in grid view.
|
2017-07-15 16:15:45 +05:30 |
Clément Blanco
|
67bc7007aa
|
Support new lines for book/chapter descriptions
Avoid ignoring new lines when renderring the book/chapter descriptions on their respective detailed views.
|
2017-07-14 16:05:46 +01:00 |
Abijeet
|
21a8df78ee
|
Merge pull request #9 from OsmosysSoftware/feature-181
Feature 181
|
2017-07-13 15:50:43 +05:30 |
|
Nilesh Deepak
|
7f8351e044
|
Removed avatar class from form.blade.php
|
2017-07-13 15:20:53 +05:30 |
|
Nilesh Deepak
|
b0ba1a43a9
|
2. Added classed col-xs-6 col-sm-4 col-md-4 col-lg-3 in grid-item.blade.php
5. Added <div class="row"> in index.blade.php
|
2017-07-13 12:24:47 +05:30 |
|
Abijeet
|
f37509062e
|
Merge pull request #8 from OsmosysSoftware/feature-181
Issue 181
|
2017-07-12 18:41:35 +05:30 |
|
Nilesh Deepak
|
24ee78ccd8
|
Update.
|
2017-07-12 18:04:06 +05:30 |
|
Nilesh Deepak
|
7a724f9134
|
Updated modifications.
|
2017-07-12 13:44:37 +05:30 |
|
Abijeet
|
844976c85b
|
Revert "Revert "Bookstack grid view.""
|
2017-07-12 11:40:50 +05:30 |
|
Nilesh Deepak
|
d84315fff8
|
Indentation correction.
|
2017-07-07 17:06:08 +05:30 |
|
Nilesh Deepak
|
144a6e469d
|
Updated cover image upload and delete function.
|
2017-07-07 16:29:38 +05:30 |
|
Nilesh Deepak
|
c5f11e4516
|
Fixed pagination on change of display type.
|
2017-07-06 10:05:11 +05:30 |
|
Nilesh Deepak
|
f51db4b9f6
|
Resolved responsiveness issues
|
2017-07-05 19:58:52 +05:30 |
|
Nilesh Deepak
|
5b736c3b36
|
Updated views to support different languages.
|
2017-07-05 16:12:29 +05:30 |
|
Nilesh Deepak
|
d089eaf754
|
Changes in User edit profile page.
|
2017-07-05 12:32:39 +05:30 |
|
Nilesh Deepak
|
947c58f227
|
Applied required changes in BookStack.
|
2017-07-05 12:09:01 +05:30 |
|
Nilesh Deepak
|
fdf139edb2
|
Changing column size for responsiveness
|
2017-07-04 15:04:57 +05:30 |
|
Dan Brown
|
4db2c274e2
|
Prevent empty-state actions visible without permission.
Fixes #411
|
2017-07-02 15:59:40 +01:00 |
|
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 |
|
Nilesh Deepak
|
af72f0d490
|
Bookstack grid view.
|
2017-06-29 18:54:04 +05:30 |
Abijeet
|
fd50efb503
|
#47 - Putting the comments right under the page.
|
2017-06-11 11:41:33 +05:30 |