4804 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Daniel Supernault	477d866b6b	Update Profile.vue, add Profile Embed to menu	2019-12-05 19:17:55 -07:00
Daniel Supernault	eccc84cbdc	Update app.js, add profile embed util	2019-12-05 19:15:08 -07:00
daniel	cbfa31a3e0	Merge pull request #1875 from pixelfed/staging ... Update blade views	2019-12-05 00:25:13 -07:00
Daniel Supernault	955c53ca44	Update blade views	2019-12-05 00:24:42 -07:00
daniel	7ef593deb7	Merge pull request #1874 from pixelfed/staging ... Update home timeline view	2019-12-05 00:19:49 -07:00
Daniel Supernault	62b35e25c4	Update home timeline view	2019-12-05 00:19:13 -07:00
daniel	3ce00ebe38	Merge pull request #1873 from pixelfed/staging ... Update local timeline view	2019-12-05 00:16:27 -07:00
Daniel Supernault	3451110d5c	Update local timeline view	2019-12-05 00:15:25 -07:00
daniel	f7c87554fd	Merge pull request #1872 from pixelfed/staging ... Update assets	2019-12-04 23:35:05 -07:00
Daniel Supernault	82038791ec	Update compiled assets	2019-12-04 23:33:58 -07:00
Daniel Supernault	406265565e	Update npm deps	2019-12-04 23:26:57 -07:00
daniel	7fa4d4a669	Merge pull request #1871 from pixelfed/staging ... Add Profile Embeds	2019-12-04 21:28:13 -07:00
Daniel Supernault	b2005bd4b0	Update changelog	2019-12-04 21:21:43 -07:00
Daniel Supernault	fb7a3cf0e4	Add Profile Embeds	2019-12-04 21:21:08 -07:00
Daniel Supernault	b793f9c4bb	Update SiteController	2019-12-04 20:55:42 -07:00
Daniel Supernault	8e9b544f50	Update SiteController, return 404 for users attempting to view their own Follow Intent	2019-12-04 20:30:04 -07:00
Daniel Supernault	19cb81cf26	Update web routes	2019-12-04 20:26:11 -07:00
Daniel Supernault	d9ff794932	Update SiteController	2019-12-04 20:24:27 -07:00
Daniel Supernault	ad8fc77e6c	Update FollowerController	2019-12-04 20:24:08 -07:00
Daniel Supernault	e9c67e337d	Add follow intent view	2019-12-04 20:22:37 -07:00
Daniel Supernault	293b806afc	Update DiscoverController	2019-12-04 19:54:26 -07:00
Daniel Supernault	96a6c063f2	Update FollowerService	2019-12-04 19:47:00 -07:00
daniel	e6bb9dba96	Merge pull request #1867 from pixelfed/staging ... Fixes #1856	2019-12-02 19:16:18 -07:00