1893 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Brown	ab91e245fb	Merge branch 'master' of github.com:BookStackApp/BookStack	2019-09-14 14:21:35 +01:00
Dan Brown	1ee3e779e4	Merge branch 'laravel-upgrade'	2019-09-14 14:21:24 +01:00
Dan Brown	58a79fcb19	Removed old str_random functions from seeders	2019-09-14 14:17:55 +01:00
Dan Brown	cbf9d701af	Updated to laravel 6	2019-09-14 14:12:39 +01:00
Dan Brown	140298bd96	Updated to Laravel 5.8	2019-09-13 23:58:40 +01:00
Furkan	84c36f6032	Added Turkish translations.	2019-09-13 15:45:38 +03:00
oykenfurkan	ec29c08beb	Delete tr	2019-09-13 15:32:54 +03:00
oykenfurkan	9e8e5b2ca0	Create tr ... Adding Turkish translations	2019-09-13 15:32:40 +03:00
Dan Brown	f311635de6	Add testing via GitHub actions (#1657) ... To replace Travis CI. Travis to be removed after migration to Laravel 6.	2019-09-12 21:19:05 +01:00
kostefun	339d3849b8	Update settings.php ... fix rus	2019-09-09 10:07:16 +07:00
Dan Brown	23db81f2cc	Merge pull request #1637 from kostefun/patch-14 ... Update validation.php	2019-09-07 13:22:12 +01:00
Dan Brown	a35c1bfb13	Merge pull request #1636 from kostefun/patch-13 ... Update passwords.php	2019-09-07 13:21:56 +01:00
Dan Brown	0b75b33044	Merge pull request #1635 from kostefun/patch-12 ... Update pagination.php	2019-09-07 13:21:37 +01:00
Dan Brown	b8617eb3d1	Merge pull request #1630 from kostefun/patch-11 ... Update errors.php	2019-09-07 13:21:11 +01:00
Dan Brown	1bf3666d6b	Merge pull request #1629 from kostefun/patch-10 ... Update entities.php	2019-09-07 13:20:50 +01:00
Dan Brown	caaed849d5	Merge pull request #1628 from kostefun/patch-9 ... Update components.php	2019-09-07 13:20:10 +01:00
Dan Brown	e98986fc2d	Merge pull request #1626 from kostefun/patch-7 ... Update auth.php	2019-09-07 13:19:39 +01:00
Dan Brown	c764208b25	Merge pull request #1624 from kostefun/patch-6 ... Update settings.php	2019-09-07 13:18:55 +01:00
Dan Brown	8fbe677975	Merge pull request #1627 from kostefun/patch-8 ... Update common.php	2019-09-07 13:18:01 +01:00
Dan Brown	d6e27af14a	Merge pull request #1633 from moucho/master ... Updated Spanish translation	2019-09-07 13:16:24 +01:00
Dan Brown	0b55e52e4e	Merge pull request #1623 from leomartinez/master ... Updated 'Spanish Argentina' translation.	2019-09-07 13:14:27 +01:00
Dan Brown	0345ece890	Fixed issue that caused quick-sort buttons to not be clickable ... Fixes #1639	2019-09-07 13:08:55 +01:00
Dan Brown	58f5508b05	Added mysql service for travis	2019-09-07 00:14:19 +01:00
Dan Brown	de8a1a372d	Updated travis-ci php versions	2019-09-07 00:10:03 +01:00
Dan Brown	6917ea088f	Upgraded app to Laravel 5.7	2019-09-06 23:36:16 +01:00
Dan Brown	213e9d2941	Upgraded to Laravel 5.6	2019-09-06 22:14:39 +01:00
kostefun	739efdb0e2	Update entities.php ... fix	2019-09-05 10:25:17 +07:00
kostefun	ac5784d0d0	Update entities.php	2019-09-05 10:20:22 +07:00
kostefun	e1aa212db8	Update validation.php ... Fix & add Ru	2019-09-05 10:10:15 +07:00
kostefun	6758a42f80	Update passwords.php ... Corresponds to the English version	2019-09-05 09:52:24 +07:00
kostefun	10199d684e	Update pagination.php ... Corresponds to the English version	2019-09-05 09:46:45 +07:00
moucho	21e5685816	Update Spanish translation	2019-09-04 15:40:25 +02:00
kostefun	746ad01ebb	Update errors.php ... update ru	2019-09-04 16:42:04 +07:00
kostefun	26b42b6414	Update entities.php ... Update ru	2019-09-04 16:35:44 +07:00
kostefun	22a665a942	Update components.php ... update ru	2019-09-04 16:07:10 +07:00
kostefun	7a5fc800b5	Update common.php ... update ru	2019-09-04 16:05:20 +07:00
kostefun	3148b316cf	Update auth.php ... update ru	2019-09-04 15:57:29 +07:00
kostefun	1c2f43b3a6	Update settings.php	2019-09-04 15:41:08 +07:00
Leonardo	1bb1b568af	Updated 'Spanish Argentina' translation.	2019-09-03 21:33:37 -03:00
Dan Brown	16d8a667b1	Fixed issue preventing FormData posting correctly ... - Due to migration from Axios, Instances where we were sending FormData were not considered and always converted to JSON which resulted in empty JSON bodies. Related to #1621	2019-09-03 21:46:46 +01:00
Leonardo	a1f89ad589	Merge remote-tracking branch 'upstream/master'	2019-09-02 17:04:11 -03:00
Dan Brown	7a4425473b	Fixed URL gen issue causing incorrect scheme to be used ... For #1613	2019-09-01 12:07:51 +01:00
Dan Brown	f421a2e1d6	Updated pointer button styles so icon not hidden ... Related to #1616	2019-09-01 11:06:19 +01:00
Dan Brown	79f1e87cd0	Updated export styles to remove grey bg	2019-09-01 10:55:00 +01:00
Dan Brown	e9d42a2e8c	Fixed no md editor preview in FireFox	2019-09-01 10:51:52 +01:00
Dan Brown	712ea21efe	Added mailhog to the docker-compose setup	2019-08-31 18:09:40 +01:00
Dan Brown	36195c94df	Merge branch 'timoschwarzer-docker-development-environment'	2019-08-26 22:01:19 +01:00
Dan Brown	21f09a5920	Added ldap and moved compose for docker-dev setup ... - Also tweaked readme a little to fit this is with more recent changes.	2019-08-26 22:01:10 +01:00
Dan Brown	aea5319256	Merge branch 'docker-development-environment' of git://github.com/timoschwarzer/BookStack into timoschwarzer-docker-development-environment	2019-08-26 21:24:56 +01:00
Dan Brown	444a23a419	Merge pull request #1573 from miles75/lang-hu ... Typo fix	2019-08-26 16:07:45 +01:00