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,407 Commits 11 Branches 200 Tags 75 MiB
6be95cd2ac
Commit Graph

907 Commits

Author SHA1 Message Date
Dan Brown
c667c6e235
Merge branch 'master' of git://github.com/kmoj86/BookStack into kmoj86-master 2018-09-22 12:23:17 +01:00
Dan Brown
e3e484e561
Added custom head content to exports 
Closes #981

Also fixed incorrect download tests.
 2018-09-22 11:53:40 +01:00
Dan Brown
e60d11ee04
Altered social auto-reg to be configurable per service 
- Added {$service}_AUTO_REGISTER and {$service}_AUTO_CONFIRM_EMAIL env
options for each social auth system.
- Auto-register will allow registration from login, even if registration
is disabled.
- Auto-confirm-email indicates trust and will mark new registrants as
'email_confirmed' and skip 'confirmation email' flow.
- Also added covering tests.
 2018-09-21 18:05:06 +01:00
Dan Brown
7ad8314bd7
Merge branch 'feature/autoregistration_social_login' of git://github.com/ibrahimennafaa/BookStack into ibrahimennafaa-feature/autoregistration_social_login 2018-09-21 16:14:52 +01:00
Dan Brown
131fcae4c7
Merge pull request #947 from BookStackApp/bookshelves 
Bookshelves
 2018-09-21 15:29:52 +01:00
Dan Brown
b59e5942c8
Added testing coverage for Bookshelves 
Created modified TestResponse so we can use DOM operations in new
Testcases as we move away from the BrowserKit tests.
 2018-09-21 15:15:16 +01:00
Dan Brown
8ff969dd17
Updated so permission effect admins more 
Asset permissions can now be configured for admins.
joint_permissions will now effect admins more often.
Made so shelves header link will hide if you have no bookshelves view
permission.
 2018-09-20 19:48:08 +01:00
Dan Brown
6eead437d8
Added bookshelf permission control UI and copy-down ability 2018-09-20 19:16:11 +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
47b08888ba
Added bookshelf view, update, delete 
- Enabled proper ordering of Books in a shelf.
- Improved related item destroy for all entities.
 2018-09-16 19:34:09 +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
54ca4487fa Adds tests and few fixes. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-09-15 21:05:51 +05:30
Abijeet
25da4d9a8b Added a success message on deletion of revision. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-09-15 16:08:20 +05:30
Abijeet
f0add69b61 Adding languages for the revision deletion. 2018-09-15 15:16:04 +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
Michael Mullins
9d09c4c7b0 Ru locale fix 
Fixed russian translations, added several missing strings
 2018-09-10 22:28:47 +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
André Luiz da Silva
c472b82ee3 Adds and fixes pt_BR strings 2018-08-24 16:03:04 -03:00
Dan Brown
fe6dfcedf9 implement social auto registration feature 2018-08-16 21:26:54 +00:00
Marcos
18e5f86ffa Updated Spanish translation 2018-08-12 14:14:56 +02:00
Dan Brown
fcdb39e428
Merge pull request #942 from marcusforsberg/master 
Updated Swedish translation
 2018-08-12 12:51:00 +01:00
Dan Brown
1b3e1863f4
Merge pull request #948 from houbaron/fix/Chinese_translation 
Fix/Chinese translation
 2018-08-12 12:37:35 +01:00
Leonardo Martinez
8099c431bb Updated 'Spanish Argentina' translation. 2018-08-06 10:46:53 -03:00
Baron Hou
efbfe0f7af
Update Traditional Chinese 2018-08-05 17:07:13 +08:00
Baron Hou
66402b474c
Update Simplified Chinese 2018-08-05 17:05:41 +08: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
b5a2d3c1c4
Merge remote-tracking branch 'origin' into bookshelves 2018-08-04 11:35:01 +01:00
Khalid
7d4ec0d633 added Arabic language to drop-down list. 2018-08-03 18:58:27 +03:00
Khalid
85544c04a9 translated 2018-08-03 18:51:18 +03:00
Khalid
0a8ff6ffad translated 2018-08-03 18:34:39 +03:00
Khalid
04274078c4 translated 2018-08-02 06:38:33 +03:00
Khalid
aac9fbf236 translated 2018-08-01 18:25:44 +03:00
Khalid
08e290f3ea translated 2018-07-30 12:58:12 +03:00
Khalid
86602854ac translated 2018-07-30 12:54:32 +03:00
marcusforsberg
f47f0e05d6 Updated Swedish translation 2018-07-30 09:35:34 +03: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
b922c8029e
Merge pull request #933 from nicobubulle/master 
French translation update
 2018-07-29 16:04:39 +01:00
Dan Brown
653761e67d
Merge pull request #925 from alex2702/fix/835 
Fixed German translations for notifications
 2018-07-29 16:03:29 +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
Khalid
6eb63a1e03 translated 2018-07-28 14:13:12 +03:00
Khalid
8774f1a320 translated 2018-07-28 13:02:19 +03:00
Khalid
6ca8ccd330 translated 2018-07-28 12:47:35 +03:00
Khalid
df88ffa159 translated 2018-07-28 00:13:33 +03:00
Khalid
dcbb8ad960 translated 2018-07-24 21:40:49 +03:00
Khalid
0f2ffa9545 translated to Arabic 2018-07-24 21:36:12 +03:00
Khalid
6bae16f7e9 fully translated "common" and partially translated "entities" 2018-07-24 18:11:55 +03:00
kmoj86
f5ca7ab1c8
Update entities.php 2018-07-23 18:19:17 +03:00
Khalid
7dd11decb8 partial file translation 2018-07-23 13:08:07 +03:00
nicobubulle
79d0f707e6 French translation update 2018-07-22 18:20:09 +02:00
alex2702
369dc02e78 Fixed German translations for notifications 2018-07-15 21:26:55 +02:00
Dan Brown
f421d83627
Added ability to set custom ldap group -> role mapping 
Added input in role form to allow matching against custom names.
Changed default mapping to use role display name instead of the hidden
DB name.
 2018-07-15 19:34:42 +01:00
Dan Brown
fb7c12438d
Merge pull request #918 from DeehSlash/fix/pt_br_locale 
Adds missing pt_BR strings
 2018-07-14 10:31:18 +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
André Luiz da Silva
642f2760cc Improves and adds missing pt_BR strings 2018-07-10 15:10:21 -03: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
84b4fe6176
Merge pull request #886 from leomartinez/master 
Updated 'Spanish Argentina' translation.
 2018-07-01 16:21:38 +01:00
Dan Brown
decdf5714b
Merge pull request #865 from moucho/master 
New strings from 0.22 release for Spanish translation
 2018-07-01 16:20:47 +01:00
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
Leonardo Martinez
f7b808a9e6 Merge remote-tracking branch 'upstream/master' 2018-06-26 09:37:20 -03:00
Dan Brown
4948b443b6
Started work on bookshelves 2018-06-24 13:38:19 +01: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
Leonardo Martinez
a9bf2ed398 Updated 'Spanish Argentina' translation. 2018-06-13 10:12:36 -03:00
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
Marcos
56f444a8a7 New strings 2018-05-30 01:41:25 +02:00
Dan Brown
86f43c8a65
Fixed incorrect tag from removing ng tags 2018-05-28 11:06:11 +01:00
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
9ec114641c
Merge pull request #846 from moucho/master 
Updated Spanish translation
 2018-05-20 15:20:33 +01:00
Dan Brown
295c7918a4
Merge pull request #851 from vriic/master 
Update german translation
 2018-05-20 12:06:44 +01:00
Dan Brown
3ac34b5849
Merge pull request #802 from marcusforsberg/master 
Updated Swedish translation
 2018-05-20 12:05:11 +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
63f96c1c6f
Reorganised home and robots views 
Extracted home view sidebar into own view.
Moved home and robot views into 'common' folder so that we only have
layouts in the top-level views folder.
 2018-05-20 10:11:56 +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
Nikolai Nikolajevic
e0ebae19aa Update: Übersetzung 2018-05-20 03:00:55 +02: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
Marcos
57c312ec3f Updated Spanish translation 2018-05-18 03:10:49 +02: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
28823c4fae Changed the location of the "view-toggle" to be under the books views. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-05-12 18:26:35 +05:30
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
8254c3be8d Added the book view toggle option on the homepage. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-05-12 14:16:05 +05:30
Abijeet
86b2ddbd28 Implemented displaying of the books list on home page. 2018-05-10 09:05:18 +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
b0d027a4a9
Repaired other uses of entity-meta view 2018-04-30 15:12:10 +01:00
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
Leonardo Martinez
ae89e05a25 Updated 'Spanish Argentina' translation. 2018-04-17 09:45:57 -03:00
Dan Brown
cdb1c7ef88
Added destination permission checking to entity move 2018-04-14 18:47:13 +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
marcusforsberg
6c5304a3de Updated Swedish translation 2018-04-14 18:09:09 +02:00
Dan Brown
d34b91f2c9
Updated move card width and made sidebar order more consistent 2018-04-14 16:23:16 +01:00
Dan Brown
dfadaa28f6
Updated reset-password flow design 
Fixes #800
 2018-04-14 16:16:29 +01:00
Dan Brown
fae564ff32
Merge pull request #798 from abno85/loc-de_DE 
Update German localization
 2018-04-14 16:02:48 +01:00
Dan Brown
502b22a0f2
Merge pull request #783 from moucho/master 
Completely overhaul of the Spanish translation,  added missing strings
 2018-04-14 16:01:25 +01:00
Dan Brown
f9feeef5c9
Merge pull request #780 from jasoncheng7115/master 
Add Language zh_TW
 2018-04-14 16:00:03 +01:00
Dan Brown
a6674a5a5e
Merge pull request #767 from msaus/update_japanese_translation 
update japanese translation
 2018-04-14 15:58:35 +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
abno85
448f7d091b Add comment_add 
Missed 'comment_add' the last time
 2018-04-13 08:44:54 +02:00
abno85
11470b85f9 Update German localization 
Added a few missing strings and (hopefully) fixed my borked first commit.
 2018-04-12 13:48:07 +02:00
Marcos
9c07619099 orthography 2018-04-05 03:57:35 +02:00
Marcos
60a224f7a1 Missing comma 2018-04-05 02:58:32 +02:00
Marcos
e392e1fd8b Completely overhaul of the Spanish translation, added missing strings 2018-04-03 15:58:04 +02:00
Jason Cheng
007059273e Add translate. 
Add translate.
 2018-04-02 15:54:06 +08:00
Jason Cheng
106432ee4e Added Language zh_TW 
Added Language zh_TW
 2018-04-02 15:03:07 +08:00
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
1a72208d27
Added configurable robots.txt file. 
Deleted old static file.
Default output depends on app-public setting.
Otherwise can be overidden in `.env` file via `ALLOW_ROBOTS`
Otherwise view file can be customized.

Fixes #779
 2018-03-31 12:41:40 +01:00
Dan Brown
7f437c2e3c
Fixed issue where cover images don't save on older books 
Ensured an existing ID is always provided to image-picker.js.
Fixes #773
 2018-03-31 11:21:22 +01:00
Dan Brown
cfdf5b93d9
Merge branch 'v0.20' to gain export fix 2018-03-30 15:45:34 +01:00
Dan Brown
3cd08382e9
Fixed export style paths 2018-03-30 15:31:39 +01:00
Dan Brown
582158f70e
Added tags to chapters and books 
Closes #121
 2018-03-30 14:09:51 +01:00
msaus
03ee3d21ba
Merge branch 'master' into update_japanese_translation 2018-03-28 11:58:14 +09:00
Soseki Masao
34499658d5 update japanese translation 2018-03-27 16:18:38 +09:00
Dan Brown
4f788384f0
Updated icons with height 
Fixes issues within IE
 2018-03-25 15:52:48 +01:00
Dan Brown
f1586be516
Removed invalid bracket from view 2018-03-25 11:35:58 +01:00
Dan Brown
1a9f676416
Updated create routes to prevent slug clashes 
Fixes #758
 2018-03-25 11:34:42 +01:00
Dan Brown
df1a3a0715
Properly escaped search results 
Prevents vue-like syntax in results causing errors.
Related to #748
 2018-03-25 11:06:21 +01:00
Dan Brown
3df7d828eb
Fixed failing tests 
Fixed syntax error in french translations.
Removed 'required' on image validation which was breaking tests
 2018-03-24 15:25:13 +00: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
Dan Brown
746684ec8c
Merge branch 'bug/image-upload' of git://github.com/Abijeet/BookStack into Abijeet-bug/image-upload 2018-03-24 14:39:57 +00:00