Dan Brown
d39fc84301
Merge branch 'master' into 2019-design
2018-12-01 13:57:23 +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
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
Leonardo Martinez
f8396d3632
Updated 'Spanish Argentina' translation.
2018-11-12 10:15:06 -03:00
Dan Brown
4df11701e7
Updated book-tree design and abstracted breadcrumb template
2018-11-11 13:11:36 +00:00
Dan Brown
4a872012c5
Merge branch 'master' into 2019-design
2018-11-11 11:44:35 +00: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
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
Dan Brown
c356612612
Added sidebar layout size tweaks
2018-11-04 14:41:52 +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
Dan Brown
0e395b1e21
Started reworking of page-show design
...
- Updated core toolbar & breadcrumb design
2018-10-21 20:05:11 +01: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
Dan Brown
89be30ff0e
Started on a design update
...
- Added base of new grid system.
- Added new margin/padding/visiblity helpers.
- Made header collapse to overflow menu on mobile.
2018-10-16 18:49:56 +01: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
