4520 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
daniel	d013f55e25	Merge pull request #1649 from pixelfed/trwnh-image-driver ... read IMAGE_DRIVER from env ('gd' or 'imagick')	2019-08-31 23:00:58 -06:00
Daniel Supernault	b9acd64543	Update FederationController	2019-08-29 21:04:10 -06:00
Daniel Supernault	1632d295ef	Update ApiController	2019-08-29 20:40:59 -06:00
Daniel Supernault	4ad7fe05fc	Update MediaController	2019-08-29 20:12:57 -06:00
Daniel Supernault	0416843723	Update MediaController, add update method	2019-08-29 20:09:10 -06:00
Daniel Supernault	cdb3162661	Update discover hashtags view	2019-08-29 19:49:00 -06:00
Daniel Supernault	f68c4015cc	Add invites create view	2019-08-29 19:48:06 -06:00
Daniel Supernault	b8222ea6a5	Add invites settings view	2019-08-29 19:46:06 -06:00
Daniel Supernault	f7dd6ebe0b	Update labs settings page, add timeline tips	2019-08-29 19:44:43 -06:00
Daniel Supernault	af9b062b7a	Add places to footer	2019-08-29 19:43:57 -06:00
Daniel Supernault	118a866deb	Add places home view	2019-08-29 19:36:02 -06:00
Daniel Supernault	e789559b9d	Add places directory blade views	2019-08-29 19:35:17 -06:00
Daniel Supernault	31b6a993c1	Update sass	2019-08-29 19:32:13 -06:00
Daniel Supernault	616b594f98	Update navmenu lang file	2019-08-29 19:30:39 -06:00
Daniel Supernault	37b88bcb1b	Update PlaceController, add place directory methods	2019-08-29 19:27:34 -06:00
Daniel Supernault	8f5c0dd4ed	Update compose view	2019-08-29 19:21:41 -06:00
Daniel Supernault	98bf80e811	Update nav bar	2019-08-29 19:15:58 -06:00
Daniel Supernault	7e11e4aa44	Update Place model, add url methods	2019-08-29 18:30:26 -06:00
Daniel Supernault	a3ae352fd2	Update InternalApiController for ComposeUI v4	2019-08-29 18:07:34 -06:00
trwnh	02e5abf3b3	read IMAGE_DRIVER from env	2019-08-29 05:19:18 -05:00
daniel	d07b80da43	Merge pull request #1648 from pixelfed/staging ... Update SearchController	2019-08-28 19:53:20 -06:00
Daniel Supernault	58a9ca664c	Update SearchController	2019-08-28 19:52:05 -06:00
daniel	270a042b0f	Merge pull request #1647 from pixelfed/staging ... Update InboxWorker	2019-08-27 19:17:17 -06:00
Daniel Supernault	20baf7a7c9	Update InboxWorker	2019-08-27 19:14:56 -06:00
okpierre	754801e4fe	Merge pull request #6 from pixelfed/dev ... Sync August 24	2019-08-24 18:32:44 -04:00
daniel	5eda09cbf6	Merge pull request #1640 from pixelfed/staging ... Staging	2019-08-23 21:31:39 -06:00
Daniel Supernault	f54409fdf3	Update AP Helpers	2019-08-23 21:28:37 -06:00
Daniel Supernault	23cd89da4c	Update AP Helpers	2019-08-23 20:18:58 -06:00
daniel	edf3ba0603	Merge pull request #1639 from pixelfed/staging ... Staging	2019-08-23 20:04:19 -06:00
Daniel Supernault	0f0b3c2d05	Update SettingsController	2019-08-23 13:03:43 -06:00
Daniel Supernault	c176f8cc11	Update routes	2019-08-22 22:41:56 -06:00
Daniel Supernault	89ca18b14e	ComposeUI update	2019-08-22 22:33:04 -06:00
Daniel Supernault	06078c7a85	Update SearchResults	2019-08-22 21:49:20 -06:00
Daniel Supernault	ac9bb59e19	Update Profile.vue component	2019-08-22 21:22:46 -06:00
Daniel Supernault	d9db1cf8b1	Update FollowerController	2019-08-22 21:22:00 -06:00
Daniel Supernault	c539e8f607	Update SearchResults.vue	2019-08-22 18:25:53 -06:00
daniel	0c56aa058f	Merge pull request #1636 from pixelfed/staging ... Update AP Helpers	2019-08-21 22:34:39 -06:00
Daniel Supernault	4acafb9870	Update AP Helpers	2019-08-21 22:34:05 -06:00
daniel	d13a13317f	Merge pull request #1635 from pixelfed/staging ... Staging	2019-08-21 22:20:09 -06:00
daniel	c1110a024f	Merge pull request #1634 from pixelfed/trwnh-patch-1 ... bandaid fix #1633	2019-08-21 22:18:29 -06:00
trwnh	274a22c1c3	bandaid fix #1633 ... $activity is not being initialized correctly, so just use $res directly for now	2019-08-21 23:14:39 -05:00
daniel	52bb40d5ff	Merge pull request #1631 from pixelfed/staging ... Update security view	2019-08-21 13:40:52 -06:00
Daniel Supernault	9788c80ca9	Update security view	2019-08-21 13:39:34 -06:00
daniel	0fd4481ca6	Merge pull request #1630 from pixelfed/staging ... Staging	2019-08-21 13:31:17 -06:00
Daniel Supernault	0586c022a9	Update security view	2019-08-21 13:30:01 -06:00
Daniel Supernault	cd9db4fe0c	Update SettingsController	2019-08-21 13:28:44 -06:00
daniel	2a16e64659	Merge pull request #1626 from pixelfed/staging ... Fix queue bug	2019-08-20 22:22:57 -06:00
Daniel Supernault	9524ea19f5	Update media:optimize command	2019-08-20 22:22:25 -06:00
Daniel Supernault	bd05f63dec	Update StatusTransformer, add place	2019-08-19 19:16:48 -06:00
Daniel Supernault	460433ff20	Update ApiController	2019-08-19 19:09:56 -06:00