Commit Graph

283 Commits

Author SHA1 Message Date
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
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 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 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 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
Dan Brown 2ede273ef3
Merge pull request #753 from Alwaysin/master
Update french language
2018-03-24 14:36:12 +00:00
Dan Brown 6882bd3c62
Merge pull request #752 from Alwaysin/patch-1
Update entities.php for french language
2018-03-24 14:35:04 +00:00
Soseki Masao 696ef3ff33 fix entities.php 2018-03-23 18:20:44 +09:00
Soseki Masao 2d1567ea30 update japanese translation 2018-03-23 17:35:21 +09: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
Alwaysin 35c7e00203
Update entities.php 2018-03-18 14:46:56 +01:00
Alwaysin accd936781
Update settings.php 2018-03-18 14:24:39 +01:00
Alwaysin 880987f15c
Update components.php 2018-03-18 14:23:42 +01:00
Alwaysin 018084a951
Update common.php 2018-03-18 14:23:08 +01:00
Alwaysin 098b594104
Update auth.php 2018-03-18 14:21:11 +01:00
Alwaysin bb7fab1dc0
Update activities.php 2018-03-18 14:20:20 +01: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
Matteo Piccina 85605ab570 Update Italian translation 2018-03-12 16:43:19 +01:00
Dan Brown a4072365e3
Merge pull request #718 from artur-trzesiok/master
add missing polish translations for comments
2018-03-05 20:26:26 +00:00
Artur Trzęsiok 98a3c815cf add missing polish translations for comments 2018-02-26 23:49:58 +01:00
Leonardo Martinez fb48b025f3 Updated 'Spanish Argentina' translation. 2018-02-21 13:20:12 -03:00
Leonardo Martinez 395d02ef81 Updated 'Spanish Argentina' translation. 2018-02-19 10:15:24 -03: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
Dan Brown b167ae795e
Added script to check translation files
Closes #373
2017-12-04 20:25:04 +00:00
Abijeet 7a5bd23909 Added language translation for the new settings icons. 2017-11-16 00:22:22 +05:30
Guilherme Bernal 332f678ed0 Update pt_BR translations 2017-10-15 16:15:53 -03:00
Dan Brown db51cee2d8
Prevented custom homepage being deleted
Fixes #546
2017-10-15 19:14:46 +01:00
Dan Brown 3d375fae55 Merge pull request #529 from cipi1965/master
Updated italian translation
2017-10-01 11:44:45 +01:00
Dan Brown c99a50de2c Merge pull request #528 from turbotankist/master
russian lang fixes
2017-10-01 11:43:31 +01:00
Dan Brown 1a32b25b5e Merge pull request #523 from sanderdw/master
Update dutch translations
2017-10-01 11:33:22 +01:00
Matteo Piccina fa4bee2d98 Updated italian translation 2017-09-27 10:44:08 +02:00
alexey ce63260fa6 russian lang fixes 2017-09-27 11:17:56 +03:00
sanderdw 2259263214 Update entities.php 2017-09-23 00:52:08 +02:00
sanderdw 762cf5f183 Update components.php 2017-09-23 00:47:02 +02:00
sanderdw 07175f2b3e Update dutch translations 2017-09-23 00:28:25 +02:00
Leonardo Martinez 941bb73a68 Added missing colon 2017-09-19 14:25:44 -03:00
Leonardo Martinez 8e652f5d8f Added 'Spanish Argentina' translation. 2017-09-19 13:43:17 -03:00
Leonardo Martinez eec1b21928 Added 'Spanish Argentina' translation. 2017-09-19 13:42:39 -03:00
Dan Brown 1baeb7bec9 Merge pull request #510 from sanderdw/patch-1
Update entities.php
2017-09-17 11:09:12 +01:00
sanderdw 244c5a3ebb Update entities.php 2017-09-14 21:43:47 +02:00
alexey ab7f5def04 Russian lang added 2017-09-12 16:42:04 +03:00
Dan Brown cd7e727f8c
Modified IT comment translations as per recent changes 2017-09-10 16:43:05 +01: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
Timo Schwarzer 8acc188e16
Update german translation 2017-09-10 15:01:25 +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
Dan Brown 9bd5d6a422 Merge pull request #483 from msaus/japanese_lang_update
Japanese lang update
2017-09-02 14:39:14 +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
soseki 3966fb1df6 update Japanese language for code editor 2017-08-24 15:30:07 +09:00
soseki 830614fb19 add Japanese language for code editor 2017-08-24 15:24:43 +09:00
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
Timo Schwarzer 0d6a6b5b63 Update/fix german translation 2017-08-16 22:31:07 +02: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 bbaa2f4cda Merge pull request #435 from JachuPL/polish-localization
Polish translation
2017-07-27 16:48:19 +01:00
Jérôme Le Gal 0b2c3c1aa7 settings.php: add missing french translation 2017-07-22 23:45:09 +02:00
Jérôme Le Gal 0dc9d0bed7 errors.php: add missing french translation 2017-07-22 23:45:09 +02:00
Jérôme Le Gal a2a2e37797 settings.php: fix some spelling issues in french translation 2017-07-22 23:45:09 +02:00
Jérôme Le Gal 3d9819f97c passwords.php: fix some spelling issues in french translation 2017-07-22 23:45:09 +02:00
Jérôme Le Gal b2b4a24d7c errors.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
Jérôme Le Gal 7557d6d619 entities.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
Jérôme Le Gal 57eeb9b0a3 common.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
Jérôme Le Gal 813c7d5902 auth.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02: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
Shuma Yoshioka b2b8706d05 Translate errors.php 2017-07-01 16:38:43 +09:00
Shuma Yoshioka 2d345fe454 Translate entities.php 2017-07-01 16:38:20 +09:00
Shuma Yoshioka 7bec70d429 Translate common.php 2017-07-01 16:37:07 +09:00
Shuma Yoshioka 60710e7fb4 Translate auth.php 2017-07-01 16:33:54 +09:00
Shuma Yoshioka f10d3a8564 Translate validation.php 2017-07-01 16:32:36 +09:00
Shuma Yoshioka b020520366 Translate passwords.php 2017-07-01 16:32:02 +09:00
Shuma Yoshioka 52010e5820 Translate pagination.php 2017-07-01 16:31:32 +09:00
Nilesh Deepak af72f0d490 Bookstack grid view. 2017-06-29 18:54:04 +05:30
Shuma Yoshioka 75eca03b05 Translate settings.php 2017-06-24 20:49:24 +09:00
Shuma Yoshioka b8ebefd803 Translate components.php 2017-06-24 20:48:34 +09:00
Shuma Yoshioka 168c66815e add `ja` to settings 2017-06-24 20:46:38 +09:00
Shuma Yoshioka 26e703a1cd translate activities.php 2017-06-19 00:02:09 +09:00
Abijeet 8dab31b87a Merge branch 'master' of https://github.com/Abijeet/BookStack 2017-06-10 22:56:07 +05:30
Abijeet e155c52256 #47 - Fixes a few issues with the code. 2017-06-10 22:55:36 +05:30
Abijeet Patro c76e7c706c adding a comment on top. 2017-06-10 19:47:45 +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 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 ad4642c2c4
Enabled translation when not logged in
Reads from the Accept-Language HTTP header.
Also fixed some encoding for ES translations.

Fixes #375
2017-04-29 16:47:41 +01:00
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
Dan Brown 87e18b8068 Merge pull request #357 from diegoseso/master
Spanish translation completed
2017-04-19 06:40:00 +01:00
Diego Jose Sosa Diaz 607a2c91fc Fixing encoding of files affecting accents. 2017-04-18 23:41:19 +02: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
Diego Jose Sosa Diaz b488e969bb Reaching 100 % Spanish translation 2017-04-06 23:12:05 +02:00
Diego Jose Sosa Diaz 1377296ef4 Translating to spanish entities errors and settings 2017-04-06 09:35:24 +02:00
Dan Brown 4499ae84bb
Made fixes to es languge files and users page
Fixed PHP formatting error in ES lang file and added tests to cover.
Made user edit page more responsive on smaller devices.
Fixed 'cancel' button on profile screen when the user does not have
permission to manage users.
2017-03-05 15:34:54 +00: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 7163997367 Merge pull request #334 from diegoseso/master
First spanish translation effort
2017-03-05 14:18:55 +00:00
Dan Brown 2385a6c29b Merge pull request #325 from arietimmerman/dutchbranch
Dutch Language Files
2017-03-05 14:15:47 +00:00
Diego Jose Sosa Diaz f7645824d9 First spanish translation effort 2017-03-03 00:21:33 +01:00
Dan Brown 4a2a539c08 Merge pull request #295 from ReeseSebastian/master
Updated and improved german translation
2017-02-23 19:19:21 +00:00
Arie Timmerman 4214fcd2fa Updated Dutch language files 2017-02-11 11:58:45 +01:00