github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-25 03:13:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,924 Commits 20 Branches 198 Tags 65 MiB
2e49b16177
Commit Graph

289 Commits

Author SHA1 Message Date
Dan Brown
163a57cf70
Merge branch 'master' into 2019-design 2019-01-13 14:10:27 +00:00
Dan Brown
2317bf2350
Added check for last admin on role change 
Will show error message if last admin and admin role is removed.
Closes #1124
Also cleaned up user controller a little.
 2018-12-30 16:11:58 +00:00
Dan Brown
5fe630b8d2
Merge branch 'master' into dropzone-timeout 2018-12-22 15:08:54 +00:00
Mantikor
9a444b4a04
Update settings.php 
added 'uk' language
 2018-12-17 18:16:43 +02:00
Dan Brown
1930ed4d6a
Made some further fixes to the formatting script 
Takes into account single and double quotes.
Ignores //! comments and the 'language_select' array.

Language files may need some cleaning up and may encounter some other bugs when running.
 2018-12-16 14:04:04 +00:00
Dan Brown
2753629dbe
Cleaned up script and formatted remaining EN files 2018-12-16 13:12:13 +00:00
Dan Brown
86a00a59d4
Created sketchy translation formatter script 
Compares a translation file to a EN version to
place translations on matching line numbers and matches
up comments.
 2018-12-14 21:23:05 +00:00
ezzra
a2acd063f3 add german informal language 2018-12-11 19:39:16 +01:00
Dan Brown
4c574c22a8
Implemented functionality to make books sort function 
Also changed public user settings to be stored in session rather than DB.
Cleaned existing list view type logic.
 2018-12-07 18:33:53 +00:00
Abijeet
d3d3e2ad3e Added a default timeout of 60 seconds to dropzone. 
Fixes #876
 2018-11-18 00:22:08 +05:30
codev-kuk-mac
1c0a196b9d Include Korean in settings 2018-10-12 16:05:28 +09: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
0d84a0b976
Extracted search sidebar text to translation file 
Closes #864
 2018-09-22 23:40:04 +01:00
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
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
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
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
fe6dfcedf9 implement social auto registration feature 2018-08-16 21:26:54 +00: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
Khalid
7d4ec0d633 added Arabic language to drop-down list. 2018-08-03 18:58:27 +03: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
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
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
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
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
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
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
Marcos
e392e1fd8b Completely overhaul of the Spanish translation, added missing strings 2018-04-03 15:58:04 +02:00
Jason Cheng
106432ee4e Added Language zh_TW 
Added Language zh_TW
 2018-04-02 15:03:07 +08:00
Dan Brown
582158f70e
Added tags to chapters and books 
Closes #121
 2018-03-30 14:09:51 +01:00
Abijeet Patro
0335f58478
Merge branch 'master' into bug/image-upload 2018-03-18 23:44:33 +05:30
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
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
Abijeet
f42d355fd7 Fixes issue with the validation message not being translated. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-03-13 09:10:23 +05:30
Artur Trzęsiok
98a3c815cf add missing polish translations for comments 2018-02-26 23:49:58 +01:00
Dan Brown
548dcd4db1
Fixed error when accessing non-authed attachment 
Also updated attachment tests to use standard test-case.
Fixes #681
 2018-02-11 12:37:02 +00:00
Yue Zhihan
d65cd53c99 Added simplified Chinese(zh-CN) language 2018-02-04 21:42:19 +08:00
Dan Brown
4eb5205070
Merge pull request #679 from marcusforsberg/master 
Added Swedish translation
 2018-01-28 13:40:01 +00:00
Dan Brown
88d09a2a3b
Added drawing endpoint tests 
Also refactored ImageTests away from BrowserKit
Also added image upload type validation.
 2018-01-28 13:18:28 +00:00
marcusforsberg
682bc9f896 Added Swedish translation 2018-01-26 20:16:35 +01:00
Dan Brown
9bbef3a3dd
Added drawio abilities to markdown editor 2018-01-20 20:40:21 +00:00
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
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
90bf13c1ab
Updated okta config keys, made SVG fully vector 
Also added some additional error handling to login.
 2017-12-09 13:32:45 +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
bc1302a8d8
Merge branch 'BookStackApp-master' of git://github.com/OsmosysSoftware/BookStack into OsmosysSoftware-BookStackApp-master 2017-12-06 15:52:54 +00:00
Abijeet
7a5bd23909 Added language translation for the new settings icons. 2017-11-16 00:22:22 +05:30
Dan Brown
db51cee2d8
Prevented custom homepage being deleted 
Fixes #546
 2017-10-15 19:14:46 +01:00
Leonardo Martinez
8e652f5d8f Added 'Spanish Argentina' translation. 2017-09-19 13:43:17 -03:00
alexey
ab7f5def04 Russian lang added 2017-09-12 16:42:04 +03:00
Dan Brown
d1a4ff9308 Merge pull request #501 from cipi1965/master 
Added Italian language
 2017-09-10 16:29:44 +01:00
Matteo Piccina
f8315fb9c4 Added Italian language 2017-09-10 16:55:23 +02:00
Dan Brown
874386ceab
Used trans_choice on profile view 
Closes #417
 2017-09-10 13:43:08 +01:00
Dan Brown
621142a46e
Removed outdated translations and updated tests 2017-09-09 18:41:59 +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
1c88d21abf Fixed books cover image ratio. 2017-09-04 20:50:24 +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
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
36f524a354
Updated page view styles to align with 2017 update 2017-08-26 15:41:33 +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
ac07cb41b6 Fixed formatting and added error messages. 2017-08-21 02:21:31 +05:30
Dan Brown
3da8c01c1f
Rolled out new design further 2017-08-20 13:57:25 +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
JachuPL
9e0c931573 Polish translation 2017-07-13 16:00:42 +02: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
cc553cc93d Added labels for 'Thumbnail toggle' and 'Cover image' in different languages. 2017-07-05 16:11:15 +05:30
Dan Brown
c5b58d8fd2
Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japanese-translation 2017-07-02 16:09:12 +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
Shuma Yoshioka
168c66815e add ja to settings 2017-06-24 20:46:38 +09:00
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
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
652a67ad65 Removes some unncessary code. 2017-06-06 23:20:40 +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
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
4c985aac7e
Added page revision counting 
Adds stored revision counts to pages and the revisions themselves.
Closes #321
 2017-04-20 20:58:54 +01:00
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
46c01ecba2 Merge pull request #358 from jendrol/master 
Add Slovak translation
 2017-04-16 15:06:32 +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
Vlado Jendroľ
9b639f715f Add Slovak translation 2017-04-11 23:20:52 +02:00
Dan Brown
d4e790d3cf
Added lang tests and update export text keys 2017-03-05 15:10:06 +00:00
Dan Brown
9b35aa42a2
Fixed spanish encoding, Added new lang to settings 2017-03-05 14:43:43 +00:00
Dan Brown
86625a7642
Neatened up social login/register buttons 2017-02-05 15:28:53 +00:00
Abijeet
148350009c #47 Adds comment permission to each role. 2017-01-29 14:25:20 +05:30
Dan Brown
26da81a3b0
Added pt_BR to language dropdown and renamed folder 2017-01-18 20:04:29 +00:00
sirgix
d3dc73ca06 remove trailing spaces 2017-01-16 15:34:34 +01:00
sirgix
d5ea15e6dd fix typo 2017-01-16 14:51:45 +01:00
Dan Brown
dabf149411
Added user setting system and added user-lang option 
Supports #115
 2017-01-15 16:27:24 +00:00
Dan Brown
581c382f65
Fixed image delete permission issue 
Also fixed missing translations and wrote tests to cover issue.
Fixes #258
 2017-01-08 19:19:30 +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
573357a08c
Extracted text from logic files 2016-12-04 16:51:39 +00:00
Dan Brown
0775cd09a1
Extracted text for remaining views 2016-12-04 14:08:04 +00:00
Dan Brown
96075dee7b
Extracted text from page views & standardised breadcrumbs 2016-12-03 18:35:40 +00:00
Dan Brown
066adf3cea
Moved text for errors and form views. 
Updated 404 page with additional links
 2016-12-03 13:31:54 +00:00
Dan Brown
57dc53ceff
Extracted text from book & chapter views 2016-11-17 13:33:07 +00:00
Dan Brown
694a9459c1
Moved text from auth views into lang files 2016-11-13 16:34:28 +00:00
Dan Brown
da10c50945
Added app name header display setting + extracted setting text 
Closes #194
 2016-09-22 18:53:22 +01:00
Dan Brown
e0235fda8b
Made registration gravatar/email requests fail gracefully 
* Extracted any email confirmation text into langs.
* Added new notification on confirmation email send fail.

Closes #187
 2016-09-17 21:33:55 +01:00
Dan Brown
9dc9724e15 Laravel 5.3 upgrade (#189) 
* Started move to laravel 5.3

* Started updating login & registration flows for laravel 5.3 update

* Updated app emails to notification system

* Fixed registations bugs and removed email confirmation model

* Fixed large portion of laravel post-upgrade issues

* Fixed and tested LDAP process
 2016-09-17 18:22:04 +01:00
Dan Brown
9baa96d41c Added chapter move actions. Closes #86 2016-06-25 15:31:38 +01:00
Dan Brown
7f99903fdb Finished off page move functionality 2016-06-12 12:14:14 +01:00
Dan Brown
a14b5c33fd Added missing permission checkboxes and improved image AJAX permission responses 2016-02-27 20:52:46 +00:00
Dan Brown
d6c00a85ad Fixed incorrect notification when deleting a page 2016-02-10 12:48:29 +00:00
Dan Brown
8af012bc2a Added filtering to activity lists. Fixes #14. 2015-08-30 11:47:58 +01:00
Dan Brown
f37a886205 Updated views for permissions and added notifications. Fixes #2 and #7 2015-08-29 16:00:19 +01:00
Dan Brown
ae95d0a239 Added permission system 2015-08-29 15:03:42 +01:00
Dan Brown
732f3a9986 Fixed some bugs and added a proper home page 2015-08-16 20:11:21 +01:00
Dan Brown
5d9d096028 Added activity history to to all entities. Fixes #12 2015-08-16 18:59:23 +01:00
Dan Brown
eaa1765c7a Initial commit 2015-07-12 20:01:42 +01:00