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
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
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
André Luiz da Silva
0943221902
Adds missing "entities" pt_BR translations
2018-09-28 16:18:14 -03:00
André Luiz da Silva
17ed1b7faf
Adds missing "common" pt_BR translations
2018-09-26 21:54:16 -03:00
André Luiz da Silva
36d18f28ee
Adds missing "activities" pt_BR translations
2018-09-26 21:51:34 -03:00
Dan Brown
495d18814a
Updated various classes to take EntityProvider instead of separate entities
2018-09-25 18:00:40 +01:00
Dan Brown
257a5a23ec
Fleshed out entity provided and optimized imports
2018-09-25 16:58:03 +01:00
Dan Brown
919660678b
Re-structured the app code to be feature based rather than code type based
2018-09-25 12:30:50 +01:00
Dan Brown
19751ed1cb
Incremented dev version
2018-09-25 10:00:09 +01:00
Dan Brown
818c02ed44
Added null role check to migrate path
...
Also added check for existing bookshelf role_permissions
in the event the user got that for.
Also related to #1027
2018-09-24 16:30:08 +01:00
Dan Brown
9abdab3991
Updated migration to convert MyISAM tables to InnoDB
...
New bookshelves_books tables requires foreign constraints which error on MyISAM.
For #1027
2018-09-24 15:58:40 +01:00
Dan Brown
43122f86e8
Merge pull request #1026 from vriic/master
...
Update german translation
2018-09-24 10:35:22 +01:00
Nikolai Nikolajevic
935337862c
Update german translation
2018-09-24 09:55:37 +02:00
Dan Brown
dd671524f8
Merge pull request #1025 from moucho/master
...
Spanish translation
2018-09-23 17:18:41 +01:00
Marcos
1cac3d43d3
Spanish translation
2018-09-23 17:31:41 +02:00
Dan Brown
9243c635f2
Made search test a little more consistent
2018-09-23 15:15:44 +01:00
Dan Brown
93f820d9da
Updated TinyMCE config to end containers on empty blocks
...
Makes it easier to escape out of blockquote sections.
Fixes #961
2018-09-23 14:07:50 +01:00
Dan Brown
b62afcad1f
Removed search indexing from migration path to prevent Bookshelf issue
2018-09-23 13:25:12 +01:00
Dan Brown
7b32aa163f
Added Bookshelves to search system.
...
Also cleaned up and made search indexing system a little more efficient.
Closes #1023
2018-09-23 12:34:30 +01:00
Dan Brown
eebfd8904e
Removed old fulltext indexes from migrations
...
Prevents forcing of MyISAM for some databases
Removed old code to add indexes and added checks for existing indexes before removal.
Should still allow upgrades, rollbacks to old bookstack versions may be funky but
should not be high use-case.
2018-09-23 00:30:48 +01:00
Dan Brown
0d84a0b976
Extracted search sidebar text to translation file
...
Closes #864
2018-09-22 23:40:04 +01:00
Dan Brown
88ac636c00
Made it possible to scroll past the end of the markdown editor
...
Closes #1020
2018-09-22 23:24:51 +01:00
Dan Brown
9dc26a8c52
Prevented TinyMCE clear-color option having scrollbar
...
Was covering the option if showing and prevented the option being pressed.
Fixes #999
2018-09-22 23:12:39 +01:00
