github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-25 09:42:10 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity
1,488 Commits 11 Branches 200 Tags 75 MiB
b12ae6d11b
Commit Graph

536 Commits

Author SHA1 Message Date
Dan Brown
d39fc84301
Merge branch 'master' into 2019-design 2018-12-01 13:57:23 +00:00
Abijeet
eac82c47a5 Fixes image deletion failing in subdirectory. 
Fixes #1092

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-11-25 00:46:04 +05:30
Abijeet
d3d3e2ad3e Added a default timeout of 60 seconds to dropzone. 
Fixes #876
 2018-11-18 00:22:08 +05:30
Dan Brown
4df11701e7
Updated book-tree design and abstracted breadcrumb template 2018-11-11 13:11:36 +00:00
Dan Brown
4a872012c5
Merge branch 'master' into 2019-design 2018-11-11 11:44:35 +00:00
Dan Brown
302b53562d
Fixed clipboard imports 2018-11-10 16:08:33 +00:00
Dan Brown
d0c166c207
Added linked images to markdown paste insert 2018-11-10 15:35:13 +00:00
Dan Brown
321b53c827
Merge branch 'master' of git://github.com/thomasjsn/BookStack into thomasjsn-master 2018-11-10 15:23:29 +00:00
Dan Brown
e3230f8f21
Standardised module loading system & fixed build system 
Fixed broken build system in broken webpack version.
Also updates module system to standardise on ES6 import/exports,
Especially since babel has changed it's 'default' logic for the old
module system.
 2018-11-09 21:17:35 +00:00
Dan Brown
c356612612
Added sidebar layout size tweaks 2018-11-04 14:41:52 +00:00
Dan Brown
0e395b1e21
Started reworking of page-show design 
- Updated core toolbar & breadcrumb design
 2018-10-21 20:05:11 +01:00
Dan Brown
89be30ff0e
Started on a design update 
- Added base of new grid system.
- Added new margin/padding/visiblity helpers.
- Made header collapse to overflow menu on mobile.
 2018-10-16 18:49:56 +01:00
Thomas Jensen
90929baa52 Wrap images inserted with markdown editor with anchor tag to original file ref #1062 2018-10-13 21:43:35 +02:00
Dan Brown
93f820d9da
Updated TinyMCE config to end containers on empty blocks 
Makes it easier to escape out of blockquote sections.
Fixes #961
 2018-09-23 14:07:50 +01:00
Dan Brown
7b32aa163f
Added Bookshelves to search system. 
Also cleaned up and made search indexing system a little more efficient.
Closes #1023
 2018-09-23 12:34:30 +01:00
Dan Brown
88ac636c00
Made it possible to scroll past the end of the markdown editor 
Closes #1020
 2018-09-22 23:24:51 +01:00
Dan Brown
9dc26a8c52
Prevented TinyMCE clear-color option having scrollbar 
Was covering the option if showing and prevented the option being pressed.
Fixes #999
 2018-09-22 23:12:39 +01:00
Dan Brown
be4f3d62cd
Merge branch 'fix/ru-locale' of git://github.com/mullinsmikey/BookStack into mullinsmikey-fix/ru-locale 2018-09-22 22:29:03 +01:00
Dan Brown
0931ff38e9
Tried to make chapter toggles a little smoother in FF 2018-09-22 16:36:35 +01:00
Dan Brown
07bc0612c0
Merge branch 'master' into fix/#960 2018-09-22 15:57:53 +01:00
Dan Brown
6dec485b45
Fixed sidebar rubber-banding when content is expanded 
Hopefully for #905
Ideally layout needs to be re-thought
 2018-09-22 15:52:09 +01:00
Dan Brown
a441faf65c
Only show codeblock copy icon on hover 
Fixes #980
 2018-09-22 14:55:33 +01:00
Dan Brown
1cb6ae39c8
Added base RTL support 
For #939

- Adds way to check if current language is RTL via config system.
- Made TinyMCE default direction be based on current language text
direction.
- Fixed bullet points to be RTL compatible.
- Set page content body to have direction based on content.
 2018-09-22 13:18:26 +01:00
Dan Brown
131fcae4c7
Merge pull request #947 from BookStackApp/bookshelves 
Bookshelves
 2018-09-21 15:29:52 +01:00
Dan Brown
81eb642f75
Added bookshelves homepage options 
- Updated homepage selection UI to be more scalable
- Cleaned homepage selection logic in code
- Added seed test data for bookshelves
- Added bookshelves to permission system
 2018-09-20 15:27:30 +01:00
Dan Brown
f455b317ec
Added ability to click books in shelf-sort 2018-09-16 16:59:01 +01:00
Abijeet
90883bb22b Fixes issue wth the dropdown list upon double clicking. 
Closes #960

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-09-16 13:09:21 +05:30
Abijeet
0c8b6b7324 Final tweaks after code review and fixing failing test cases. 2018-09-16 01:12:36 +05:30
Abijeet
714c7bbd3a Adds code to delete the revision. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-09-15 15:15:42 +05:30
Michael Mullins
e0b479efef UTF-8 slugs & UI fixes 2018-09-11 22:42:25 +04:00
Dan Brown
b89411c108
Copied book content, Added create routes 
Added view control
Added pivot table for books relation
Added control to assign books
 2018-08-27 14:18:09 +01:00
Dan Brown
c3986cedfc
Added shelve icon, improved migration, added role permission 
Icon is placeholder for now
Migration will now copy permissions from Books to apply to shelves.
Role view updated with visibility on shelve permission
 2018-08-04 12:45:45 +01:00
Dan Brown
c83a51f7e2
Merge pull request #904 from lommes/903-socialite-discord 
add everything needed to use discord as social login provider
 2018-07-29 16:18:10 +01:00
Dan Brown
af6f4e6c8c
Updated pagination to use theme colour 2018-07-29 15:44:10 +01:00
Dan Brown
69a0f8d502
Prevented error notification being visible on load 
Fixes #897

Also made design a little more compact
 2018-07-29 15:34:54 +01:00
Dan Brown
b2cd363539
Added browserlist, Tweaked md scrollToText ot use ES6 2018-07-14 10:20:49 +01:00
Dan Brown
f668bee88b
Merge branch 'master' into feature/edit-link-headers 2018-07-14 09:36:14 +01:00
Abijeet Patro
c2d6e98985
Merge pull request #907 from BookStackApp/fix/date-image-manager 
Changes the way the date is displayed in image-manager.
 2018-07-02 00:34:30 +05:30
Dan Brown
9da600caf9
Merge pull request #906 from BookStackApp/bug/revision-wrap 
Fixes issue with code not wrapping on revision page.
 2018-07-01 16:18:49 +01:00
Dan Brown
45aee2a1c1
Merge pull request #874 from BookStackApp/fix/gototext 
Fixes undefined error when clicking on link under page navigation.
 2018-07-01 16:13:10 +01:00
Abijeet
f5df5ac7d5 Changes the way the date is displayed in image-manager. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-30 11:04:12 +05:30
Abijeet
fb29f4119d Fixes issue with code not wrapping on revision page. 
Closes #888

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-30 09:49:55 +05:30
Timo B
93795b6eda add everything needed to use discord as social login provider 2018-06-28 09:01:36 +02:00
Abijeet
7d81a95156 Fixes issue with having to click the delete icon for attachment twice. 
Fixes #884

This is happening because -

Due to the limitations of modern JavaScript (and the abandonment of Object.observe), Vue cannot detect property addition or deletion. Since Vue performs the getter/setter conversion process during instance initialization, a property must be present in the data object in order for Vue to convert it and make it reactive.

Source: https://vuejs.org/v2/guide/reactivity.html

Also added padding to the icons in the attachment section.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-17 14:21:31 +05:30
Abijeet
771f781e7f Fixes a corner case with exclamation in the ID. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 17:29:30 +05:30
Abijeet
78be8535f7 Removed previous code that is now unneeded 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 17:19:03 +05:30
Abijeet
6c4c1ccb58 Changed the way we were displaying the edit icon. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 17:06:23 +05:30
Abijeet
562225a77b Added code to set the cursor at end of line while scrolling. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 17:04:54 +05:30
Abijeet
b936e1f403 Added code to handle scroll for markdown. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 13:11:10 +05:30
Dan Brown
b3cc3130f0
Added copy button to codemirror-rendered code blocks 
Closes #858
 2018-06-09 10:41:01 +01:00
Abijeet
0363fc4ea1 Fixes undefined error when clicking on page navigation links. 
Fixes #873

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-03 14:24:55 +05:30
Abijeet
134a96fa32 Adds edit icon to each header in the page. 
Towards #618

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-03 13:47:07 +05:30
Dan Brown
d886c6a32e
Removed old ng tags, Fixed header spacing 
Also prevent pointer error on custom home page
 2018-05-28 10:33:38 +01:00
Dan Brown
f399e60910
Made header link spacing a little more even 2018-05-27 20:32:06 +01:00
Dan Brown
173eaf1c98
Made comments section more subtle 
Also removed spacing from within details above active restrictions
 2018-05-27 20:20:13 +01:00
Dan Brown
64eabaf882
Fixed search icon overalapping input in header 
Fixes #859
 2018-05-27 19:51:32 +01:00
Dan Brown
6b84a76af1
Merge branch 'drawing_updates' 2018-05-27 19:42:25 +01:00
Dan Brown
2bd6ba9895
Added maintenance view with image-cleanup 2018-05-27 19:40:07 +01:00
Dan Brown
1df0bcaf85
Made image cleanup safer 
Also fixed drawing update in markdown editor.
Added shortcut for MD editor to view drawing manager.
 2018-05-27 14:33:50 +01:00
Dan Brown
8c4c8cd95b
Updated secure-images option to not effect image name 
Instead only the image path is altered.
Also fixed image manger mode not changing on button press.
 2018-05-20 16:47:53 +01:00
Dan Brown
0c9c1e4c6b
Reverted work on revisions 
Improved linkage of drawings and image manager.
Updated image updates to create new versions.
 2018-05-20 16:41:14 +01:00
Dan Brown
6e7adcc095
Embedded SVG icons in css/js files 
Allows removal of hacky /icon endpoint solution.
Fixes PDF exports with WKHTML and allows the icon to show in HTML
exports.

Fixes #796
 2018-05-20 11:55:23 +01:00
Dan Brown
a1ecdcacba
Fixed attachment error handling, Allowed all link types 
Related to #812
 2018-05-20 11:06:10 +01:00
Dan Brown
8df9dab80a
Merge branch 'master' into feature/615 2018-05-20 09:51:45 +01:00
Dan Brown
93147f4340
Prevented back-to-top showing on flexbox-body pages 
Fixes #824
 2018-05-20 09:48:11 +01:00
Dan Brown
9f4c64a676
Codemirror mode now correct for c-like langs 
Fixes #849
 2018-05-20 09:32:15 +01:00
Dan Brown
6cdb943916
Started work on revisions in image manager 2018-05-19 18:44:40 +01:00
Dan Brown
d3d8ddbe52
Improved 404 handling and fixed editor error 
404 handling now not a hack-around and uses Laravel 'fallback' routes
instead. Prevents errors with the session when you have mulitple errors
on a page where a post/put/delete is made.
 2018-05-19 17:01:33 +01:00
Dan Brown
d5b922aa50
Started work on drawing revisions 
Improved sidebar and selection styling of image manager.
Allowed image manager imageType to be changed on open.
Created models for image revisions.
 2018-05-13 12:07:38 +01:00
Abijeet
b6bb078e0a removed some added CSS as it was causing unintended sideffects. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-05-12 17:28:10 +05:30
Abijeet
2e4863edb1 Added an option to set books as the default homepage. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-05-09 08:26:49 +05:30
Dan Brown
0c3c8fc9c3
Updated npm dependancies 2018-04-30 14:54:54 +01:00
Dan Brown
624c568008
Revamped tag styling 2018-04-30 14:35:15 +01:00
Dan Brown
58a0a59d7e
Cleaned details sidebar box and merged with permissions 2018-04-30 13:53:04 +01:00
Dan Brown
0f7b0ad45a
Added ability to copy a page 
In 'More' menu alongside move.
Allows you to move if you have permission to create within the new
target parent.
Closes #673
 2018-04-14 18:00:16 +01:00
Abijeet
7238a01f89 Moved the code to the wysiwyg-editor file. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-04-14 18:41:35 +05:30
Abijeet
93f92e9e16 Updated the TinyMCE to version 4.7.9. 
Added some code to remove the box-shadow around the TinyMCE toolbar.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-04-14 18:30:34 +05:30
Abijeet
d92efd4edc Adds the media plugin to TinyMCE to allow insertion of videos. 
Fixes #266

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-04-14 18:30:28 +05:30
Dan Brown
0ade9b5b9b
Refactored moment.js out of app 
Reduces bundle size by 25%
 2018-04-01 14:10:44 +01:00
Dan Brown
736d7118b0
Refactored js file structure to be standard throughout app 
Still work to be done but a good start in standardisation.
 2018-04-01 13:21:11 +01:00
Dan Brown
b612cf9e4c
Refactored out page-display system 2018-04-01 12:46:27 +01:00
Dan Brown
582158f70e
Added tags to chapters and books 
Closes #121
 2018-03-30 14:09:51 +01:00
Dan Brown
4f788384f0
Updated icons with height 
Fixes issues within IE
 2018-03-25 15:52:48 +01:00
Dan Brown
5ad9c5d319
Merge branch 'bug/gif-image-740' of git://github.com/Abijeet/BookStack 
Also removed console.logs in dropzone.js
 2018-03-24 14:54:50 +00:00
Abijeet
2cfcbe0a3c Fixes an issue with handling of large image files. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-03-19 02:09:01 +05:30
Abijeet Patro
0335f58478
Merge branch 'master' into bug/image-upload 2018-03-18 23:44:33 +05:30
Abijeet
3a5c20c17e Removing the selected image and clearing the dropdzone on dialog close. 
Towards #741

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-03-18 23:38:37 +05:30
Dan Brown
380e2ff668
Updated outline button styles for svg icons 2018-03-18 15:35:04 +00:00
Dan Brown
ecdeb545e0
Cleaned some form styling 
Removed uppercasing of labels to make a little friendlier.
Extracted out toggleswitch JS into own component.
Improved basic code input for html-head-input area.
 2018-03-18 15:13:46 +00:00
Abijeet
83d830fd7d Fixes the icons not being aligned properly in attached items section for the page. 
Also formatting.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-03-18 18:58:04 +05:30
Abijeet
d859be3a12 Fixes a number of issues with the image uploader. Read below, 
- Added a remove link to remove files that have an error.
- Error will appear below the progress bar.
- Hovering on dz-image or dz-details will display the error message. Otherwise error message was covering the remove link as well.
- Removed styling around the file size.
- Removed gradient effect in accordance with BookStack styling.
- Dropzone filenae will not overflow the container element. Also done for page attachments
- Added a 'uploaded' error message. this error was being thrown when the file size exceeded the server configured file size. (https://stackoverflow.com/a/42934387/903324)

Towards #741

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-03-18 18:44:11 +05:30
Dan Brown
8b27ce3296
Fixed large content previews and improved mobile styles 
Listing content previews no longer pre-wrap and instead simply break
correctly.
Updated titles to ensure they break on mobile devices.
Reduced spacing and font sizes on mobile to better adjust content to
screen size.

Fixes #739
 2018-03-18 12:23:48 +00:00
Dan Brown
8828adfc9c
Fixed up notification styling a little 2018-03-18 11:58:45 +00:00
Dan Brown
d44e0b7964
Prevented markdown editor pushing out toolbar 2018-03-18 11:46:08 +00:00
Dan Brown
0372efa89a
Merge branch 'patch-1' of git://github.com/BackwardSpy/BookStack into BackwardSpy-patch-1 2018-03-18 11:40:38 +00:00
Dan Brown
d2eec4fbce
Markdown editor image paste sets cursor correctly 
Now sets cursor to alt text rather than end of placeholder image.
Fixed #751
 2018-03-18 11:33:30 +00:00
Dan Brown
b42b07179f
Updated exports to use DejaVu font 
Provides potentially better language font coverage.
 2018-03-17 17:12:01 +00:00
Dan Brown
0a1546daea
Moved jQuery to use NPM and fixed some asset refs 2018-03-17 15:20:15 +00:00
Dan Brown
ced4e58137
Finished off intitial conversion to webpack 2018-03-17 13:03:13 +00:00
Dan Brown
e52bfc0c24
Attempted move to webpack again 2018-03-11 16:16:30 +00:00