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
Arie Timmerman
b2b64fb853
Started with Dutch translation
2017-02-10 22:10:41 +01:00
Dan Brown
86625a7642
Neatened up social login/register buttons
2017-02-05 15:28:53 +00:00
Sebastian Reese
1c656d6556
Updated and improved german translation
2017-02-02 00:43:24 +01: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
NakaharaL
a0035e4de2
Brazilian Portuguese Localization
...
Translated files for messages from English to Brazilian Portuguese
2017-01-18 08:29:18 -03: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
sirgix
5d45286646
french translation
2017-01-16 14:51:33 +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
Robert Landes
e691b401c8
Added initial translation into German (formal)
...
This translation is based on the current english language files. It is a
transaltion into German (formal) language. A language selector on the
Settings page would be a nice addition.
2016-11-12 14:16:07 +01: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
