Commit Graph

428 Commits

Author SHA1 Message Date
Dan Brown 98d4bf4486
Merge branch 'bug-650' of git://github.com/Abijeet/BookStack into Abijeet-bug-650 2018-01-28 14:15:31 +00:00
Dan Brown 9bbef3a3dd
Added drawio abilities to markdown editor 2018-01-20 20:40:21 +00:00
Dan Brown 56264551e7
Added drawing icon and made drawio disablable 2018-01-20 15:00:54 +00:00
Abijeet f2c62765ca Adds overflow:auto to popup content to allow it to scroll in lower res.
Fixes #650

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-01-06 01:41:06 +05:30
Dan Brown 141bf22725
Updated book view change to PATCH + other amends
Moved toggle to right of header bar and added unique text and icon for
each view type.

Removed old profile setting to keep things clean.
2017-12-29 16:49:03 +00:00
Dan Brown 1aa4d0dc59
Merge branch 'feature-613' of git://github.com/Abijeet/BookStack into Abijeet-feature-613 2017-12-29 16:25:15 +00:00
Dan Brown afe781bc39
Enabled session in 404 responses
Fixes #634
2017-12-28 13:19:02 +00:00
Abijeet 0d4db603a4 Adds button to allow users to toggle the book view via the books list page.
Closes #613

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2017-12-26 12:38:16 +05:30
Dan Brown 3ed5426315
Moved book cover image input into collapsible section
Prevent extra friction when creating a new book and makes it easier to
skip if grid view is not in use
2017-12-10 13:46:50 +00:00
Dan Brown d7edc389a6
Enabled custom HTML head content to work within editors
Closes #562
2017-12-08 11:52:43 +00:00
Dan Brown a5e49f642b
Merge branch 'disable-comments' of git://github.com/Abijeet/BookStack into Abijeet-disable-comments 2017-12-07 19:15:26 +00:00
Dan Brown 6ee35f55cc
Refactored image picker to js component
Also adjusted default cover image size
2017-12-06 17:32:29 +00:00
Dan Brown 261e57fc4e
Converted books view setting to user setting
Also cleaned up/moved new CSS and removed redundant new book methods.
2017-12-06 16:34:26 +00:00
Dan Brown bc1302a8d8
Merge branch 'BookStackApp-master' of git://github.com/OsmosysSoftware/BookStack into OsmosysSoftware-BookStackApp-master 2017-12-06 15:52:54 +00:00
Abijeet 6bb7b5465f Added code in the settings to disable comments. Based on that hiding the comments section on the page display. 2017-11-16 00:05:24 +05:30
10bass 46fc0e5026 Fix ajax tag suggestion for subdir installs
tag suggest URLs were hardcoded to /ajax in blade template. Wrapped them in baseUrl()
2017-10-16 18:24:47 -04:00
Dan Brown 79c3a07e9a
Fixed include syntax erroring within vue
Fixes #553
2017-10-15 18:20:13 +01:00
Dan Brown 61fad6a665
Finished migration of last angular code 2017-09-30 13:27:08 +01:00
Dan Brown 9ca22976c3
Migrated editor toolbox, No more directives! 2017-09-24 18:30:21 +01:00
Dan Brown 9e2934fe17
Migrated editor inputs to non-angular JS 2017-09-23 12:24:06 +01:00
Dan Brown 0c4ddf16a5
Moved details card above book nav 2017-09-20 21:32:19 +01:00
Dan Brown 09936566dd
Upgrade tinymce version 2017-09-20 20:26:34 +01:00
Dan Brown 874386ceab
Used trans_choice on profile view
Closes #417
2017-09-10 13:43:08 +01:00
Dan Brown 0275d2ad58
Added loading icons, Added comment activity 2017-09-09 17:06:30 +01:00
Dan Brown 41f56e659d
Added comment reply and delete confirmation.
Also fixed local_id bug
Added component helpers
Added global scroll & Highlight helpers
2017-09-09 15:56:24 +01:00
Bharadwaja G e02fcbe983 Added Book cover image description in all languages. 2017-09-05 12:46:31 +05:30
Bharadwaja G c1a1bc0135 Books grid view 2017-09-04 20:27:52 +05:30
Dan Brown fea5630ea4
Made some changes to the comment system
Changed to be rendered server side along with page content.
Changed deletion to fully delete comments from the database.
Added 'local_id' to comments for referencing.
Updated reply system to be non-nested (Incomplete)
Made database comment format entity-agnostic to be more future proof.
Updated designs of comment sections.
2017-09-03 16:37:51 +01:00
Dan Brown 756ee0b172
Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master 2017-09-02 17:36:58 +01:00
Dan Brown 1c9ecc3edd
Reformatted sortable toolbox components 2017-09-02 15:06:52 +01:00
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
Abijeet 76ae5c7398 Removes some unused code. 2017-08-23 01:04:36 +05:30
Abijeet 1f6994b62c Added code for permissions, removed unnecessary code. 2017-08-20 21:26:44 +05:30
Abijeet 47d82a1ac2 Merge branch 'master' of https://github.com/BookStackApp/BookStack
Conflicts:
	resources/assets/js/vues/vues.js
2017-08-20 20:35:56 +05:30
Abijeet ed375bfaf7 Refactored Angular code to instead use VueJS, left with permissions, testing and load testing. 2017-08-20 20:21:27 +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
Abijeet e155c52256 #47 - Fixes a few issues with the code. 2017-06-10 22:55:36 +05:30
Abijeet 4efe3b41da #47 - Added translations for other language files using Google translate. 2017-06-10 15:21:28 +05:30
Abijeet e647ec22b1 #47 - Adds direct linking to comments. 2017-06-08 01:14:53 +05:30
Abijeet 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
Abijeet 5bd9da6054 #47 - Adds various translations in English, and a few code improvements. 2017-06-06 01:46:59 +05:30
Abijeet 7c6fe8c4e2 #47 - Changes the location of the reply and edit comment box. 2017-06-05 00:20:37 +05:30
Abijeet 689d1eb082 #47 - Adds a cancel button for edit and reply button. 2017-06-04 20:43:56 +05:30
Abijeet 06d75e1804 #47 - Updates the total comments when a comment is added. 2017-06-04 20:12:01 +05:30
Abijeet 9558f84b97 #47 - Adds functionality to delete a comment. Also reduces the number of watchers. 2017-06-04 18:52:44 +05:30
Abijeet 2fd421b115 #47 - Adds comment level permissions to the front-end. 2017-06-04 11:17:14 +05:30
Abijeet 0bda5554dd Getting the latest changes 2017-06-04 10:20:01 +05:30
Abijeet 860d4d4be5 #47 - Changes the way we are handling fetching of data for the comment section. 2017-05-30 09:02:47 +05:30
Dan Brown e5fc6bf5fa
Moved from highlight.js to codemirror 2017-05-28 13:16:21 +01:00
Abijeet 9a97995f18 #47 Displays the time for comments and border bottom for sub comments. 2017-05-25 08:04:19 +05:30
Abijeet 0ff5aad9c0 #47 Hides the reply button based if comments are 2 levels deep. 2017-05-24 07:02:11 +05:30
Abijeet 03e5d61798 #47 Implements the reply and edit functionality for comments. 2017-05-16 00:40:14 +05:30