7899 Commits (2753285b7722fdb47f0ebb2180e997cf72f65d1a)

 

All Branches   

Search

Author	SHA1	Message	Date
Alex S	2753285b77	config editing through database	5 years ago
lain	e118d639a0	Merge branch 'fix/captcha-time' into 'develop' ... Fix captcha time, which was meant to be 5 minutes See merge request pleroma/pleroma!2094	5 years ago
Mark Felder	89243fee8e	Fix captcha time, which was meant to be 5 minutes	5 years ago
feld	e8b0c7689a	Merge branch 'update/adminfe-20201019' into 'develop' ... Update AdminFE build See merge request pleroma/pleroma!2093	5 years ago
Mark Felder	fd3c23af63	Update AdminFE build	5 years ago
rinpatch	fcd5dd259a	Merge branch 'bugfix/smtp-config-examples' into 'develop' ... Fix SMTP mailer example See merge request pleroma/pleroma!2091	5 years ago
RX14	b55f2563d0	Fix SMTP mailer example ... `ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the same SMTP connection, causing it to fail.	5 years ago
rinpatch	ee0c40831e	Merge branch 'update-captcha' into 'develop' ... Update `captcha` dependency Closes #1492 See merge request pleroma/pleroma!2088	5 years ago
Egor Kislitsyn	520940d3e2	Update `captcha` dependency	5 years ago
Haelwenn	11e010fc77	Merge branch 'feat/doc-improvements' into 'develop' ... Documentation imrpovements See merge request pleroma/pleroma!2084	5 years ago
lain	10ce7185c2	Merge branch 'increase-captcha-expiry-time' into 'develop' ... Increase CAPTCHA expiration time to 5 minutes Closes #1491 See merge request pleroma/pleroma!2086	5 years ago
Egor Kislitsyn	b012e66e4e	Increase CAPTCHA expiration time to 5 minutes	5 years ago
rinpatch	c51e93978e	Merge branch 'feature/custom-runtime-modules' into 'develop' ... Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039	5 years ago
rinpatch	7447c80e33	Merge branch 'revert-a54aa5af' into 'develop' ... Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" Closes #1488 See merge request pleroma/pleroma!2083	5 years ago
Maxim Filippov	e71a13ad57	Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" ... This reverts merge request !2076	5 years ago
feld	0193b0862f	Merge branch 'fix/twitter-card-without-attachments' into 'develop' ... Posts without media attachments should get the Summary TwitterCard See merge request pleroma/pleroma!2082	5 years ago
Mark Felder	06ae56a3ae	Posts without media attachments should get the Summary TwitterCard	5 years ago
feld	a54aa5af43	Merge branch 'feature/status-counts-by-scope' into 'develop' ... Stats: return status counts by scope See merge request pleroma/pleroma!2076	5 years ago
feld	60819fd973	Merge branch 'fix/remote-user-no-follower-counter' into 'develop' ... Do not crash when remote user follower and following counters are hidden See merge request pleroma/pleroma!2077	5 years ago
Haelwenn	c7848b6326	Merge branch 'remove-outdated-doc' into 'develop' ... Remove `/api/account/register` documentation from pleroma_api.md Closes #1486 See merge request pleroma/pleroma!2078	5 years ago
Egor Kislitsyn	fc79c69173	Remove `/api/account/register` documentation from pleroma_api.md	5 years ago
Maxim Filippov	5fc84552d3	Fix all count	5 years ago
Maxim Filippov	4079d66f00	Expose issue via failing test	5 years ago
Egor Kislitsyn	432b3067d4	Do not crash when remote user follower and following counters are hidden	5 years ago
Maxim Filippov	404a9ccb9a	Stats: return status counts by scope	5 years ago
rinpatch	d23a80e691	Merge branch 'feature/add-event-support' into 'develop' ... Add ActivityPub Object Event type support See merge request pleroma/pleroma!2075	5 years ago
rinpatch	086250ac5b	Merge branch 'ci/rum-testing-no-recompilation' into 'develop' ... CI: Add a cache policy for test jobs and fix rum tests recompiling everything See merge request pleroma/pleroma!2074	5 years ago
rinpatch	407449158f	CI: Add a cache policy for test jobs and fix rum tests recompiling ... everything	5 years ago
Thomas Citharel	d2f1c4f658	Add ActivityPub Object Event type support ... Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr>	5 years ago
Haelwenn	38ad407395	Merge branch 'hide-followers-count' into 'develop' ... Hide follower counter when hiding is activated Closes #1450 See merge request pleroma/pleroma!2072	5 years ago
Egor Kislitsyn	8f79f433bc	Hide follower counter when hiding is activated	5 years ago
lain	804b961d3c	Merge branch 'fix/remove-useless-sleep' into 'develop' ... Remove useless sleeping/reduce it See merge request pleroma/pleroma!2069	5 years ago
Egor Kislitsyn	b9a87b1baa	Merge branch 'develop' into feature/custom-runtime-modules	5 years ago
rinpatch	e659fbfbf9	Merge branch 'kocaptcha-default-endpoint' into 'develop' ... Add default endpoint to Pleroma.Captcha.Kocaptcha See merge request pleroma/pleroma!2070	5 years ago
Egor Kislitsyn	fc484e5ce6	Add Kocaptcha endpoint to config.exs	5 years ago
Egor Kislitsyn	8d242f52d4	Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha" ... This reverts commit 82c62c5028.	5 years ago
Egor Kislitsyn	82c62c5028	Add default endpoint to Pleroma.Captcha.Kocaptcha	5 years ago
rinpatch	eae65e3216	formatting	5 years ago
rinpatch	6ffbfdeeb2	tests: significantly reduce streamer timeout ... there is no reason IPC between two processes on the same node should take 4 seconds	5 years ago
rinpatch	54029fe212	tests: remove a useless sleep in rate limiter tests ... It was used to check that authenticated and unauthenticated users have different limits. Instead of sleeping a super low limit for unauthenticated users was set, preventing them from doing 5 requests in the first place.	5 years ago
rinpatch	137a3d220b	tests: remove a useless 1 second sleep ... there is no need to wait for the task to finish, it will be deleted when the transaction is aborted anyway.	5 years ago
rinpatch	814a99c80f	tests: remove a useless 3 second sleep ... the ids favs use are accurate down to a microsecond, there is no need for it	5 years ago
rinpatch	c8046e1080	tests: Replace 2 second sleep with offseting updated_at	5 years ago
Haelwenn	8efacfed67	Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop' ... Publisher: check out a connection for inserting publish_one jobs See merge request pleroma/pleroma!2063	5 years ago
rinpatch	bcd16676a7	Publisher: check out a connection for inserting publish_one jobs ... Related to #1474, federation of one post on my istance creates in best-case 360 jobs, so if they for some reason take a while to insert, it will exhaust the connection pool. This fixes it by checking out one dedicated connection for inserting them.	5 years ago
Egor Kislitsyn	7528322f83	Merge branch 'develop' into feature/custom-runtime-modules	5 years ago
lain	2f31cef71f	Merge branch 'feature/native-captcha' into 'develop' ... Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060	5 years ago
lain	8ad6d2784c	Merge branch 'uguu' into 'develop' ... Update frontend See merge request pleroma/pleroma!2062	5 years ago
lain	756a029edf	Update frontend	5 years ago
lain	f44794d273	Merge branch '1427-oauth-graceful-admin-scope' into 'develop' ... [#1427] Graceful clearance of OAuth admin scopes for non-admin users Closes #1427 See merge request pleroma/pleroma!2061	5 years ago