Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,386 Commits 18 Branches 197 Tags 95 MiB
8a4a81629f
Commit Graph

1386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Brown
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
Dan Brown
0e3d507ec2
Merge branch 'german_informal' of git://github.com/ezzra/BookStack into ezzra-german_informal 2018-12-12 19:02:16 +00:00
ezzra
f943f0d401 de_informal - remove comments from unused lines 2018-12-12 10:37:24 +01:00
Dan Brown
1b01d65965
Updated readme with phpunit version, removed old translations line 2018-12-11 23:26:43 +00:00
ezzra
a2acd063f3 add german informal language 2018-12-11 19:39:16 +01:00
Dan Brown
e9e3e8b6b1
Added npm install details 
Closes #1174
 2018-12-11 14:54:34 +00:00
Dan Brown
75ca430fd4
Updated NPM dependancies 2018-11-27 21:50:29 +00:00
Dan Brown
4cf43f67d6
Merge pull request #1072 from CliffyPrime/german_update 
Update german translation
 2018-11-27 21:26:18 +00:00
Dan Brown
86899864dd
Merge pull request #1117 from leomartinez/master 
Updated 'Spanish Argentina' translation.
 2018-11-27 21:24:01 +00:00
qianmengnet
3c796b1ae7 Add "register" to nav. 
Add "register" to nav.You need to click "login" to find register, which is not convenient for people who are not familiar with the app.
 2018-11-26 09:05:38 +08:00
qianmengnet
b7915cc7b0 Add anchor link to "Created Content" on the "View Profile" 
Add 3 anchor link to "Created Content" on the "View Profile" page and click to jump to the page section
 2018-11-26 08:47:49 +08:00
Abijeet
eac82c47a5 Fixes image deletion failing in subdirectory. 
Fixes #1092

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-11-25 00:46:04 +05:30
Abijeet
d3d3e2ad3e Added a default timeout of 60 seconds to dropzone. 
Fixes #876
 2018-11-18 00:22:08 +05:30
Christopher Wilkinson
54b36cd305 Show users link in top nav if user is signed in and only manages users 2018-11-13 13:43:20 +00:00
Leonardo Martinez
f8396d3632 Updated 'Spanish Argentina' translation. 2018-11-12 10:15:06 -03:00
Dan Brown
302b53562d
Fixed clipboard imports 2018-11-10 16:08:33 +00:00
Dan Brown
ebd4c3327d
Merge branch 'thomasjsn-master' 2018-11-10 15:35:35 +00:00
Dan Brown
d0c166c207
Added linked images to markdown paste insert 2018-11-10 15:35:13 +00:00
Dan Brown
321b53c827
Merge branch 'master' of git://github.com/thomasjsn/BookStack into thomasjsn-master 2018-11-10 15:23:29 +00:00
Vinrobot
5e6c039b08
Added config to change Gravatar URL 2018-11-10 16:11:11 +01:00
Dan Brown
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
Dan Brown
4be0c567cc
Merge pull request #1063 from justein230/master 
Add select account parameter for google authorization
 2018-11-10 14:32:28 +00:00
Dan Brown
0724ae3640
Merge pull request #1098 from TheLastOperator/master 
Update french translations
 2018-11-10 13:58:56 +00:00
Dan Brown
62a475e464
Merge branch 'qianmengnet-master' 2018-11-10 13:55:48 +00:00
Dan Brown
cfc1a2f045
Removed settings that had been copied from en 2018-11-10 13:55:13 +00:00
Dan Brown
b012f27ae3
Merge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet-master 2018-11-10 13:54:35 +00:00
Dan Brown
58bec7287f
Merge pull request #1088 from kejjang/zh_TW_update 
Update zh_TW translation
 2018-11-10 13:52:23 +00:00
Dan Brown
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
Dan Brown
1328755f95
Merge pull request #1034 from DeehSlash/pt_br_translations 
Adds missing pt_BR translation
 2018-11-10 13:47:38 +00:00
Dan Brown
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
Dan Brown
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
qianmengnet
fd37d95ffc Chinese translation update for v0.24.1 
0.24.1
 2018-11-08 08:10:04 +08:00
Justin Stein
3abde8bfe2 Added config entry for select account 2018-11-04 11:15:58 -08:00
Justin Stein
2ca8038df2 Removed return from documentation for function redirectToSocialProvider 2018-11-04 11:07:04 -08:00
Justin Stein
89de328439 Merge branch 'master' of https://github.com/BookStackApp/BookStack 2018-11-04 11:04:30 -08:00
Justin Stein
c37e73b626 Moved redirect functionality back to start register and log in functions 2018-11-04 10:48:55 -08:00
Justin Stein
0283ab11b5 Added function for redirect with parameters for Socialite 2018-11-04 10:40:06 -08:00
Dan Brown
5b36ddb12f
Updated npm dependancies 2018-11-04 15:40:10 +00:00
Dan Brown
ffc1aa873e
Merge branch 'v0.24-dev' 2018-11-04 15:36:40 +00:00
Dan Brown
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
Dan Brown
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
Florian PREVOST
1c89fcd20a Update french translasion 2018-10-30 15:13:17 +01:00
Christopher Tran
730cb78b45 switch spaces to tabs 2018-10-27 17:05:46 -04:00
Christopher Tran
8e7f703af7 fix how the option is set, change handle to NULL 2018-10-27 16:58:10 -04:00
Christopher Tran
6c14c09880 Add ability to disable LDAP certificate validation 2018-10-27 16:14:19 -04:00
Kej
773ab9d7ff Update zh_TW translation 2018-10-25 11:38:49 +08:00
CliffyPrime
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
codev-kuk-mac
e8ab4fd91f change config/app.php to add korean 2018-10-15 16:39:16 +09:00
codev-kuk-mac
5d1162fb64 translate complate 2018-10-15 16:36:11 +09:00
Justin Stein
216358c6e4 Added Google select account functionality to login 2018-10-13 15:14:06 -07:00