Commit Graph

1073 Commits

Author SHA1 Message Date
2a069880cd Converted jQuery bits into raw JS components 2017-08-06 21:08:03 +01:00
e9831a7507 Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master 2017-08-01 19:24:33 +01:00
21247e10d0 Reverted travis changes and added html escaping 2017-07-27 16:28:23 +01:00
c1fc06ae34 Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master 2017-07-27 16:20:38 +01:00
ec83f83017 Added breadcrumbs to pages in entity select
Fixes #391
2017-07-27 16:10:58 +01:00
433cb9b3b2 Improved breadcrumb responsiveness
Closes #426
2017-07-22 15:20:36 +01:00
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
dd4d2f4696 Resolves book heading issues in grid view. 2017-07-15 16:15:45 +05:30
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
21a8df78ee Merge pull request #9 from OsmosysSoftware/feature-181
Feature 181
2017-07-13 15:50:43 +05:30
7f8351e044 Removed avatar class from form.blade.php 2017-07-13 15:20:53 +05:30
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
f37509062e Merge pull request #8 from OsmosysSoftware/feature-181
Issue 181
2017-07-12 18:41:35 +05:30
24ee78ccd8 Update. 2017-07-12 18:04:06 +05:30
7a724f9134 Updated modifications. 2017-07-12 13:44:37 +05:30
844976c85b Revert "Revert "Bookstack grid view."" 2017-07-12 11:40:50 +05:30
d84315fff8 Indentation correction. 2017-07-07 17:06:08 +05:30
144a6e469d Updated cover image upload and delete function. 2017-07-07 16:29:38 +05:30
c5f11e4516 Fixed pagination on change of display type. 2017-07-06 10:05:11 +05:30
f51db4b9f6 Resolved responsiveness issues 2017-07-05 19:58:52 +05:30
5b736c3b36 Updated views to support different languages. 2017-07-05 16:12:29 +05:30
d089eaf754 Changes in User edit profile page. 2017-07-05 12:32:39 +05:30
947c58f227 Applied required changes in BookStack. 2017-07-05 12:09:01 +05:30
fdf139edb2 Changing column size for responsiveness 2017-07-04 15:04:57 +05:30
4db2c274e2 Prevent empty-state actions visible without permission.
Fixes #411
2017-07-02 15:59:40 +01:00
de6d8a811c Added quick lang-selection options to code editor 2017-07-01 15:50:28 +01:00
968e7b8b72 Finished off main functionality of custom tinymce code editor 2017-07-01 13:23:46 +01:00
af72f0d490 Bookstack grid view. 2017-06-29 18:54:04 +05:30
fd50efb503 #47 - Putting the comments right under the page. 2017-06-11 11:41:33 +05:30
e155c52256 #47 - Fixes a few issues with the code. 2017-06-10 22:55:36 +05:30
4efe3b41da #47 - Added translations for other language files using Google translate. 2017-06-10 15:21:28 +05:30
e647ec22b1 #47 - Adds direct linking to comments. 2017-06-08 01:14:53 +05:30
38fe756725 #47 - Fixes a couple of issues found during testing - delete not updating the UI, delete none not working properly. 2017-06-07 23:45:29 +05:30
5bd9da6054 #47 - Adds various translations in English, and a few code improvements. 2017-06-06 01:46:59 +05:30
7c6fe8c4e2 #47 - Changes the location of the reply and edit comment box. 2017-06-05 00:20:37 +05:30
689d1eb082 #47 - Adds a cancel button for edit and reply button. 2017-06-04 20:43:56 +05:30
06d75e1804 #47 - Updates the total comments when a comment is added. 2017-06-04 20:12:01 +05:30
9558f84b97 #47 - Adds functionality to delete a comment. Also reduces the number of watchers. 2017-06-04 18:52:44 +05:30
2fd421b115 #47 - Adds comment level permissions to the front-end. 2017-06-04 11:17:14 +05:30
0bda5554dd Getting the latest changes 2017-06-04 10:20:01 +05:30
860d4d4be5 #47 - Changes the way we are handling fetching of data for the comment section. 2017-05-30 09:02:47 +05:30
e5fc6bf5fa Moved from highlight.js to codemirror 2017-05-28 13:16:21 +01:00
9a97995f18 #47 Displays the time for comments and border bottom for sub comments. 2017-05-25 08:04:19 +05:30
0ff5aad9c0 #47 Hides the reply button based if comments are 2 levels deep. 2017-05-24 07:02:11 +05:30
03e5d61798 #47 Implements the reply and edit functionality for comments. 2017-05-16 00:40:14 +05:30
8b82753218 #47 - Gets rid of simplemde 2017-05-03 02:42:04 +05:30
3368fe42d8 Merge pull request #10 from BookStackApp/master
Latest changes
2017-05-03 01:41:08 +05:30
c3ea0d333e #47 - Adds functionality to display child comments. Also has some code towards the reply functionality. 2017-04-27 02:35:29 +05:30
82e2c523e6 Fixed chapter breadcrumbs and testing issues 2017-04-22 14:08:12 +01:00
a323b0d49c Allowed child entity permissions to override parent permissions
Updated elements of a page display and sidebar render to allow
child permissions to work even when parent entitites have permission
set. This allows a page with a 'view' permission to be viewable even
when the parent book or chapter is not viewable.

Fixes #366
2017-04-22 13:39:34 +01:00