6888 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel Supernault	127990e95f	Add Status Lexer Test	2018-11-28 22:47:39 -07:00
Daniel Supernault	54f996b853	Add testing .env file	2018-11-28 22:46:48 -07:00
Daniel Supernault	e0a5eadaeb	Add AP Note test	2018-11-28 22:20:59 -07:00
Daniel Supernault	5d91fb2051	Update LoginTest	2018-11-28 22:11:07 -07:00
daniel	9d98a33b1b	Merge pull request #607 from pixelfed/frontend-ui-refactor ... Update DiscoverComponent	2018-11-28 21:12:37 -07:00
Daniel Supernault	3afef810da	Update DiscoverComponent	2018-11-28 21:11:42 -07:00
daniel	61d53439ff	Merge pull request #606 from pixelfed/frontend-ui-refactor ... Fix CI	2018-11-28 20:09:05 -07:00
Daniel Supernault	f25da930d8	Fix CI	2018-11-28 20:06:19 -07:00
daniel	07e5ff1525	Merge pull request #605 from pixelfed/frontend-ui-refactor ... Update compiled assets, fixes #595	2018-11-28 19:28:22 -07:00
Daniel Supernault	a0b00ce434	Update compiled assets, fixes #595	2018-11-28 19:27:38 -07:00
daniel	3d66a8c610	Merge pull request #602 from pixelfed/frontend-ui-refactor ... Update Discover	2018-11-27 02:18:26 -07:00
Daniel Supernault	1ca76b3a3c	Update Discover	2018-11-27 02:17:27 -07:00
daniel	877a6f0faa	Merge pull request #601 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-11-27 02:00:58 -07:00
Daniel Supernault	7494d97bbd	Update compiled assets	2018-11-27 01:58:39 -07:00
Daniel Supernault	9a7d13ebf2	Update DiscoverComponent	2018-11-27 01:56:22 -07:00
Daniel Supernault	2254ecf27d	Update InternalApiController	2018-11-27 01:55:10 -07:00
Daniel Supernault	77569b7e8e	Update AuthLogin listener	2018-11-27 01:54:10 -07:00
Daniel Supernault	1073892c66	Update FollowerController	2018-11-27 01:42:31 -07:00
Daniel Supernault	1aa8354f5a	Update ProfileController	2018-11-27 01:42:08 -07:00
Daniel Supernault	95799c5c70	Update FollowPipeline	2018-11-27 01:41:32 -07:00
daniel	a111cf7feb	Merge pull request #600 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-11-27 00:36:26 -07:00
Daniel Supernault	c312981daf	Update compose view	2018-11-27 00:35:33 -07:00
Daniel Supernault	3cbe367869	Update AvatarController	2018-11-26 23:53:26 -07:00
daniel	090881829f	Merge pull request #599 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-11-26 20:27:02 -07:00
Daniel Supernault	2d773ca537	Fixes #406	2018-11-26 20:26:27 -07:00
Daniel Supernault	ebd05897a6	Update composer.json, remove unused abandoned dep	2018-11-26 20:20:37 -07:00
daniel	eb14e6be66	Merge pull request #553 from koehn/fix-startup-script ... fixed a bash scripting bug in start.sh	2018-11-26 12:55:18 -07:00
Daniel Supernault	13a5b0e12d	Add WIP account delete job	2018-11-26 12:33:56 -07:00
Daniel Supernault	2f305273ef	Update timeline template	2018-11-25 14:33:55 -07:00
Brad Koehn	bd822cd5dc	Merge branch 'frontend-ui-refactor' into fix-startup-script	2018-11-25 15:14:56 -06:00
daniel	df5e2d94f2	Merge pull request #575 from BenLubar-PR/dockerfile-fpm ... Fix Dockerfile.fpm by replacing it with a modified copy of Dockerfile.apache	2018-11-25 13:57:33 -07:00
daniel	d8718da695	Merge pull request #561 from BoFFire/patch-3 ... fix typo.	2018-11-25 13:54:53 -07:00
daniel	89078f399b	Merge pull request #557 from dereckson/docker-webp ... Fix WebP support in Apache Docker image	2018-11-25 13:54:02 -07:00
daniel	1832973a39	Merge pull request #552 from TeDomum/dev ... Drop privileges when starting artisan or horizon	2018-11-25 13:51:46 -07:00
daniel	720879cb47	Merge pull request #550 from bremensaki/patch-1 ... Expose S3 endpoint setting via config file	2018-11-25 13:48:42 -07:00
daniel	03bdc9840b	Merge pull request #593 from pixelfed/frontend-ui-refactor ... Update InternalApiController	2018-11-24 23:48:26 -07:00
Daniel Supernault	406bbe0047	Update InternalApiController	2018-11-24 23:47:56 -07:00
daniel	b69601a6f2	Merge pull request #592 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-11-24 23:44:53 -07:00
Daniel Supernault	fa6c3dd3f6	Update InternalApiController	2018-11-24 23:44:02 -07:00
Daniel Supernault	20fa6fd8e7	Update AccountController	2018-11-24 23:43:06 -07:00
Daniel Supernault	c40b4f5cfd	Update AccountController	2018-11-24 23:35:21 -07:00
daniel	ff535072a8	Merge pull request #591 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-11-24 23:16:18 -07:00
Daniel Supernault	fa99ab79c3	Update Status model, cache view type and thumbnail methods	2018-11-24 23:15:32 -07:00
Daniel Supernault	cdb30c8e27	Fixes #583	2018-11-24 22:52:46 -07:00
daniel	8e21c8f54a	Merge pull request #590 from pixelfed/frontend-ui-refactor ... Fixes #581 #584 #566	2018-11-24 22:37:05 -07:00
Daniel Supernault	b1ca105cb4	Fixes #581 #584 #566	2018-11-24 22:36:17 -07:00
daniel	a2d4630599	Merge pull request #589 from pixelfed/frontend-ui-refactor ... Update MediaTransformer	2018-11-24 21:38:54 -07:00
Daniel Supernault	e3e2f902c1	Update MediaTransformer	2018-11-24 21:38:19 -07:00
daniel	2129155ac0	Merge pull request #588 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-11-24 14:04:09 -07:00
Daniel Supernault	bfde0fdea6	Fix thumbnail regression	2018-11-24 14:03:15 -07:00