5290 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
daniel	7e59df4e64	Merge pull request #1952 from hellcp/patch-1 ... Include more and more specific communication methods	2020-01-28 22:12:25 -07:00
daniel	c3ad2ce84d	Merge pull request #1949 from albjeremias/fix-docker-compose ... Fix docker compose	2020-01-28 22:11:17 -07:00
daniel	0285fe1f83	Merge pull request #1970 from pixelfed/staging ... Revert image driver breaking change, will delay	2020-01-28 22:09:49 -07:00
Daniel Supernault	5ece86fb0a	Revert image driver breaking change, will delay	2020-01-28 22:09:17 -07:00
daniel	9eb28f07dc	Merge pull request #1969 from pixelfed/staging ... Update Story model	2020-01-28 21:34:24 -07:00
Daniel Supernault	9f2659da6a	Update Story model	2020-01-28 21:32:32 -07:00
Daniel Supernault	c5e171c4a8	Update image-optimizer config	2020-01-28 21:32:09 -07:00
Daniel Supernault	e86ddb94de	Update image config	2020-01-28 21:31:30 -07:00
Daniel Supernault	7355e94723	Update Image Util	2020-01-28 21:31:05 -07:00
daniel	b3527390a4	Merge pull request #1967 from pixelfed/staging ... Bug fixes and Restricted Mode stuff	2020-01-27 21:19:13 -07:00
Daniel Supernault	22e9e3df08	Update changelog	2020-01-27 21:17:17 -07:00
Daniel Supernault	17c1a83d9e	Add RestrictedAccess middleware for Restricted Mode	2020-01-27 21:16:19 -07:00
Daniel Supernault	4d2da2f1b0	Update RelationshipSettings Controller, fixes #1605	2020-01-27 21:13:53 -07:00
Daniel Supernault	b8e7ac270e	Update changelog	2020-01-27 20:56:54 -07:00
Daniel Supernault	3be32597d3	Update instance config, cleanup and add restricted mode	2020-01-27 20:55:11 -07:00
Daniel Supernault	bf1c622c7c	Update user settings template, replace card shadow with border	2020-01-27 20:41:00 -07:00
daniel	d390f137ac	Merge pull request #1966 from pixelfed/staging ... Update StoryCompose component, add upload progress	2020-01-27 20:25:34 -07:00
Daniel Supernault	405bcd7d7a	Update compiled assets	2020-01-27 20:24:46 -07:00
Daniel Supernault	14f2c09df5	Update changelog	2020-01-27 20:24:12 -07:00
Daniel Supernault	2de3c56f47	Update StoryCompose component, add upload progress	2020-01-27 20:23:13 -07:00
daniel	0734bc35fd	Merge pull request #1965 from pixelfed/staging ... Update app layout	2020-01-27 19:31:30 -07:00
Daniel Supernault	31a0b0993b	Update app layout	2020-01-27 19:30:59 -07:00
daniel	f131105244	Merge pull request #1964 from pixelfed/staging ... Update Timeline.vue, fix #1963 and update profile card layout	2020-01-27 19:26:36 -07:00
Daniel Supernault	370b01abd1	Update compiled assets	2020-01-27 19:24:46 -07:00
Daniel Supernault	424b6bad16	Update Profile.vue component	2020-01-27 19:21:37 -07:00
Daniel Supernault	9003dabbba	Update StoryCompose component	2020-01-27 19:21:18 -07:00
Daniel Supernault	2ae3c6adfe	Update Timeline.vue, fix #1963 and update profile card layout	2020-01-27 19:20:46 -07:00
Daniel Supernault	0b32a7f343	Update changelog	2020-01-22 22:16:45 -07:00
Daniel Supernault	41abe9d261	Update AdminController	2020-01-22 22:15:11 -07:00
daniel	87cca81228	Merge pull request #1958 from pixelfed/staging ... Update Report model	2020-01-22 20:06:18 -07:00
Daniel Supernault	65be6bdd51	Update Report model	2020-01-22 20:05:40 -07:00
daniel	7123f9b148	Merge pull request #1957 from pixelfed/staging ... Update admin reports, fix 404 bug	2020-01-22 19:56:48 -07:00
Daniel Supernault	245645abb3	Update changelog	2020-01-22 19:51:17 -07:00
Daniel Supernault	dbd5c4cf77	Update admin reports, fix 404 bug	2020-01-22 19:49:59 -07:00
daniel	5c007883c6	Merge pull request #1956 from pixelfed/staging ... Update StoryController, orientate story media and strip exif	2020-01-22 16:05:20 -07:00
Daniel Supernault	9fd72b5e54	Update changelog	2020-01-22 16:01:44 -07:00
Daniel Supernault	07a13fcfed	Update StoryController, orientate story media and strip exif	2020-01-22 16:01:01 -07:00
daniel	2c1d560595	Merge pull request #1955 from pixelfed/staging ... Update readme, add codeclimate badge	2020-01-21 19:07:48 -07:00
Daniel Supernault	1662b37cda	Update readme, add codeclimate badge	2020-01-21 19:07:17 -07:00
daniel	836d82d5a4	Merge pull request #1954 from pixelfed/staging ... Update Story model, hide json attribute by default	2020-01-21 15:22:00 -07:00
Daniel Supernault	b6164bed78	Update changelog	2020-01-21 15:21:01 -07:00
Daniel Supernault	57e155b94c	Update compose view, add deprecation notice for v3	2020-01-21 15:20:27 -07:00
Daniel Supernault	35abcc4df8	Update changelog	2020-01-21 15:10:01 -07:00
Daniel Supernault	de89403c41	Update Story model, hide json attribute by default	2020-01-21 15:09:21 -07:00
daniel	f6c003a918	Merge pull request #1953 from pixelfed/staging ... Update presenter components, load fallback image on errors	2020-01-21 15:04:11 -07:00
Stasiek Michalski	a669602699	Include more and more specific communication methods	2020-01-21 16:46:16 +01:00
Daniel Supernault	e289a713a3	Update changelog	2020-01-20 21:44:27 -07:00
Daniel Supernault	273170c59b	Update presenter components, load fallback image on errors	2020-01-20 21:22:29 -07:00
Albatroz Jeremias	8cceaa042d	set correct hosts for docker	2020-01-20 18:15:29 +00:00
Albatroz Jeremias	872e8b6438	add .env file so that it won't fail when generating APP_KEY	2020-01-20 18:13:51 +00:00