4520 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel Supernault	d2a90f11a0	Update AccountTransformer	2019-10-29 18:13:44 -06:00
daniel	d7455b8f95	Merge pull request #1799 from Whaxion/Whaxion-improve-ogp ... Adding OpenGraph for videos	2019-10-29 18:12:30 -06:00
daniel	8b7963b30c	Merge pull request #1798 from okpierre/patch-6 ... Update nginx.conf	2019-10-26 20:00:35 -06:00
Nicolas Martinussen	02c5997eb2	Adding OpenGraph for videos	2019-10-26 18:48:41 +02:00
okpierre	5ff9d92830	Update nginx.conf ... Updated to include code to prevent remote code execution on certain nginx/php-fpm configurations	2019-10-26 01:04:28 -04:00
Daniel Supernault	8b57a2cfe8	Update api routes	2019-10-21 00:01:55 -06:00
Daniel Supernault	43d4517f71	Update AuthServiceProvider	2019-10-21 00:00:07 -06:00
Daniel Supernault	4fa5ca4f82	Update AuthServiceProvider	2019-10-20 23:06:06 -06:00
Daniel Supernault	235790e04d	Update changelog	2019-10-18 21:28:57 -06:00
Daniel Supernault	c4dd8449da	Update Settings, hide sponsors feature until re-implemented	2019-10-18 21:27:57 -06:00
daniel	3f41feab3a	Merge pull request #1795 from pixelfed/staging ... Staging	2019-10-18 19:32:36 -06:00
Daniel Supernault	723d3562be	Update EmailService, fixes #1790	2019-10-18 19:31:25 -06:00
Daniel Supernault	b89d793250	Update StatusDedupe command	2019-10-18 19:29:03 -06:00
daniel	e34f222240	Merge pull request #1794 from pixelfed/staging ... Staging	2019-10-18 13:42:13 -06:00
Daniel Supernault	09e406ec2d	Update changelog	2019-10-18 13:41:42 -06:00
Daniel Supernault	771f9c4615	Update FixLikes command, fix postgres support	2019-10-18 13:40:56 -06:00
daniel	62885fab44	Merge pull request #1793 from FiXato/patch-2 ... Changed contact address	2019-10-18 13:01:18 -06:00
daniel	ed1d9f07bf	Merge pull request #1792 from FiXato/patch-1 ... switched contributor-covenant.org links to https	2019-10-18 12:59:36 -06:00
Filip H.F. "FiXato" Slagter	8560c296e4	Changed contact address ... Since the CoC mentions you can contact the *team* for reports, it's probably a good idea to use the pixelfed contact e-mail address, rather than (what I assume is) Daniel's own address. I'm not sure if the project's team currently consists of more people than just Daniel, but if so, this address should be accessible by all members of the team.	2019-10-18 13:45:02 +02:00
Filip H.F. "FiXato" Slagter	38ced23695	switched contributor-covenant.org links to https ... Since the website of contributor-covenant is served over https, I changed the links to use httpS rather than http to prevent the needless redirect.	2019-10-18 13:34:39 +02:00
daniel	4c68763819	Merge pull request #1791 from pixelfed/staging ... Update FUNDING.yml	2019-10-17 13:29:43 -06:00
Daniel Supernault	a44dbce6f9	Update FUNDING.yml	2019-10-17 13:29:18 -06:00
daniel	90917006b3	Merge pull request #1789 from pixelfed/staging ... Staging	2019-10-17 01:21:28 -06:00
Daniel Supernault	494c00230f	Update changelog	2019-10-17 01:18:08 -06:00
Daniel Supernault	895d8da1c9	Update compiled assets	2019-10-17 01:17:52 -06:00
Daniel Supernault	c71f3dd17f	Update Hashtag.vue component, added formatted posts count	2019-10-17 00:22:47 -06:00
Daniel Supernault	126886e841	Update StatusHashtagService, reduce cached hashtag count ttl from 6 hours to 5 minutes	2019-10-17 00:19:02 -06:00
Daniel Supernault	634910c3ca	Update changelog	2019-10-17 00:17:45 -06:00
Daniel Supernault	3fa9ac8bd9	Update BaseApiController, uncache verify_credentials method	2019-10-17 00:16:12 -06:00
Daniel Supernault	49efaae96c	Update MediaController, add timestamp to signed preview url	2019-10-16 22:09:24 -06:00
daniel	58669be829	Merge pull request #1788 from pixelfed/staging ... Update AdminInstanceController, fix instance scan	2019-10-16 21:09:13 -06:00
Daniel Supernault	79292ad610	Update AdminInstanceController, fix instance scan	2019-10-16 21:08:46 -06:00
daniel	9db0f83072	Merge pull request #1787 from pixelfed/staging ... Staging	2019-10-16 20:55:42 -06:00
Daniel Supernault	c69784f4c6	Update compiled assets	2019-10-16 20:54:04 -06:00
Daniel Supernault	7bec1cf1e9	Update presenters	2019-10-16 20:53:18 -06:00
daniel	3846123d62	Merge pull request #1785 from pixelfed/staging ... Staging	2019-10-16 00:00:34 -06:00
Daniel Supernault	b078a74dd7	Update compiled assets	2019-10-16 00:00:08 -06:00
Daniel Supernault	1508061d97	Update album carousel	2019-10-15 23:58:55 -06:00
Daniel Supernault	0493055e5f	Update changelog	2019-10-15 23:41:23 -06:00
Daniel Supernault	44cc36d384	Update compiled assets	2019-10-15 23:41:17 -06:00
Daniel Supernault	8380822a14	Update album carousels, fix height bug	2019-10-15 23:40:08 -06:00
daniel	46625cd2d4	Merge pull request #1783 from okpierre/patch-5 ... Adjust footer spacing in mobile view	2019-10-15 22:23:18 -06:00
daniel	d99e79aa60	Merge pull request #1781 from pixelfed/staging ... ComposeUI v4	2019-10-15 22:01:38 -06:00
Daniel Supernault	67d6a82fd8	Update changelog	2019-10-15 21:53:29 -06:00
Daniel Supernault	b3c18aecfd	Update InternalApiController, increase license limit to 140 to match UI counter	2019-10-15 21:51:23 -06:00
Daniel Supernault	e01dff45c5	Update PublicApiController, fix mixed albums not appearing on timelines	2019-10-15 21:49:37 -06:00
Daniel Supernault	7c15d3c71f	Add MediaDraftTransformer for Camera Roll and Continuity	2019-10-15 21:48:43 -06:00
Daniel Supernault	527789674d	Update compiled assets	2019-10-15 21:47:06 -06:00
Daniel Supernault	767fc887ee	Update custom sass	2019-10-15 21:45:58 -06:00
Daniel Supernault	3aaad81e5d	Update ComposeModal.vue, added album support, editing and UI tweaks	2019-10-15 21:44:48 -06:00