73 commits

Author	SHA1	Message	Date
rinpatch	b57b43027c	Change response format of /api/pleroma/emoji to the one that actually makes sense	2019-04-09 23:20:31 +03:00
Alex S	fa8483cb80	Merging develop into feature/770-add-emoji-tags ... Conflict test/web/twitter_api/util_controller_test.exs	2019-04-02 20:39:52 +07:00
lambda	180b87257c	Merge branch 'bugfix/share-mastodon' into 'develop' ... [OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002	2019-04-02 12:47:40 +00:00
Alex S	9e0567ec52	Merge develop into feature/770-add-emoji-tags	2019-04-02 19:16:29 +07:00
Egor Kislitsyn	1b3d921921	change Repo.get(User, id) => User.get_by_id(id)	2019-04-02 17:01:26 +07:00
Sachin Joshi	f20e8d28de	add support for all status type (ostatus) and replase case with if	2019-04-02 12:18:00 +05:45
Sachin Joshi	6386c1c9c1	fetch url for OStatus to know if it is a/c or status	2019-04-02 10:26:09 +05:45
Sachin Joshi	1d01e8e656	[OStatus] adds status to pleroma instance if the url given is a status	2019-04-01 22:26:58 +05:45
Alex S	3601f03147	Adding tag to emoji ets table ... changes in apis	2019-04-01 17:17:57 +07:00
lain	bf27190f7f	UtilController: Return state of safe dm mentions.	2019-03-21 16:20:58 +01:00
eugenijm	43fb03be5a	Allow to mark a single notification as read	2019-03-15 23:56:14 +03:00
Haelwenn (lanodan) Monnier	a3a9cec483	[Credo] fix Credo.Check.Readability.AliasOrder	2019-03-13 04:26:54 +01:00
Haelwenn (lanodan) Monnier	6a6a5b3251	de-group alias/es	2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier	60ea29dfe6	Credo fixes: alias grouping/ordering	2019-02-09 14:59:20 +01:00
lain	8e8a1e1ba8	Return new-style config if old-style config is set to false. ... This is in preparation for 1.0. We'll be able to switch the config to the new mechanism on PleromaFE then as well.	2019-01-28 13:07:12 +01:00
lain	e221c681dc	New frontend configuration mechanism.	2019-01-23 12:40:57 +01:00
William Pitcock	980b5288ed	update copyright years to 2019	2018-12-31 15:41:47 +00:00
Ivan Tashkinov	67b4297f4d	[#483] Refactored blocks and follows import, added tests.	2018-12-29 12:02:37 +03:00
Ivan Tashkinov	700661b761	[#483] Blocked users list import (TwitterAPI).	2018-12-28 23:01:03 +03:00
William Pitcock	2791ce9a1f	add license boilerplate to pleroma core	2018-12-23 20:56:42 +00:00
Ivan Tashkinov	1de0aa2f10	[#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.	2018-12-18 17:21:05 +03:00
Ekaterina Vaartis	a2399c1c7c	Add base CAPTCHA support (currently only kocaptcha)	2018-12-15 03:12:44 +03:00
href	bfe27c1b55	Merge branch '114_email_invites' into 'develop' ... [#114] Email invites See merge request pleroma/pleroma!541	2018-12-14 20:22:24 +00:00
href	980131b4db	Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' ... Improve web push Closes #393, #422, and #452 See merge request pleroma/pleroma!524	2018-12-14 18:50:44 +00:00
href	91236c60c7	Merge branch 'feature/file-size-checking' into 'develop' ... [#36] Add warnings when file upload fails See merge request pleroma/pleroma!523	2018-12-14 13:00:24 +00:00
href	331396cbcd	Properly disable Web Push if no VAPID key is set	2018-12-14 13:05:51 +01:00
Ivan Tashkinov	9666376f5f	[#114] Readded invites_enabled config setting, updated readme.	2018-12-14 12:37:06 +03:00
scarlett	213176c3c3	Add new frontend options to server-side config.	2018-12-10 23:15:01 +00:00
Maksim Pechnikov	074fa790ba	fix compile warnings	2018-12-09 20:50:08 +03:00
Rin Toshaka	15616eda5e	Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content	2018-12-08 21:48:49 +01:00
Rin Toshaka	578051809f	Add uploadlimit to Twitter API config	2018-12-07 20:03:30 +01: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
href	bc5cf2c192	Improved version string	2018-11-20 17:55:03 +01:00
href	5bb88fd174	Runtime configuration ... Related to #85 Everything should now be configured at runtime, with the exception of the `Pleroma.HTML` scrubbers (the scrubbers used can be changed at runtime, but their configuration is compile-time) because it's building a module with a macro.	2018-11-06 19:41:15 +01:00
href	763fc7b44f	Runtime configured emojis ... The changes are a bit heavy since the emojis were loaded into module attributes from filesystem. This introduces a GenServer using an ETS table to cache in memory the emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.	2018-11-05 13:24:00 +01:00
scarlett	a253c1466e	New frontend options	2018-10-21 12:52:52 +01:00
scarlett	7562912f6a	Use maybe_direct_follow for follow imports	2018-10-17 04:16:11 +01:00
William Pitcock	16307da311	twitterapi: frontend config: add formattingOptionsEnabled	2018-10-05 20:49:34 +00:00
William Pitcock	e2ce0e9e05	run mix format.	2018-09-01 21:12:42 +00:00
William Pitcock	c921d99898	config: add ability to disable Pleroma FE config management (closes #276)	2018-09-01 21:05:32 +00:00
William Pitcock	856b5e1ca4	config: chase pleroma-fe updates from MR pleroma-fe!324.	2018-08-31 04:01:21 +00:00
hakabahitoyo	946a0769c4	remove unused settings from /api/statusnet/config	2018-08-26 17:40:15 +09:00
William Pitcock	09cb402203	fe config: add collapse_message_with_subject fe option	2018-08-24 18:21:42 +00:00
eal	db5cdfa333	Remote follow: don't show confusing error if already following	2018-08-09 20:47:29 +03:00
William Pitcock	b23630076f	TwitterAPI: present pleroma frontend config in API	2018-07-17 15:46:24 +00:00
Rachel H	1525a0404b	Fix follow errors	2018-06-07 00:39:24 -07:00
Syldexia	d0690622cd	Added endpoint for changing passwords	2018-05-21 23:06:03 +01:00
Syldexia	d1366f8d46	Modified deleting an account to run as a task	2018-05-19 13:35:49 +01:00
Syldexia	5bfb7b4ce6	Moved account deletion stuff to somewhere that hopefully makes more sense	2018-05-13 14:36:02 +01:00