5079 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel Supernault	d11e82c3d9	Update landing page, add age check	2019-11-22 21:21:53 -07:00
daniel	8b783566b3	Merge pull request #1828 from pixelfed/staging ... Staging	2019-11-21 21:00:43 -07:00
Daniel Supernault	256f6b3515	Update StatusTransformer	2019-11-21 20:59:55 -07:00
okpierre	91f8cc6085	Update site localization ... include profiles for NL	2019-11-21 16:12:45 -05:00
Daniel Supernault	326b9a9885	Update site localization	2019-11-18 19:18:58 -07:00
Daniel Supernault	d22c7b9483	Update settings, use consistent button styling	2019-11-17 13:15:15 -07:00
daniel	95baffaa4b	Merge pull request #1819 from pixelfed/staging ... Update FixUsernames command, skip admin and deleted users	2019-11-13 23:30:53 -07:00
Daniel Supernault	6583957dc8	Update FixUsernames command, skip admin and deleted users	2019-11-13 23:30:02 -07:00
daniel	9452f2796a	Merge pull request #1818 from pixelfed/staging ... Update FixUsernames command	2019-11-13 23:22:01 -07:00
Daniel Supernault	0cfe0da1df	Update changelog	2019-11-13 23:21:19 -07:00
Daniel Supernault	e5d77c6d95	Update FixUsernames command	2019-11-13 23:20:01 -07:00
daniel	8ee61ea3ce	Merge pull request #1817 from pixelfed/staging ... Staging	2019-11-12 20:47:28 -07:00
Daniel Supernault	172d9d10fb	Update changelog	2019-11-12 20:46:54 -07:00
Daniel Supernault	6bf1f21ba7	Update compiled assets	2019-11-12 20:46:43 -07:00
Daniel Supernault	7b3fe2159a	Update PostComponent, fix bug affecting moment ui and non authenticated users	2019-11-12 20:45:46 -07:00
Daniel Supernault	f3fca8d998	Update help center	2019-11-12 20:37:14 -07:00
daniel	621ae2f95a	Merge pull request #1816 from pixelfed/staging ... Update Status model	2019-11-11 23:50:52 -07:00
Daniel Supernault	f6a6174292	Update Status model	2019-11-11 23:50:25 -07:00
daniel	85485bba8b	Merge pull request #1815 from pixelfed/staging ... Staging	2019-11-10 20:55:03 -07:00
Daniel Supernault	ecaa20e40b	Update changelog	2019-11-10 20:54:35 -07:00
Daniel Supernault	484bb509c6	Update StatusTransformer	2019-11-10 20:53:37 -07:00
daniel	ca8c62ab58	Merge pull request #1814 from pixelfed/staging ... Staging	2019-11-10 20:44:18 -07:00
Daniel Supernault	d4b50a24ae	Update changelog	2019-11-10 20:43:27 -07:00
Daniel Supernault	a429d96187	Update FollowerController	2019-11-10 20:42:30 -07:00
daniel	3b52f809f9	Merge pull request #1807 from pixelfed/staging ... Staging	2019-11-10 19:55:49 -07:00
Daniel Supernault	e0fead67d3	Update changelog	2019-11-10 19:53:12 -07:00
Daniel Supernault	216955c878	Update compiled assets	2019-11-10 19:52:49 -07:00
Daniel Supernault	16beb56d21	Remove test until upstream bug is fixed	2019-11-10 19:45:59 -07:00
Daniel Supernault	0c8327649c	Update .env.testing to fix upstream bug	2019-11-10 19:42:25 -07:00
Daniel Supernault	aa969bf9ac	Update CI config	2019-11-10 19:40:22 -07:00
Daniel Supernault	8c2c19b8e9	Update .env.testing to fix upstream bug	2019-11-10 19:35:37 -07:00
Daniel Supernault	3aff6de335	Update composer	2019-11-10 19:30:00 -07:00
Daniel Supernault	b478e3768c	Update npm deps	2019-11-10 19:29:06 -07:00
Daniel Supernault	d37df62f72	Update Presenters	2019-11-10 19:09:50 -07:00
Daniel Supernault	3a9010ff65	Update master layout	2019-11-10 18:22:21 -07:00
Daniel Supernault	bb929ac346	Update Timeline.vue component	2019-11-10 18:20:43 -07:00
Daniel Supernault	420131a1ad	Update CollectionComponent	2019-11-10 18:19:00 -07:00
Daniel Supernault	16631d3599	Update app.js	2019-11-10 17:41:27 -07:00
Daniel Supernault	b73823b11a	Update StoryView model	2019-11-10 17:26:29 -07:00
Daniel Supernault	3b8fe9d574	Update StoryItem model	2019-11-10 17:25:52 -07:00
Daniel Supernault	6a81f161fa	Update Story model	2019-11-10 17:25:28 -07:00
Daniel Supernault	9ca8d88fdc	Update Profile component	2019-11-05 23:36:18 -07:00
Daniel Supernault	b1ed4a2744	Update app sass	2019-11-05 23:34:31 -07:00
Daniel Supernault	a890426466	Update custom sass	2019-11-05 23:33:50 -07:00
daniel	f9b8a1bbd3	Merge pull request #1809 from Strubbl/remove-unecessary-docker-stuff ... Remove unecessary docker stuff	2019-11-03 23:10:52 -07:00
Sven Fischer	63514075bd	Revert "docker: provide .env to the redis container, too" ... This reverts commit c864f4b222.	2019-11-03 11:45:33 +01:00
Sven Fischer	d8a8c2d83d	Revert "docker: expose redis port so the app can connect to it" ... This reverts commit d4e1123ea7.	2019-11-03 11:45:03 +01:00
Daniel Supernault	6d40876ae8	Update Site Config	2019-11-02 21:12:44 -06:00
daniel	6fc0fe67ee	Merge pull request #1808 from Strubbl/patch-1 ... Update CONTRIBUTING.md	2019-11-02 19:17:39 -06:00
Strubbl	534385ed4e	Update CONTRIBUTING.md ... add info about which branch is used for what	2019-11-02 15:10:44 +01:00