323bff7d6d
Extended translations system for arrays & extension
...
Extended the base Laravel translation system to
allow a locale to be based upon another.
Also adds functionality to take base & fallback locales into account when fetching
an array of translations.
Related to work done in #1159
2018-12-12 20:46:27 +00:00
0e3d507ec2
Merge branch 'german_informal' of git://github.com/ezzra/BookStack into ezzra-german_informal
2018-12-12 19:02:16 +00:00
f943f0d401
de_informal - remove comments from unused lines
2018-12-12 10:37:24 +01:00
1b01d65965
Updated readme with phpunit version, removed old translations line
2018-12-11 23:26:43 +00:00
a2acd063f3
add german informal language
2018-12-11 19:39:16 +01:00
e9e3e8b6b1
Added npm install details
...
Closes #1174
2018-12-11 14:54:34 +00:00
75ca430fd4
Updated NPM dependancies
2018-11-27 21:50:29 +00:00
4cf43f67d6
Merge pull request #1072 from CliffyPrime/german_update
...
Update german translation
2018-11-27 21:26:18 +00:00
86899864dd
Merge pull request #1117 from leomartinez/master
...
Updated 'Spanish Argentina' translation.
2018-11-27 21:24:01 +00:00
eac82c47a5
Fixes image deletion failing in subdirectory.
...
Fixes #1092
Signed-off-by: Abijeet <abijeetpatro@gmail.com >
2018-11-25 00:46:04 +05:30
f8396d3632
Updated 'Spanish Argentina' translation.
2018-11-12 10:15:06 -03:00
302b53562d
Fixed clipboard imports
2018-11-10 16:08:33 +00:00
ebd4c3327d
Merge branch 'thomasjsn-master'
2018-11-10 15:35:35 +00:00
d0c166c207
Added linked images to markdown paste insert
2018-11-10 15:35:13 +00:00
321b53c827
Merge branch 'master' of git://github.com/thomasjsn/BookStack into thomasjsn-master
2018-11-10 15:23:29 +00:00
178b5af83a
Added google select_account test
...
Also cleaned the function naming a little to be more descriptive of the
work they do.
2018-11-10 14:52:43 +00:00
4be0c567cc
Merge pull request #1063 from justein230/master
...
Add select account parameter for google authorization
2018-11-10 14:32:28 +00:00
0724ae3640
Merge pull request #1098 from TheLastOperator/master
...
Update french translations
2018-11-10 13:58:56 +00:00
62a475e464
Merge branch 'qianmengnet-master'
2018-11-10 13:55:48 +00:00
cfc1a2f045
Removed settings that had been copied from en
2018-11-10 13:55:13 +00:00
b012f27ae3
Merge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet-master
2018-11-10 13:54:35 +00:00
58bec7287f
Merge pull request #1088 from kejjang/zh_TW_update
...
Update zh_TW translation
2018-11-10 13:52:23 +00:00
9341ae4910
Merge pull request #1066 from limkukhyun/codev-kuk-master
...
completed the Korean translation. Please accept the pull request
2018-11-10 13:50:39 +00:00
1328755f95
Merge pull request #1034 from DeehSlash/pt_br_translations
...
Adds missing pt_BR translation
2018-11-10 13:47:38 +00:00
038b2418f7
Fixed baseURL helper when no app url is set
...
Also cleaned variable naming to be more obvious
2018-11-09 21:29:30 +00:00
e3230f8f21
Standardised module loading system & fixed build system
...
Fixed broken build system in broken webpack version.
Also updates module system to standardise on ES6 import/exports,
Especially since babel has changed it's 'default' logic for the old
module system.
2018-11-09 21:17:35 +00:00
fd37d95ffc
Chinese translation update for v0.24.1
...
0.24.1
2018-11-08 08:10:04 +08:00
3abde8bfe2
Added config entry for select account
2018-11-04 11:15:58 -08:00
2ca8038df2
Removed return from documentation for function redirectToSocialProvider
2018-11-04 11:07:04 -08:00
89de328439
Merge branch 'master' of https://github.com/BookStackApp/BookStack
2018-11-04 11:04:30 -08:00
c37e73b626
Moved redirect functionality back to start register and log in functions
2018-11-04 10:48:55 -08:00
0283ab11b5
Added function for redirect with parameters for Socialite
2018-11-04 10:40:06 -08:00
5b36ddb12f
Updated npm dependancies
2018-11-04 15:40:10 +00:00
ffc1aa873e
Merge branch 'v0.24-dev'
2018-11-04 15:36:40 +00:00
19b7093438
Fixed redirect issue when custom app url in use
...
Fixes #956 & #1048
Also added tests to cover this url logic.
Also removed debugbar during tests to maybe improve test speed.
2018-11-04 15:18:27 +00:00
7799ba5c79
Updated composer dependancies including laravel minor version
...
Updated larvel 5.5 to latest version to bring in latest fixes.
Fixes #1095
2018-11-04 14:53:13 +00:00
1c89fcd20a
Update french translasion
2018-10-30 15:13:17 +01:00
773ab9d7ff
Update zh_TW translation
2018-10-25 11:38:49 +08:00
6c7d87c836
Update german translation
...
Started working on updating / completing the german translation files, as some recent changes (shelves etc.) are not yet translated. Also changed some wordings to better fit into the flow and word order of the german language. Started with two small files, will do more soon...
2018-10-17 23:44:13 +02:00
e8ab4fd91f
change config/app.php to add korean
2018-10-15 16:39:16 +09:00
5d1162fb64
translate complate
2018-10-15 16:36:11 +09:00
216358c6e4
Added Google select account functionality to login
2018-10-13 15:14:06 -07:00
57d99130ee
Added environment variable for google select account option.
2018-10-13 14:50:58 -07:00
79afec9737
Revert "Added else clause"
...
This reverts commit 77d7f764f1321fda7a2731c8c7ef50cecdea1af8.
2018-10-13 14:31:29 -07:00
90929baa52
Wrap images inserted with markdown editor with anchor tag to original file ref #1062
2018-10-13 21:43:35 +02:00
85f330c79a
Extracted many page-specific repo methods into page-specific repo
2018-10-13 11:27:55 +01:00
77d7f764f1
Added else clause
2018-10-12 22:50:02 -07:00
a76599bd2a
Add select account parameter for google authorization
...
Useful for choosing an account if a default account is outside the scope of a G Suite organization.
2018-10-12 11:52:13 -07:00
4afc67a962
settings - completed
...
entities - Some edits done
2018-10-12 17:22:29 +09:00
042d8b3274
translate entities, setting
2018-10-12 16:06:08 +09:00
