5677 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
daniel	616ca25938	Merge pull request #1902 from pixelfed/staging ... Clean-up FederationController	2019-12-22 23:10:46 -07:00
Daniel Supernault	279c57d9a5	Update FederationController	2019-12-20 23:15:15 -07:00
daniel	673ccad7fe	Merge pull request #1897 from pixelfed/staging ... Update readme	2019-12-18 14:57:02 -07:00
Daniel Supernault	9def9d0801	Update readme	2019-12-18 14:56:32 -07:00
daniel	149d569823	Merge pull request #1896 from pixelfed/staging ... Update site config service	2019-12-17 20:57:00 -07:00
Daniel Supernault	b32cf31cdd	Update site config service	2019-12-17 20:56:09 -07:00
daniel	babcf5d6ff	Merge pull request #1893 from pixelfed/staging ... Update .env, remove SESSION_LIFETIME	2019-12-17 02:33:42 -07:00
Daniel Supernault	38199308d1	Update .env, remove SESSION_LIFETIME	2019-12-17 02:33:13 -07:00
daniel	144f2aad6b	Merge pull request #1890 from pixelfed/staging ... Deprecate mixed media albums	2019-12-14 21:30:03 -07:00
Daniel Supernault	1b20ebd46d	Deprecate mixed media albums	2019-12-14 21:29:00 -07:00
Daniel Supernault	aa1f74efbc	Add exception lang file	2019-12-14 21:27:42 -07:00
Daniel Supernault	813ef12329	Update LikePipeline, fix typo	2019-12-14 20:34:56 -07:00
Daniel Supernault	1b9c1bfa34	Update LikePipeline, fix typo	2019-12-14 20:31:26 -07:00
daniel	c5a82c56fd	Merge pull request #1889 from pixelfed/staging ... Add Force MetroUI labs experiment	2019-12-14 13:14:46 -07:00
Daniel Supernault	6b3c5f94c3	Update changelog	2019-12-14 13:02:38 -07:00
Daniel Supernault	47c132c622	Update controller	2019-12-14 13:02:24 -07:00
Daniel Supernault	295e80eb72	Add Force MetroUI labs experiment	2019-12-14 01:41:37 -07:00
daniel	74597cb534	Merge pull request #1888 from pixelfed/staging ... Update views	2019-12-11 01:27:19 -07:00
Daniel Supernault	b94af397c9	Update views	2019-12-11 01:25:56 -07:00
daniel	c862412c0e	Merge pull request #1887 from pixelfed/staging ... Update Redis namespace	2019-12-10 23:08:00 -07:00
Daniel Supernault	c369882b48	Update Redis namespace	2019-12-10 23:04:03 -07:00
daniel	4e7b5b79d3	Merge pull request #1886 from pixelfed/staging ... Staging	2019-12-09 00:50:34 -07:00
Daniel Supernault	fa8e0dca4d	Update RegisterController	2019-12-09 00:48:03 -07:00
Daniel Supernault	a7c30388d8	Update config	2019-12-08 14:18:18 -07:00
Daniel Supernault	e7ad61c047	Update InternalApiController, fix compose api and php 7.4 compat	2019-12-08 13:55:27 -07:00
daniel	28e8bfedf7	Merge pull request #1885 from pixelfed/staging ... Staging	2019-12-08 00:56:41 -07:00
Daniel Supernault	551e078489	Update compiled assets	2019-12-08 00:54:44 -07:00
Daniel Supernault	076023eac9	Update CollectionComponent.vue	2019-12-08 00:53:31 -07:00
Daniel Supernault	0569846f15	Update web routes	2019-12-08 00:51:31 -07:00
Daniel Supernault	46c9a3742e	Update CollectionController	2019-12-08 00:51:14 -07:00
daniel	36a790fccb	Merge pull request #1884 from pixelfed/staging ... Update CollectionController, increase collection limit from 18 to 50	2019-12-07 19:45:13 -07:00
Daniel Supernault	73f2f98eb0	Update changelog	2019-12-07 19:44:44 -07:00
Daniel Supernault	c2826fd3fd	Update CollectionController, increase collection limit from 18 to 50	2019-12-07 19:43:46 -07:00
daniel	0f08fb6ff1	Merge pull request #1883 from Strubbl/docker-remove-imagck ... docker.apache: remove imagick	2019-12-07 18:47:08 -07:00
Sven Fischer	553ba55e8c	docker.apache: remove imagick ... cause gd is sufficient. It's either imagick or gd required.	2019-12-07 11:45:38 +01:00
daniel	bda47ce397	Merge pull request #1881 from pixelfed/staging ... Staging	2019-12-06 23:24:53 -07:00
Daniel Supernault	2238f18eed	Update nav	2019-12-06 23:22:10 -07:00
daniel	a1cd57e206	Merge pull request #1880 from Strubbl/docker.apache-update-php-to-7.4-composer-to-1.9.1-fix-gd ... docker.apache: update php to 7.4, composer to 1.9.1, fix gd configure…	2019-12-06 12:24:54 -07:00
Sven Fischer	ef63e1325f	docker.apache: update php to 7.4, composer to 1.9.1, fix gd configure flags ... w.r.t gd see also https://github.com/docker-library/php/issues/912	2019-12-06 18:27:29 +01:00
daniel	82f2e5ec2e	Merge pull request #1878 from pixelfed/staging ... Staging	2019-12-05 21:12:39 -07:00
Daniel Supernault	473d1755b8	Update nav	2019-12-05 21:10:28 -07:00
Daniel Supernault	e30c59c7bc	Update compiled assets	2019-12-05 21:00:58 -07:00
Daniel Supernault	c956adf786	Update Timeline.vue	2019-12-05 20:59:24 -07:00
Daniel Supernault	0c8fcff519	Update NotificationCard	2019-12-05 20:57:25 -07:00
Daniel Supernault	d3a37a0030	Update app.js	2019-12-05 20:57:00 -07:00
daniel	44859fa364	Merge pull request #1877 from pixelfed/staging ... Staging	2019-12-05 19:47:15 -07:00
Daniel Supernault	39acd99b73	Update compiled assets	2019-12-05 19:28:55 -07:00
Daniel Supernault	46d4aba89c	Update Profile.vue	2019-12-05 19:27:32 -07:00
daniel	cfcd002f5b	Merge pull request #1876 from pixelfed/staging ... Staging	2019-12-05 19:20:36 -07:00
Daniel Supernault	74061b85ce	Update compiled assets	2019-12-05 19:19:53 -07:00