Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,380 Commits 18 Branches 197 Tags 95 MiB
156c0a88e9
Commit Graph

297 Commits

Author SHA1 Message Date
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
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
1e41ccbc7a
Added ability to override codemirror theme 
Also cleaned codemirror file while there.
In referece to #455
 2017-09-02 13:34:37 +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
36f524a354
Updated page view styles to align with 2017 update 2017-08-26 15:41:33 +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
6920d6eef1 Fixes the comment check for linked comment. 2017-08-22 01:39:09 +05:30
Abijeet
b5cd3bff3c Added functionality to highlight a comment. 2017-08-22 01:31:11 +05:30
Abijeet
ac07cb41b6 Fixed formatting and added error messages. 2017-08-21 02:21:31 +05:30
Abijeet
e8fa58f201 Removed code from the directives. 2017-08-21 00:38:59 +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
703d579561 Refactored Angular code to instead use VueJS, left with permissions, testing and load testing. 2017-08-20 20:21:32 +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
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
a59d73de7b
Fixed bug causing image manager popup not to show 2017-08-07 19:32:31 +01:00
Dan Brown
1ac7618bb1
Updated clipboard lib reference and version used 2017-08-06 21:21:20 +01:00
Dan Brown
2a069880cd
Converted jQuery bits into raw JS components 2017-08-06 21:08:03 +01:00
Dan Brown
5e5928a8a6
Added vanilla JS component system 2017-08-06 18:01:49 +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
ac7a8a8e1e
Expanded the available editor shortcuts in both editors 
Adds formatting on ctrl+nums for everything on formats dropdown.
Closes #85.
 2017-07-27 19:07:58 +01:00
Dan Brown
164aea3a3a Merge pull request #448 from 10bass/subdir-search-fix 
Update search.js
 2017-07-27 16:17:57 +01:00
Dan Brown
5cd08ab2f5
Fixed custom plugin when developing 2017-07-27 15:43:17 +01:00
10bass
b4dcde252b Update search.js 
Trying to apply an exact match or tag would previously redirect to /search, regardless of the installation path.
 2017-07-24 20:06:15 -04:00
Dan Brown
bc067e9ad4
Updated dropdowns to hide after option click 
Fixes #429
 2017-07-22 14:03:06 +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
Abijeet
844976c85b Revert "Revert "Bookstack grid view."" 2017-07-12 11:40:50 +05:30
Nilesh Deepak
e88a06291e Updated toggle thumbnails function. 2017-07-05 16:09:20 +05:30
Nilesh Deepak
026de8c5ca Thumbnail toggle function. 2017-07-05 12:48:41 +05:30
Dan Brown
314d98abc3
Removed logs, Updated version, Fixed inconsistent subheader 2017-07-02 20:33:32 +01:00
Dan Brown
69c50b9b48
Migrated markdown editor actions to new cm editor 2017-07-02 19:35:13 +01:00
Dan Brown
d5d83da766
Added diff and sh code types 
Verified changes to ensure fixes #296.
 2017-07-01 16:10:52 +01:00
Dan Brown
de6d8a811c
Added quick lang-selection options to code editor 2017-07-01 15:50:28 +01:00
Dan Brown
a94844b6b7
Fixed code block selection and drag/drop issues 2017-07-01 15:38:11 +01:00
Dan Brown
968e7b8b72
Finished off main functionality of custom tinymce code editor 2017-07-01 13:23:46 +01:00
Dan Brown
c8be214ee0
Started tinymce code editor components 2017-06-17 15:07:55 +01:00
Dan Brown
2060cdb931
Added code highlighting syntax modes 2017-06-17 12:41:18 +01:00
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
218376a41c #47 - Fetching values from language files. 2017-06-08 01:30:43 +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
88f93f76dd
Updated the markdown editor to use codemirror as editor 
Improved scroll sync system to be smarter
 2017-05-28 16:02:46 +01:00
Dan Brown
e5fc6bf5fa
Moved from highlight.js to codemirror 2017-05-28 13:16:21 +01:00
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
Abijeet
8b82753218 #47 - Gets rid of simplemde 2017-05-03 02:42:04 +05:30
Abijeet Patro
3368fe42d8 Merge pull request #10 from BookStackApp/master 
Latest changes
 2017-05-03 01:41:08 +05:30
Dan Brown
92108d710d
Re-enabled html in markdown editor 
Fixes #378
 2017-04-29 16:10:38 +01:00
Abijeet
c3ea0d333e #47 - Adds functionality to display child comments. Also has some code towards the reply functionality. 2017-04-27 02:35:29 +05:30
Abijeet
8e2437498f Merge branch 'master' of https://github.com/Abijeet/BookStack 2017-04-19 01:23:27 +05:30
Abijeet
b3d4c199ae Merge branch 'master' of https://github.com/Abijeet/BookStack 
Conflicts:
	.gitignore
 2017-04-19 01:21:45 +05:30
Dan Brown
fde970ba59
Switched out markdown render 
Fixes #304.
Fixes #359.
 2017-04-17 12:21:10 +01:00
Dan Brown
1a09d88891
Added fade effect to page content highlighting 
Closes #314
 2017-04-16 16:46:55 +01:00
Dan Brown
544ece03a5 Merge pull request #360 from Abijeet/spellcheck-fix 
Fixes #354, Adds the spellchecker option
 2017-04-16 15:02:20 +01:00
Dan Brown
dcde599709
Added chapter search 
Migrated book search to vue-based system.
Updated old tag seached.
Made chapter page layout widths same as book page.
Closes #344
 2017-04-15 19:16:07 +01:00
Dan Brown
0e0945ef84
Finished off UI for search system 2017-04-15 15:04:30 +01:00
Dan Brown
ad125327c0
Migrated to custom gulp setup and conintue search interface 2017-04-14 18:47:33 +01:00
Abijeet
29a4110d8f Fixes #354, Adds the spellchecker option 
Uses the browser_spellchecker option documented here - https://www.tinymce.com/docs/configure/spelling/#browser_spellcheck
 2017-04-13 23:57:57 +05:30
Dan Brown
46f3d78c8a
Fixed entity type filter bug in new search system 2017-04-09 21:12:13 +01:00
Dan Brown
1338ae2fc3
Started search interface, Added in vue and moved fonts 2017-04-09 20:59:57 +01:00
Dan Brown
b0e849f413
Added checkbox sytax parsing to markdown lists 
Closes #319
 2017-02-25 13:16:26 +00:00
Dan Brown
56d58ad8e5
Updated pointer to be able to show includes 
Also fixed pointer copying on flash-blocked browsers
 2017-01-21 14:58:03 +00:00
Dan Brown
d8c5f72258
Updated issue template and added TinyMCE autolinking 
Closes #267
 2017-01-16 19:33:29 +00:00
Dan Brown
0bcf608e0b
Fixed page navigation with special chars in id 
Also made so it smooth-scrolls and uses app theme color.
Fixes #254
 2017-01-14 16:36:12 +00: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
Dan Brown
08c4b9ac7c
Standardised JS vars and imports/exports 2016-12-19 19:16:31 +00:00
Dan Brown
573357a08c
Extracted text from logic files 2016-12-04 16:51:39 +00:00
Dan Brown
e639600ba5
Renamed files to attachments 2016-11-12 14:12:26 +00:00
Dan Brown
672b15d36c
Fixed attachment base-url usage and non-existant images 
Images now self-delete if the original file does not exist.
Prevents simply getting non-fixable errors.

Also cleaned some JS.
 2016-11-12 12:41:34 +00:00
Dan Brown
ab468bac3c
Updated build and versioning system 
Added versioning file instead of using git tags
(Step towards removing git as a dependancy in the future)

Updated gulpfile to fit with verisioning system and cleaned
up node dependancies.

Fixes #108
 2016-10-30 17:44:00 +00:00
Dan Brown
30458405ce
Page Attachments - Improved UI, Now initially complete 
Closes #62
 2016-10-23 17:55:48 +01:00
Dan Brown
91220239e5
Added in attachment tests 2016-10-23 15:25:04 +01:00
Dan Brown
7ee695d74a
File upload deletion complete & added extension handling 
Also fixed issue with file editing on JS side
 2016-10-23 13:36:45 +01:00
Dan Brown
867fc8be64
Added basic attachment editing functionality 2016-10-11 20:39:11 +01:00
Dan Brown
89509b487a
Added attachment creation from link/name 2016-10-10 21:13:18 +01:00
Dan Brown
ac0b29fb6d
Added view, deletion and permissions for files 2016-10-10 20:30:27 +01:00
Dan Brown
673c74ddfc
Started work on attachments 
Created base models and started user-facing controls.
 2016-10-09 18:58:22 +01:00
Dan Brown
b662670efc
Prevented guest users creating draft pages. 2016-09-29 15:56:57 +01:00
Dan Brown
24523cf31d
Added page autosave request failure notification 
Closes #192
 2016-09-18 15:10:27 +01:00
Dan Brown
1d681e53e4
Added page navigation and tweaked header styles 
Changed header selection in editor to be more descriptive and
to provide a wider range of styles.

Closes #68
 2016-09-18 14:49:36 +01:00
Dan Brown
393f6047f2
Updated table styling to ideally by more predictable 
Set styles to be fixed and not cut text.
 2016-09-06 20:47:34 +01:00
Dan Brown
d94fc5b694
Fixed table cell p tag spacing and de-duped editor shortcuts 
Also changed shortcuts to be better compatible with OSX by using the
command key.
 2016-09-06 19:50:47 +01:00
Dan Brown
11960d9d3a
Cleaned page form JS & spaced tag box 
As per #174
 2016-09-05 19:33:14 +01:00
Dan Brown
bbd8fff021
Fixed bad image base-urls and forced tinyMCE to use absolute 
Also ensured image file existance is checked during base64 conversion
during exports.
Closes #171.
 2016-09-03 19:24:58 +01:00
Dan Brown
0dbb8babee
Merge branch 'page_link_selector' 2016-09-03 10:40:27 +01:00
Dan Brown
b14e9fc619
Fixed some cross browser flexbox popup issues 
Set min height for poor IE & safari flexbox support.
Fixes #105.
 2016-09-03 10:32:14 +01:00
Dan Brown
63c6d3478d
Added image paste and drop to markdown editor 
Only currently tested in chrome.
Closes #128
 2016-09-02 21:18:48 +01:00
Dan Brown
781f0e7887
Added draft save indicator and fixed notification positions 2016-09-02 19:26:12 +01:00
Dan Brown
23e014cb25
Added link selector to markdown editor 2016-09-02 18:54:26 +01:00
Dan Brown
5b64358ef1
Added link selector interface to WYSIWYG editor 2016-09-01 20:36:22 +01:00
Dan Brown
56df64063d
Updated popup design and started integrating link selector 
Extracted design and base styles from image manager into generic popup
classes that can be used by other app components such as the new
popup Book/Chapter/Page link selector
 2016-08-30 20:05:59 +01:00
Dan Brown
92d393537c Merge branch 'v0.11' 2016-08-14 13:09:44 +01:00
Dan Brown
43d9d2eba7 Updated all application urls to allow path prefix. 
Allows BookStack to be installed at a non-root location on a domain.
Closes #40.
 2016-08-14 12:29:35 +01:00
Dan Brown
b246a67e8a Fixed double brace issues in both editors. 
Double braces were being parsed by angular in both the WYSIWYG and markdown editor.
Fixes #150 and fixes #155.
 2016-08-13 14:18:31 +01:00
Dan Brown
d05e85efa9 Fixed back-to-top button on firefox. Fixes #153. 2016-07-26 18:03:10 +01:00
Dan Brown
3fd82200cc Added WYSIWYG editor shortcuts 2016-07-12 21:11:48 +01:00
Dan Brown
7215392784 Changed when revisions are saved and update changelog input 
Revisions are now saved when te page content is originally saved whereas before they were saved on the next update to the page.
 2016-07-10 12:12:52 +01:00
Dan Brown
10418323ef Prevented shift-tab from selecting a tag 2016-07-03 10:47:20 +01:00
Dan Brown
c25ef18900 Made list default messages a little nicer 2016-07-03 10:12:12 +01:00
Dan Brown
b0a63ba0cc Tightened and cleaned some list styles 2016-07-03 09:58:45 +01:00
Dan Brown
361ba8b244 Made stick book navigation recalc on window resize 2016-06-25 15:46:31 +01:00
Dan Brown
bcd9c2044e Added WYSIWYG editor callouts 2016-06-19 19:02:53 +01:00
Dan Brown
7f99903fdb Finished off page move functionality 2016-06-12 12:14:14 +01:00
Dan Brown
97d011ac8e Started work on page move view and entity selector 2016-06-11 21:04:18 +01:00
Dan Brown
eec9c05518 Added tag autosuggestion when no input provided 
Shows the most popular tag names/values.
As requested on #121
 2016-06-04 15:37:28 +01:00
Dan Brown
246d1621f5 Limited tag value autosuggestions based on tag name 
As requested on #121
 2016-06-04 14:54:31 +01:00
Dan Brown
5b9362ab0b Added (Ctrl+s) draft force save 2016-05-28 13:51:07 +01:00
Dan Brown
f602b088ac Added basic markdown scroll syncing 2016-05-28 13:24:07 +01:00
Dan Brown
e80ae76856 Added auto-suggestions to tag names and values 2016-05-15 20:12:53 +01:00
Dan Brown
78564ec61d Cleaned up tag edit interface 2016-05-14 20:02:00 +01:00
Dan Brown
b80184cd93 Renamed attribute to tags & continued interface 
Also fixed page create route broken in last commit
 2016-05-13 21:20:21 +01:00
Dan Brown
1fa079b466 Started the page attributes interface 2016-05-12 23:12:05 +01:00
Dan Brown
9dc1b35e82 Made settings ui a little less jumpy 2016-04-24 10:28:47 +01:00
Dan Brown
2dc1180a41 Added custom, More consistent hr insertion 
Since the previous hr plugin caused large empty p tags
 2016-04-23 19:15:49 +01:00
Dan Brown
792e786880 Added lists plugin to TinyMCE, Fixed strange nested list behaviour 
Fixes #97
 2016-04-14 22:34:33 +01:00
Dan Brown
d6bad01130 Fixed draft time display, Cleaned up some code 
Cleaned up some comment spacing in book controller and refactored some of the view service functions.
 2016-04-09 14:26:42 +01:00
Dan Brown
2e7345f4f0 Localised draft save time display 
In reference to #83.
 2016-04-09 13:36:32 +01:00
Dan Brown
cbff2c6035 Added uploaded to book/page filters & search in image manager 
Also refactored tab styles which affected the settings area.

Closes #41
 2016-04-03 14:59:54 +01:00
Dan Brown
e1994ef2cf Added editor control in admin settings & Fixed some markdown editor bugs 
Also updated the setting system with a more sane approach to handling default values. (Now done via the setting-defaults config file)
 2016-03-29 19:26:13 +01:00
Dan Brown
efb49019d4 Integrated the markdown editor with the image manager 2016-03-29 18:25:54 +01:00
Dan Brown
26965fa08f Added a markdown editor 2016-03-25 14:41:15 +00:00
Dan Brown
dbe11c1360 Attached images to pages and added restriction filtering 
Closes #79
 2016-03-13 13:30:47 +00:00
Dan Brown
5283919d24 Added new page drafts and started image entity attaching 
Closes #80.
 2016-03-13 12:04:08 +00:00
Dan Brown
30214fde74 Added UI components of page autosaving 2016-03-12 15:52:19 +00:00
Dan Brown
93ebdf724b Changed direct attributes to prevent conflicts 2016-03-09 22:54:18 +00:00
Dan Brown
59ce228c2e Moved page editing to angular controller and started work on update drafts 2016-03-09 22:32:07 +00:00