Dan Brown
189a598d56
Merge branch 'master' of github.com:BookStackApp/BookStack
2019-10-29 22:34:12 +00:00
Dan Brown
90f9240be4
Merge branch 'philjak-feature_move_page_into_chapter'
2019-10-29 22:33:53 +00:00
Dan Brown
d64c358c4f
Updated sort logic to handle chapter to book scenario
...
- Extended tests out to cover
2019-10-29 22:33:09 +00:00
Dan Brown
e108808a32
Merge branch 'feature_move_page_into_chapter' of git://github.com/philjak/BookStack into philjak-feature_move_page_into_chapter
2019-10-29 22:26:11 +00:00
Dan Brown
6a1b6a97f9
Added test for page move into chapter
2019-10-29 22:25:53 +00:00
jakob
bea983ab85
Download and assign avatar when creating LDAP user in database. Fixes issue #1161
2019-10-29 22:18:02 +00:00
jakob
7368ff3e6a
No need to save page
2019-10-28 16:53:48 +01:00
jakob
4daeb9daa6
Check if parent is a chapter. If so, move into Book and assing page to chapter.
2019-10-28 15:33:28 +01:00
Dan Brown
b80aa2350f
Merge branch 'philjak-feature_bugfix_save_book_cover'
2019-10-27 17:05:34 +00:00
Dan Brown
e26474f233
Merge branch 'feature_bugfix_save_book_cover' of git://github.com/philjak/BookStack into philjak-feature_bugfix_save_book_cover
2019-10-27 17:03:02 +00:00
Dan Brown
1b350d622d
Merge branch 'cw1998-fix/#1662'
2019-10-27 16:57:00 +00:00
Dan Brown
4b9618cd21
Update book form so cancel URL is explicitly passed in
...
- Added to prevent future possibility of 'shelf' var being introduced in
scope and therefore causing a side-effect of redirect logic.
2019-10-27 16:55:05 +00:00
Dan Brown
28184c6bfc
Merge branch 'fix/#1662' of git://github.com/cw1998/BookStack into cw1998-fix/#1662
2019-10-27 16:44:41 +00:00
Dan Brown
99ce3067c7
Added test to check custom theme lang items
2019-10-26 18:07:14 +01:00
Dan Brown
4763b899b6
Made it possible to override translations via theme system
2019-10-26 18:07:14 +01:00
Dan Brown
1366fc45ce
Added tests to cover test email sends
...
- Also tweaked wording of 'E-mail' to 'Email' to remain consistent with
the rest of the app.
Related to #1696 and #1719
2019-10-23 20:25:51 +01:00
Dan Brown
a2370f7c9d
Merge branch 'feature-send-test-email' of git://github.com/timoschwarzer/BookStack into timoschwarzer-feature-send-test-email
2019-10-23 19:53:51 +01:00
jakob
bc38fd3ac4
entity needs to be saved after image upload and associate
2019-10-22 11:18:08 +02:00
istist
5ae0e127df
Update auth.php
...
Edit for 'Must be over 7 characters'.
2019-10-21 04:17:52 +09:00
User
2eb6f178c2
Banish .DS_Store
2019-10-21 03:51:55 +09:00
User
19ce6da0d3
Update Korean translation
2019-10-21 03:44:38 +09:00
Dan Brown
99ae592ae9
New Crowdin translations ( #1732 )
...
* New translations auth.php (Ukrainian)
* New translations common.php (Ukrainian)
* New translations entities.php (Ukrainian)
* New translations entities.php (Ukrainian)
* New translations settings.php (Ukrainian)
* New translations validation.php (Ukrainian)
* New translations settings.php (French)
* New translations settings.php (Russian)
* New translations settings.php (Spanish, Argentina)
* New translations settings.php (Portuguese, Brazilian)
* New translations settings.php (Chinese Traditional)
* New translations settings.php (Chinese Simplified)
* New translations settings.php (Ukrainian)
* New translations settings.php (Turkish)
* New translations settings.php (Swedish)
* New translations settings.php (Slovak)
* New translations settings.php (Polish)
* New translations settings.php (Spanish)
* New translations settings.php (Dutch)
* New translations settings.php (Korean)
* New translations settings.php (Japanese)
* New translations settings.php (Italian)
* New translations settings.php (Hungarian)
* New translations settings.php (German)
* New translations settings.php (Czech)
* New translations settings.php (Arabic)
* New translations settings.php (German Informal)
2019-10-19 00:13:00 +01:00
Dan Brown
f37131a5bf
Removed old Translation Service + Provider
...
Was no longer needed due to only being there to perform
language extension for de_informal but now this is done by crowdin
instead so it's redundant. Same goes for checking and formatting
scripts.
Also removed comment advising deletion form settings.php language list
since this is now auto-copied to languages anyway.
Related to #1261
2019-10-19 00:04:49 +01:00
Dan Brown
f3a7d58816
Initial Crowdin Translation Integration Merge ( #1731 )
...
* New translations activities.php (French)
* New translations entities.php (Turkish)
* New translations entities.php (Swedish)
* New translations errors.php (Swedish)
* New translations pagination.php (Swedish)
* New translations passwords.php (Swedish)
* New translations settings.php (Swedish)
* New translations validation.php (Swedish)
* New translations auth.php (Turkish)
* New translations common.php (Turkish)
* New translations errors.php (Turkish)
* New translations common.php (Swedish)
* New translations settings.php (Turkish)
* New translations validation.php (Turkish)
* New translations activities.php (Ukrainian)
* New translations auth.php (Ukrainian)
* New translations common.php (Ukrainian)
* New translations components.php (Ukrainian)
* New translations entities.php (Ukrainian)
* New translations errors.php (Ukrainian)
* New translations components.php (Swedish)
* New translations auth.php (Swedish)
* New translations passwords.php (Ukrainian)
* New translations settings.php (Russian)
* New translations settings.php (Polish)
* New translations validation.php (Polish)
* New translations activities.php (Russian)
* New translations auth.php (Russian)
* New translations common.php (Russian)
* New translations components.php (Russian)
* New translations entities.php (Russian)
* New translations errors.php (Russian)
* New translations passwords.php (Russian)
* New translations validation.php (Russian)
* New translations activities.php (Swedish)
* New translations activities.php (Slovak)
* New translations auth.php (Slovak)
* New translations common.php (Slovak)
* New translations components.php (Slovak)
* New translations entities.php (Slovak)
* New translations errors.php (Slovak)
* New translations pagination.php (Slovak)
* New translations passwords.php (Slovak)
* New translations settings.php (Slovak)
* New translations validation.php (Slovak)
* New translations pagination.php (Ukrainian)
* New translations settings.php (Ukrainian)
* New translations pagination.php (Polish)
* New translations passwords.php (Spanish, Argentina)
* New translations settings.php (Portuguese, Brazilian)
* New translations validation.php (Portuguese, Brazilian)
* New translations activities.php (Spanish, Argentina)
* New translations auth.php (Spanish, Argentina)
* New translations common.php (Spanish, Argentina)
* New translations components.php (Spanish, Argentina)
* New translations entities.php (Spanish, Argentina)
* New translations errors.php (Spanish, Argentina)
* New translations pagination.php (Spanish, Argentina)
* New translations settings.php (Spanish, Argentina)
* New translations errors.php (Portuguese, Brazilian)
* New translations validation.php (Spanish, Argentina)
* New translations activities.php (German Informal)
* New translations auth.php (German Informal)
* New translations common.php (German Informal)
* New translations components.php (German Informal)
* New translations entities.php (German Informal)
* New translations errors.php (German Informal)
* New translations pagination.php (German Informal)
* New translations passwords.php (German Informal)
* New translations settings.php (German Informal)
* New translations entities.php (Portuguese, Brazilian)
* New translations validation.php (Ukrainian)
* New translations activities.php (Chinese Traditional)
* New translations activities.php (Chinese Simplified)
* New translations auth.php (Chinese Simplified)
* New translations common.php (Chinese Simplified)
* New translations components.php (Chinese Simplified)
* New translations entities.php (Chinese Simplified)
* New translations errors.php (Chinese Simplified)
* New translations pagination.php (Chinese Simplified)
* New translations passwords.php (Chinese Simplified)
* New translations settings.php (Chinese Simplified)
* New translations validation.php (Chinese Simplified)
* New translations auth.php (Chinese Traditional)
* New translations components.php (Portuguese, Brazilian)
* New translations common.php (Chinese Traditional)
* New translations components.php (Chinese Traditional)
* New translations entities.php (Chinese Traditional)
* New translations errors.php (Chinese Traditional)
* New translations pagination.php (Chinese Traditional)
* New translations passwords.php (Chinese Traditional)
* New translations settings.php (Chinese Traditional)
* New translations validation.php (Chinese Traditional)
* New translations activities.php (Portuguese, Brazilian)
* New translations auth.php (Portuguese, Brazilian)
* New translations common.php (Portuguese, Brazilian)
* New translations passwords.php (Polish)
* New translations errors.php (Polish)
* New translations auth.php (French)
* New translations validation.php (Czech)
* New translations validation.php (Arabic)
* New translations auth.php (Czech)
* New translations common.php (Czech)
* New translations entities.php (Czech)
* New translations errors.php (Czech)
* New translations pagination.php (Czech)
* New translations settings.php (Czech)
* New translations activities.php (German)
* New translations passwords.php (Arabic)
* New translations auth.php (German)
* New translations common.php (German)
* New translations components.php (German)
* New translations entities.php (German)
* New translations errors.php (German)
* New translations pagination.php (German)
* New translations passwords.php (German)
* New translations settings.php (German)
* New translations validation.php (German)
* New translations settings.php (Arabic)
* New translations pagination.php (Arabic)
* New translations common.php (Hungarian)
* New translations common.php (Spanish)
* New translations common.php (French)
* New translations components.php (French)
* New translations entities.php (French)
* New translations errors.php (French)
* New translations pagination.php (French)
* New translations passwords.php (French)
* New translations settings.php (French)
* New translations validation.php (French)
* New translations errors.php (Arabic)
* New translations settings.php (Spanish)
* New translations validation.php (Spanish)
* New translations activities.php (Arabic)
* New translations auth.php (Arabic)
* New translations common.php (Arabic)
* New translations components.php (Arabic)
* New translations entities.php (Arabic)
* New translations auth.php (Hungarian)
* New translations entities.php (Polish)
* New translations common.php (Dutch)
* New translations common.php (Korean)
* New translations components.php (Korean)
* New translations entities.php (Korean)
* New translations errors.php (Korean)
* New translations pagination.php (Korean)
* New translations passwords.php (Korean)
* New translations settings.php (Korean)
* New translations validation.php (Korean)
* New translations activities.php (Dutch)
* New translations auth.php (Dutch)
* New translations components.php (Dutch)
* New translations activities.php (Korean)
* New translations entities.php (Dutch)
* New translations errors.php (Dutch)
* New translations pagination.php (Dutch)
* New translations passwords.php (Dutch)
* New translations settings.php (Dutch)
* New translations validation.php (Dutch)
* New translations activities.php (Polish)
* New translations auth.php (Polish)
* New translations common.php (Polish)
* New translations components.php (Polish)
* New translations auth.php (Korean)
* New translations validation.php (Japanese)
* New translations entities.php (Hungarian)
* New translations errors.php (Italian)
* New translations errors.php (Hungarian)
* New translations settings.php (Hungarian)
* New translations validation.php (Hungarian)
* New translations activities.php (Italian)
* New translations auth.php (Italian)
* New translations common.php (Italian)
* New translations components.php (Italian)
* New translations entities.php (Italian)
* New translations pagination.php (Italian)
* New translations settings.php (Japanese)
* New translations passwords.php (Italian)
* New translations settings.php (Italian)
* New translations validation.php (Italian)
* New translations activities.php (Japanese)
* New translations auth.php (Japanese)
* New translations common.php (Japanese)
* New translations components.php (Japanese)
* New translations entities.php (Japanese)
* New translations errors.php (Japanese)
* New translations pagination.php (Japanese)
* New translations passwords.php (Japanese)
* New translations validation.php (German Informal)
2019-10-18 17:08:22 +01:00
Dan Brown
f1d7699df5
Updated Korean to be correct country code
2019-10-18 14:27:41 +01:00
Dan Brown
37560a3f8c
Fixed crowdin translation path
2019-10-18 02:09:12 +01:00
Dan Brown
5f3caf3643
Update Crowdin configuration file
2019-10-18 01:46:30 +01:00
Dan Brown
c8d90791ff
Moved crownin config file
2019-10-18 01:45:25 +01:00
Dan Brown
c108c16419
Added crowdin config file
2019-10-18 01:40:50 +01:00
Dan Brown
b09ea76b8d
Renamed properties input option as INI
...
- Also made INI be recognised as the codemirror "Properties" format.
2019-10-17 21:16:55 +01:00
Dan Brown
8b4bfa4d78
Merge branch 'master' of git://github.com/c0shea/BookStack into c0shea-master
2019-10-17 21:09:05 +01:00
James Geiger
e6fe299c4f
added additional color settings into UI
...
Adds new options in the customization section of the settings to change the shelf, book, chapter, page, and draft colors.
2019-10-17 13:46:18 -05:00
James Geiger
ae19658b50
Placeholder for allowing colors to be changed in settings UI.
2019-10-17 09:44:20 -05:00
Dan Brown
d7557befe2
Copied release page link to normal settings page
...
- Also updated link to not leak referrer info
2019-10-17 15:06:55 +01:00
Dan Brown
5c7262673a
Merge branch 'patch-1' of git://github.com/DeftNerd/BookStack into DeftNerd-patch-1
2019-10-17 14:58:20 +01:00
Dan Brown
ef762e851a
Reverted changes to codemirror line wrapping
2019-10-17 14:41:39 +01:00
Dan Brown
e91ef54cc9
Merge branch 'fix-1575' of git://github.com/james-geiger/BookStack into james-geiger-fix-1575
2019-10-17 14:32:39 +01:00
Dan Brown
3959841dbc
Added back in some tabindex that shouldn't have been removed
2019-10-17 14:21:13 +01:00
Dan Brown
e48d7d59cc
Removed tabindexes where found to be not required
2019-10-17 14:19:35 +01:00
Dan Brown
5a887e31da
Merge branch 'master' of git://github.com/almandin/BookStack into almandin-master
2019-10-17 14:09:07 +01:00
Dan Brown
df98deb59d
Added Turkish to locale system
2019-10-17 14:01:19 +01:00
Dan Brown
ddb7f33868
Merge branch 'master' of git://github.com/oykenfurkan/BookStack into oykenfurkan-master
2019-10-17 13:56:53 +01:00
Dan Brown
076cf59a41
Merge pull request #1695 from qligier/master
...
French translation update
2019-10-17 13:46:33 +01:00
Dan Brown
4ab6a25893
Merge pull request #1681 from leomartinez/master
...
Updated 'Spanish Argentina' translation.
2019-10-17 13:44:28 +01:00
Dan Brown
f413fc528a
Merge pull request #1646 from kostefun/patch-15
...
Update settings.php
2019-10-17 13:43:27 +01:00
Dan Brown
76bd0fdfa6
Added editor instance event hooks
...
As per #1721
2019-10-16 18:01:35 +01:00
Dan Brown
b24279cc12
Merge branch 'patching-v0.27'
2019-10-16 16:37:29 +01:00
Timo Schwarzer
61a9139bf0
Add feature to send test e-mails
2019-10-16 08:24:33 +02:00
Dan Brown
d6456e961a
Fixed issue causing text overlap in sort select box
...
Updated grid columns to be more adaptable to content, with a min-width
of the old value.
Fixes #1654
2019-10-07 21:06:15 +01:00
Dan Brown
d4c62265ca
Made JS animation cleanup process more reliable
...
Fixes #1643
2019-10-07 20:57:25 +01:00
