colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,443 Commits 1 Branch 0 Tags 48 MiB
Commit Graph

1443 Commits

Author SHA1 Message Date
Dan Brown bc116b45b5
Re-updated assets for release v0.24.2 2018-11-10 16:10:22 +00:00
Dan Brown a059960b9e
Merge branch 'master' into release 2018-11-10 16:09:14 +00:00
Dan Brown 302b53562d
Fixed clipboard imports 2018-11-10 16:08:33 +00:00
Dan Brown 7770966fed
Updated assets for release v0.24.2 2018-11-10 16:01:55 +00:00
Dan Brown d7adcf6c69
Merge branch 'master' into release 2018-11-10 16:01:01 +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
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
Kej 773ab9d7ff Update zh_TW translation 2018-10-25 11:38:49 +08: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
Justin Stein 57d99130ee Added environment variable for google select account option. 2018-10-13 14:50:58 -07:00
Justin Stein 79afec9737 Revert "Added else clause" 
This reverts commit 77d7f764f1.
 2018-10-13 14:31:29 -07:00
Thomas Jensen 90929baa52 Wrap images inserted with markdown editor with anchor tag to original file ref #1062 2018-10-13 21:43:35 +02:00
Dan Brown 85f330c79a
Extracted many page-specific repo methods into page-specific repo 2018-10-13 11:27:55 +01:00
justein230 77d7f764f1
Added else clause 2018-10-12 22:50:02 -07:00
Justin Stein 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
codev-kuk-mac 4afc67a962 settings - completed 
entities - Some edits done
 2018-10-12 17:22:29 +09:00
codev-kuk-mac 042d8b3274 translate entities, setting 2018-10-12 16:06:08 +09:00
codev-kuk-mac 1c0a196b9d Include Korean in settings 2018-10-12 16:05:28 +09:00
codev-kuk-mac a1fda37896 done validation 2018-10-12 16:04:57 +09:00
codev-kuk-mac 43758a7d60 3개 번역 2018-10-12 15:13:27 +09:00
codev-kuk-mac c7d3db9751 translate kr 50/100 2018-10-05 11:24:24 +09:00
codev-kuk-mac fca7689e1a translate to kr 20/100 2018-10-05 10:24:37 +09:00
André Luiz da Silva 18bac4e673 Fixes "bookshelf" pt_BR translation in "activities" 2018-09-28 16:27:26 -03:00
André Luiz da Silva ca2a9fbf1c Adds missing "settings" pt_BR translations 2018-09-28 16:26:01 -03:00
André Luiz da Silva cbebe7c8de Adds missing "errors" pt_BR translations 2018-09-28 16:19:06 -03:00