Dan Brown
71ccb90ef4
Amended owned by search filter to use slugs
2021-03-15 18:27:03 +00:00
Dan Brown
c8564b7792
Merge branch 'search-owned-by-me' of git://github.com/benediktvolke/BookStack into benediktvolke-search-owned-by-me
2021-03-15 18:21:09 +00:00
Dan Brown
215c69acb2
Merge image name cleaning functions
...
Updated testing for changes and to check existing of new expected file
name.
Related to #2611
2021-03-14 23:20:21 +00:00
Dan Brown
c1f67372a7
Merge branch 'master' of git://github.com/webfoersterei/BookStack into webfoersterei-master
2021-03-14 22:55:30 +00:00
Dan Brown
b929c0adbb
Performed further cleanup in permission service
2021-03-14 20:32:33 +00:00
Dan Brown
1e5951a75f
Done a refactor pass on PermissionService
...
Could do with splitting out into seperate query/build classess really.
Closes #2633 .
2021-03-14 19:52:07 +00:00
Dan Brown
a644f64c6b
Merge branch 'v0.31.x'
2021-03-13 15:37:44 +00:00
Dan Brown
339d4ec355
Fixed misalignment of page and chapter parent book
...
Could occur when a chapter was moved with deleted pages.
Fixes #2632
2021-03-13 15:18:37 +00:00
Dan Brown
615038ac6d
Merge pull request #2626 from BookStackApp/2525_add_user_slugs
...
User slugs
2021-03-10 23:12:25 +00:00
Dan Brown
3c57cbc567
Updated testing for user slugs
2021-03-10 23:04:18 +00:00
Dan Brown
da929d5edc
Updates search to use user slugs
2021-03-10 22:51:18 +00:00
Dan Brown
124c4d0778
Updated register paths to include user slugs
2021-03-10 22:37:53 +00:00
Dan Brown
19d79b6a0f
Started rolling out user slugs to model and core controllers
2021-03-09 23:06:12 +00:00
Dan Brown
3a9caea846
Started work on user slugs
...
Related to #2525
2021-03-08 22:34:22 +00:00
Dan Brown
34e6098687
Merge branch 'master' of github.com:BookStackApp/BookStack
2021-03-07 22:24:41 +00:00
Dan Brown
98a1e57ba9
Ran phpcbf and updated phpcs.xml
2021-03-07 22:24:05 +00:00
Dan Brown
f31cdf7bff
New Crowdin updates ( #2620 )
...
* New translations settings.php (Norwegian Bokmal)
* New translations auth.php (Catalan)
* New translations settings.php (Catalan)
* New translations entities.php (Catalan)
* New translations settings.php (German Informal)
* New translations settings.php (Bosnian)
* New translations settings.php (Spanish)
* New translations settings.php (French)
* New translations settings.php (Bulgarian)
* New translations settings.php (Arabic)
* New translations settings.php (Czech)
* New translations settings.php (Spanish, Argentina)
* New translations settings.php (Slovenian)
* New translations settings.php (Persian)
* 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 (Danish)
* New translations settings.php (Russian)
* New translations settings.php (Polish)
* 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 (Hebrew)
* New translations auth.php (German)
* New translations auth.php (Spanish)
* New translations settings.php (Portuguese)
* New translations settings.php (German)
* New translations settings.php (Latvian)
* New translations settings.php (Vietnamese)
* New translations activities.php (French)
* New translations settings.php (Indonesian)
* New translations entities.php (French)
* New translations components.php (German Informal)
2021-03-07 17:41:58 +00:00
Dan Brown
9a3e1490ff
Merge branch 'Ereza-master'
2021-03-07 17:25:27 +00:00
Dan Brown
1f2fd58e28
Merge branch 'master' of git://github.com/Ereza/BookStack into Ereza-master
2021-03-07 17:25:07 +00:00
Dan Brown
bcf3a0f677
Merge pull request #2616 from geins/master
...
Fixed german formal translation
2021-03-07 17:20:07 +00:00
Dan Brown
f40dedb451
Merge branch 'master' into master
2021-03-07 17:19:55 +00:00
Dan Brown
266f6846b5
Merge pull request #2609 from arcoai/fix/user-invite-email-subject-spanish-translation
...
Fixed user invite email subject in spanish translation (#2608 )
2021-03-07 17:18:07 +00:00
Dan Brown
49ca9a9db8
Merge pull request #2533 from benediktvolke/fix-german-language
...
Fix German translation string
2021-03-07 17:15:40 +00:00
Dan Brown
e7a7d8cc1d
Merge pull request #2513 from Baptistou/patch-1
...
Fix French translations
2021-03-07 17:14:57 +00:00
Dan Brown
34c2da4ab1
New Crowdin updates ( #2618 )
...
* New translations settings.php (Russian)
* 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 (Slovenian)
* New translations settings.php (Slovak)
* New translations settings.php (Polish)
* New translations settings.php (Portuguese, Brazilian)
* 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 (Hebrew)
* New translations settings.php (Danish)
* New translations settings.php (Chinese Traditional)
* New translations settings.php (Persian)
* New translations settings.php (Bulgarian)
* New translations settings.php (Spanish, Argentina)
* New translations settings.php (German Informal)
* New translations settings.php (Norwegian Bokmal)
* New translations settings.php (Bosnian)
* New translations settings.php (Czech)
* New translations settings.php (Arabic)
* New translations settings.php (Spanish)
* New translations settings.php (French)
* New translations settings.php (Portuguese)
* New translations settings.php (German)
* New translations settings.php (Latvian)
* New translations settings.php (Vietnamese)
* New translations settings.php (Indonesian)
* New translations common.php (German Informal)
* New translations common.php (Spanish, Argentina)
2021-03-07 17:11:18 +00:00
Dan Brown
7497203014
Merge branch 'master' of github.com:BookStackApp/BookStack
2021-03-07 17:03:21 +00:00
Dan Brown
d731a4f695
Updated language lists with Bosnian, Indonesian, Latvian & Portuguese
2021-03-07 17:02:28 +00:00
Dan Brown
03f6be6d0e
New Crowdin updates ( #2501 )
...
* New translations activities.php (German Informal)
* New translations settings.php (Ukrainian)
* New translations settings.php (Turkish)
* New translations settings.php (Polish)
* New translations common.php (Russian)
* New translations settings.php (Russian)
* New translations common.php (Slovak)
* New translations settings.php (Slovak)
* New translations common.php (Slovenian)
* New translations settings.php (Slovenian)
* New translations common.php (Swedish)
* New translations settings.php (Swedish)
* New translations common.php (Turkish)
* New translations common.php (Ukrainian)
* New translations settings.php (Dutch)
* New translations common.php (Chinese Simplified)
* New translations settings.php (Chinese Simplified)
* New translations common.php (Chinese Traditional)
* New translations settings.php (Chinese Traditional)
* New translations common.php (Vietnamese)
* New translations settings.php (Vietnamese)
* New translations common.php (Portuguese, Brazilian)
* New translations settings.php (Portuguese, Brazilian)
* New translations common.php (Spanish, Argentina)
* New translations settings.php (Spanish, Argentina)
* New translations common.php (Norwegian Bokmal)
* New translations common.php (Polish)
* New translations common.php (Dutch)
* New translations settings.php (Norwegian Bokmal)
* New translations settings.php (Czech)
* New translations settings.php (German)
* New translations settings.php (German Informal)
* New translations common.php (French)
* New translations settings.php (French)
* New translations common.php (Spanish)
* New translations settings.php (Spanish)
* New translations common.php (Arabic)
* New translations settings.php (Arabic)
* New translations common.php (Bulgarian)
* New translations settings.php (Bulgarian)
* New translations common.php (Czech)
* New translations common.php (Danish)
* New translations settings.php (Korean)
* New translations settings.php (Danish)
* New translations common.php (German)
* New translations common.php (Hebrew)
* New translations settings.php (Hebrew)
* New translations common.php (Hungarian)
* New translations settings.php (Hungarian)
* New translations common.php (Italian)
* New translations settings.php (Italian)
* New translations common.php (Japanese)
* New translations settings.php (Japanese)
* New translations common.php (Korean)
* New translations common.php (German Informal)
* New translations common.php (Spanish)
* New translations settings.php (Spanish)
* New translations settings.php (Hebrew)
* New translations settings.php (Hebrew)
* New translations settings.php (Hebrew)
* New translations settings.php (Hebrew)
* New translations common.php (Chinese Simplified)
* New translations settings.php (Chinese Simplified)
* New translations settings.php (Chinese Simplified)
* New translations components.php (Hebrew)
* New translations passwords.php (Hebrew)
* New translations activities.php (Persian)
* New translations settings.php (Latvian)
* New translations settings.php (Bosnian)
* New translations passwords.php (Bosnian)
* New translations pagination.php (Bosnian)
* New translations errors.php (Bosnian)
* New translations entities.php (Bosnian)
* New translations components.php (Bosnian)
* New translations common.php (Bosnian)
* New translations auth.php (Bosnian)
* New translations activities.php (Bosnian)
* New translations validation.php (Latvian)
* New translations passwords.php (Latvian)
* New translations common.php (Persian)
* New translations pagination.php (Latvian)
* New translations errors.php (Latvian)
* New translations entities.php (Latvian)
* New translations components.php (Latvian)
* New translations common.php (Latvian)
* New translations auth.php (Latvian)
* New translations activities.php (Latvian)
* New translations validation.php (Persian)
* New translations settings.php (Persian)
* New translations entities.php (Persian)
* New translations validation.php (Bosnian)
* New translations activities.php (Latvian)
* New translations common.php (Latvian)
* New translations common.php (Latvian)
* New translations passwords.php (Latvian)
* New translations auth.php (Latvian)
* New translations auth.php (Latvian)
* New translations activities.php (Bosnian)
* New translations activities.php (Bosnian)
* New translations components.php (Bosnian)
* New translations components.php (Bosnian)
* New translations activities.php (Latvian)
* New translations auth.php (Latvian)
* New translations activities.php (Latvian)
* New translations auth.php (Latvian)
* New translations pagination.php (Latvian)
* New translations passwords.php (Latvian)
* New translations auth.php (Latvian)
* New translations common.php (Latvian)
* New translations components.php (Latvian)
* New translations passwords.php (Latvian)
* New translations components.php (Latvian)
* New translations common.php (French)
* New translations settings.php (French)
* New translations entities.php (Latvian)
* New translations entities.php (Latvian)
* New translations entities.php (Latvian)
* New translations settings.php (Latvian)
* New translations errors.php (Latvian)
* New translations settings.php (Latvian)
* New translations common.php (Slovenian)
* New translations settings.php (Slovenian)
* New translations entities.php (Slovenian)
* New translations entities.php (Latvian)
* New translations entities.php (Latvian)
* New translations errors.php (Latvian)
* New translations validation.php (Latvian)
* New translations validation.php (Latvian)
* New translations entities.php (Latvian)
* New translations entities.php (Latvian)
* New translations errors.php (Latvian)
* New translations settings.php (Latvian)
* New translations activities.php (Portuguese, Brazilian)
* New translations common.php (Portuguese, Brazilian)
* New translations entities.php (Portuguese, Brazilian)
* New translations settings.php (Portuguese, Brazilian)
* New translations validation.php (Portuguese, Brazilian)
* New translations validation.php (Latvian)
* New translations errors.php (Latvian)
* New translations settings.php (Latvian)
* New translations validation.php (Latvian)
* New translations common.php (German)
* New translations settings.php (German)
* New translations settings.php (Latvian)
* New translations validation.php (Latvian)
* New translations settings.php (Latvian)
* New translations entities.php (Latvian)
* New translations entities.php (Latvian)
* New translations entities.php (Latvian)
* New translations errors.php (Latvian)
* New translations settings.php (Latvian)
* New translations activities.php (Portuguese)
* New translations auth.php (Indonesian)
* New translations settings.php (Indonesian)
* New translations passwords.php (Indonesian)
* New translations pagination.php (Indonesian)
* New translations errors.php (Indonesian)
* New translations entities.php (Indonesian)
* New translations components.php (Indonesian)
* New translations common.php (Indonesian)
* New translations activities.php (Indonesian)
* New translations auth.php (Portuguese)
* New translations validation.php (Portuguese)
* New translations settings.php (Portuguese)
* New translations passwords.php (Portuguese)
* New translations pagination.php (Portuguese)
* New translations errors.php (Portuguese)
* New translations entities.php (Portuguese)
* New translations components.php (Portuguese)
* New translations common.php (Portuguese)
* New translations validation.php (Indonesian)
* New translations auth.php (Portuguese)
* New translations common.php (Portuguese)
* New translations components.php (Portuguese)
* New translations entities.php (Portuguese)
* New translations entities.php (Portuguese)
* New translations entities.php (Portuguese)
* New translations entities.php (Portuguese)
* New translations entities.php (Portuguese)
* New translations errors.php (Portuguese)
* New translations components.php (Bosnian)
* New translations auth.php (Bosnian)
* New translations common.php (Bosnian)
* New translations pagination.php (Bosnian)
* New translations passwords.php (Bosnian)
* New translations auth.php (Bosnian)
* New translations errors.php (Portuguese)
* New translations errors.php (Portuguese)
* New translations pagination.php (Portuguese)
* New translations passwords.php (Portuguese)
* New translations settings.php (Portuguese)
* New translations validation.php (Portuguese)
* New translations settings.php (Portuguese)
* New translations settings.php (Portuguese)
* New translations activities.php (Vietnamese)
* New translations settings.php (Vietnamese)
* New translations validation.php (Bosnian)
* New translations validation.php (Bosnian)
* New translations validation.php (Bosnian)
* New translations validation.php (Bosnian)
* New translations validation.php (Bosnian)
* New translations errors.php (Bosnian)
* New translations errors.php (Bosnian)
* New translations errors.php (Bosnian)
* New translations errors.php (Bosnian)
* New translations errors.php (Bosnian)
* New translations errors.php (Bosnian)
* New translations entities.php (Bosnian)
* New translations entities.php (Bosnian)
* New translations activities.php (Indonesian)
* New translations activities.php (Indonesian)
* New translations auth.php (Indonesian)
* New translations entities.php (Indonesian)
* New translations auth.php (Indonesian)
* New translations auth.php (Indonesian)
* New translations common.php (Indonesian)
* New translations components.php (Indonesian)
* New translations entities.php (Indonesian)
* New translations entities.php (Indonesian)
* New translations entities.php (Indonesian)
* New translations entities.php (Latvian)
* New translations errors.php (Latvian)
* New translations settings.php (Latvian)
* New translations entities.php (Indonesian)
* New translations settings.php (Latvian)
* New translations entities.php (Bosnian)
* New translations entities.php (Bosnian)
* New translations entities.php (Indonesian)
* New translations entities.php (Indonesian)
* New translations errors.php (Indonesian)
* New translations errors.php (Indonesian)
* New translations entities.php (Indonesian)
* New translations errors.php (Indonesian)
* New translations pagination.php (Indonesian)
* New translations passwords.php (Indonesian)
* New translations validation.php (Indonesian)
* New translations settings.php (Indonesian)
* New translations settings.php (Indonesian)
* New translations settings.php (Indonesian)
* New translations settings.php (Indonesian)
* New translations validation.php (Indonesian)
* New translations common.php (Indonesian)
* New translations entities.php (Indonesian)
* New translations validation.php (Indonesian)
* New translations entities.php (Bosnian)
* New translations entities.php (Bosnian)
* New translations entities.php (Bosnian)
* New translations validation.php (Indonesian)
* New translations auth.php (Indonesian)
* New translations validation.php (Indonesian)
2021-03-07 16:44:28 +00:00
Dan Brown
938b5b4d1d
Updated github CI actions for ubuntu 20.04
...
Squash of:
commit 6b7d305e776dcec2103b9e4486f3c57c674d046f
Author: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun Mar 7 16:25:43 2021 +0000
Updated migrations action and added ldap
commit 139d87687d3d4d6c2368adb522932469419c848a
Author: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun Mar 7 16:18:55 2021 +0000
Updated mysql user auth
commit 326d11e0d3b96bfb2e6ba446ada9cee479d3eb1a
Author: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun Mar 7 16:15:33 2021 +0000
Moved extensions to right place
commit aaa1e159ccbf535292615e094bb58ce6488726df
Author: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun Mar 7 16:13:22 2021 +0000
Added php extensions
commit 3720324288c974d825ff2a63306a5fbf1c0478ab
Author: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun Mar 7 16:07:37 2021 +0000
Update gh ci branches list for testing
commit 4e3a302a5a4480b45d967f398abbe33883b6d0fb
Author: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun Mar 7 16:06:19 2021 +0000
Updated github ci to use ubuntu 20.04
2021-03-07 16:31:51 +00:00
geins
792b51b5dc
Merge pull request #2 from geins/settings.php-german-patch
...
completed german translation of 4 english residues
2021-03-06 21:32:27 +01:00
geins
a57eae20b0
completed german translation of 4 english residues
2021-03-06 21:29:59 +01:00
geins
1ffe212d83
Merge pull request #1 from geins/geins-patch-1
...
Translation error in formal german vs informal
2021-03-06 20:30:06 +01:00
geins
e29c07b28d
Translation error
...
Translation error: informal language in formal file Sie<->Du
2021-03-06 18:57:49 +01:00
Timo Förster
745d15d200
Allow uploads of files containing dots in filename. Closes BookStackApp/BookStack#2217
2021-03-04 22:27:20 +01:00
Arco Aplicaciones - David Blanco
05cfe74904
Fixed user invite email subject in spanish translation ( #2608 )
2021-03-04 00:07:17 +01:00
Dan Brown
4d4a57d1bf
Converted some tests from BrowserKit, Updated shared helpers
2021-03-03 22:11:00 +00:00
Dan Brown
382f155f76
Better aligned handler with core laravel
2021-03-02 21:59:12 +00:00
Dan Brown
60030a774d
Merge branch 'v0.31.x'
2021-03-02 21:43:30 +00:00
Dan Brown
26730e56ea
Updated composer dependancies
...
Primarily to fix aws library for non-amazon use.
Related to #2603
2021-03-02 21:06:45 +00:00
Dan Brown
7b6f8cb902
Merge pull request #2591 from philjak/add_bookshelf_view_type_to_env
...
Adding APP_VIEWS_BOOKSHELF to .ENV
2021-02-25 22:00:03 +00:00
Philip
111835f402
Adding APP_VIEWS_BOOKSHELF to .ENV
2021-02-25 07:51:38 +01:00
Benedikt Volke
b939785ece
Add checkbox on search page
2021-02-14 11:40:38 +01:00
Benedikt Volke
723628cfcf
Add translation string
2021-02-14 11:40:24 +01:00
Benedikt Volke
cf489453c9
Add test for new search tag
2021-02-14 11:40:02 +01:00
Benedikt Volke
6616065d82
Add filter method to search runner
2021-02-14 11:39:18 +01:00
Dan Brown
2df82dd870
Added padding to the bottom of the WYSIWYG editor
...
Also fixed weird affects from body now always being flex.
For #1075
2021-02-12 23:35:42 +00:00
Dan Brown
0ca8d7fc03
Updated books list view description to be limited by css
...
Instead of length limited
Related to #1222
2021-02-12 23:10:30 +00:00
Dan Brown
f36e6d9917
Updtd entity-selector for keyboard nav and new component system
...
For #2064
2021-02-12 22:10:37 +00:00
Dan Brown
6a4b020dd8
Removed user and revision links in export meta
...
Closes #2526
2021-02-12 20:58:01 +00:00
Dan Brown
b51ede2372
Updated php deps to avoid a couple of abandoned packages
2021-02-11 23:46:26 +00:00
