111 Commits

Author	SHA1	Message	Date
Maksim Pechnikov	074fa790ba	fix compile warnings	2018-12-09 20:50:08 +03:00
lambda	5436aaad4f	Merge branch 'fix/add-upload.ex' into 'develop' ... Mix Tasks: Add task uploads.ex for migrating local uploads. See merge request pleroma/pleroma!517	2018-12-08 09:12:37 +00:00
Rin Toshaka	6c73136aec	[#283] Mix Tasks: Fix a typo in relay.ex	2018-12-08 08:30:34 +01:00
Rin Toshaka	fd5c7b445f	Fix a typo	2018-12-07 19:19:14 +01:00
Rin Toshaka	a02e0c18bc	Mix Tasks: Add task uploads.ex for migrating local uploads.	2018-12-07 15:13:57 +01:00
lambda	8764f64690	Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop' ... Add mix pleroma.user unsubscribe to mix doc See merge request pleroma/pleroma!512	2018-12-07 09:23:56 +00:00
rinpatch	4e2250b1dd	Fix a typo in relay.ex moduledoc	2018-12-07 11:41:01 +03:00
rinpatch	f7e23aee90	Oops	2018-12-07 10:44:54 +03:00
rinpatch	f661813807	Add mix pleroma.user unsubscribe to mix doc	2018-12-07 10:39:54 +03:00
rinpatch	08e10a70ec	Rename def to defval	2018-12-07 09:46:13 +03:00
Rin Toshaka	1d11c4cf11	add common.ex	2018-12-07 06:12:39 +01:00
Rin Toshaka	71d5cf9ed8	Remove unused vars from user.ex	2018-12-06 18:25:39 +01:00
Rin Toshaka	66313cda02	Update instance.ex for web push	2018-12-06 18:16:51 +01:00
Rin Toshaka	88f92693f2	Merge develop	2018-12-06 18:11:22 +01:00
Rin Toshaka	ca7b46fb3b	Refactor common functions to common.ex	2018-12-06 18:01:28 +01:00
Rin Toshaka	4a2a7ce636	Refactor common functions to common.ex	2018-12-06 18:00:24 +01:00
Rin Toshaka	3a84511df1	remove migrate_local_uploads.ex	2018-12-06 17:35:33 +01:00
Egor Kislitsyn	4944498133	Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/plugs/oauth_plug.ex	2018-12-06 20:15:16 +07:00
Egor Kislitsyn	8b4397c704	Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock	2018-12-06 19:55:58 +07:00
Egor Kislitsyn	04a48286e6	Add web push support	2018-12-06 19:29:04 +07:00
Rin Toshaka	dfc9c08796	formating	2018-12-05 19:12:23 +01:00
Rin Toshaka	ffec96d8cc	Everything should use Mix.Task.Run	2018-12-05 19:05:37 +01:00
Rin Toshaka	facfd03bc1	Move relay tasks to relay.ex	2018-12-05 18:11:59 +01:00
Rin Toshaka	e8ba579efe	Switch from User.info_changeset because it is deprecated	2018-12-05 17:58:26 +01:00
Rin Toshaka	c3519132df	Sorry	2018-12-05 16:44:15 +01:00
Rin Toshaka	5427d2af3a	Update mix tasks since User.info.info_changeset is deprecated	2018-12-05 16:41:50 +01:00
Rin Toshaka	9938fa3293	Merge develop to refactor/mix-tasks	2018-12-05 14:16:55 +01:00
Rin Toshaka	6396f1b58f	change new to gen in instance.ex . Refactor user.ex	2018-12-04 19:00:45 +01:00
Rin Toshaka	03b2d1016d	F O R M A T I N G	2018-12-02 20:27:49 +01:00
Rin Toshaka	57c71f8468	Move generate_invite to user.ex	2018-12-02 20:26:15 +01:00
Rin Toshaka	d924b6cd3d	Refactor copypasta to a private function in instance.ex	2018-12-02 20:04:33 +01:00
Rin Toshaka	cbe22deb51	Lint fix	2018-12-02 19:20:50 +01:00
Rin Toshaka	faf1f2b304	Move gen.instance to instance.ex	2018-12-02 19:18:06 +01:00
Rin Toshaka	7983b0bdfe	Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users.	2018-12-02 18:05:59 +01:00
lain	e3f3d13d99	Add uuid generation extension to sample_psql.eex.	2018-12-02 11:20:49 +01:00
Rin Toshaka	31b3ac05ac	Lint fix	2018-12-02 10:01:17 +01:00
Rin Toshaka	a8ef6b1190	Add admin option to pleroma.user new. Add user existence checking to toggle_activated	2018-12-02 09:36:31 +01:00
rinpatch	ae82852330	Move set_admin task to lib/mix/tasks/pleroma/user.ex	2018-12-01 18:55:52 +03:00
rinpatch	6f174cbb71	Delete reactivate user task	2018-12-01 18:34:26 +03:00
rinpatch	5f91d6b859	Fix toggle_deactivated to reactivate a deactivated user	2018-12-01 18:33:53 +03:00
rinpatch	fe2759bc9f	Attempt to resolve merge conflict	2018-12-01 18:12:27 +03:00
href	02d3dc6869	Uploads fun, part. 2	2018-11-30 18:02:37 +01:00
href	b19597f602	reverse proxy / uploads	2018-11-30 18:00:47 +01:00
Haelwenn (lanodan) Monnier	44b6200103	lib/mix/tasks/relay*: Use a with block	2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier	12ccf0c4f8	Change Relay from status to {status, message}	2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier	1a31d71187	lib/mix/tasks/relay_{un,}follow.ex: Use a with block	2018-11-17 20:25:57 +01:00
Haelwenn (lanodan) Monnier	7fbfd2db96	lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow	2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier	011a2e36b1	lib/mix/tasks/make_admin.ex: New task	2018-11-17 20:25:53 +01:00
William Pitcock	2829fa4183	sample config: chase http_security change	2018-11-12 15:17:04 +00:00
William Pitcock	a2bf5426cb	sample config: document how to make CSPPlug send STS headers (off by default to allow for SSL debugging)	2018-11-11 06:42:14 +00:00