330 Commits (9b1e75bac8f6e042e7f70e4f29cc60fa96000323)

Author	SHA1	Message	Date
Ekaterina Vaartis	336e37d98f	Make captcha (kocaptcha) stateless ... Also rename seconds_retained to seconds_valid since that's how it is now. Put it down from 180 to 20 seconds. The answer data is now stored in an encrypted text transfered to the client and back, so no ETS is needed	6 years ago
kaniini	2e2030ada8	Merge branch '114_email_confirmation' into 'develop' ... [#114] Email confirmation See merge request pleroma/pleroma!546	6 years ago
kaniini	fda148a9a2	Merge branch 'documentation/copy-pleroma-api' into 'develop' ... Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints See merge request pleroma/pleroma!571	6 years ago
rinpatch	d6b133ec51	Pleroma-API.md: Additionnal endpoints	6 years ago
Haelwenn (lanodan) Monnier	6adea5a7b2	Move to docs	6 years ago
rinpatch	4a6855d9ee	Provide plaintext representations of content/cw in MastoAPI	8 years ago
Egor Kislitsyn	9abf832b03	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	6 years ago
lambda	e19590c93f	Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' ... Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019	6 years ago
lambda	fd45cab9ec	Merge branch 'twitter_oauth' into 'develop' ... OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923	6 years ago
lambda	23067908de	Merge branch 'feature/770-add-emoji-tags' into 'develop' ... Feature/770 add emoji tags See merge request pleroma/pleroma!998	6 years ago
Egor Kislitsyn	c3d5c3513a	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	6 years ago
Egor Kislitsyn	a1a854646e	Merge branch 'develop' into use-jobs-in-webpush	6 years ago
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	6 years ago
lambda	b4da2bc1d0	Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' ... # Conflicts: # config/config.exs # docs/config.md	6 years ago
Ivan Tashkinov	e3328bc138	[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.	6 years ago
eugenijm	2056efa714	Add scheduler for sending scheduled activities to the queue	6 years ago
eugenijm	fc92a0fd8d	Added limits and media attachments for scheduled activities.	6 years ago
feld	9aeac7dcca	Merge branch 'feature/prometheus' into 'develop' ... Upstream: Metrics and debugging See merge request pleroma/pleroma!1020	6 years ago
Alex S	7410aee886	Merge develop to 770-add-emoji-tags ... Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs	6 years ago
Egor Kislitsyn	f1712cd2f1	Use PleromaJobQueue in Pleroma.Web.Push	6 years ago
Ivan Tashkinov	47a236f753	[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.	6 years ago
Mark Felder	66e7b03372	Merge branch 'develop' into feature/prometheus	6 years ago
Mark Felder	5564cd421d	Document Prometheus	6 years ago
Egor Kislitsyn	cfa6e7289f	Improve Transmogrifier.upgrade_user_from_ap_id/2	6 years ago
Alex S	d140738edf	second level of headertext change in doc	6 years ago
Alex S	3465b7ba9a	syntax highlighting	6 years ago
Alex S	9e0567ec52	Merge develop into feature/770-add-emoji-tags	6 years ago
Alex S	08d64b977f	little changes and typos	6 years ago
Alex S	851c5bf093	updating custom_emoji docs	6 years ago
Alex S	3601f03147	Adding tag to emoji ets table ... changes in apis	6 years ago