summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-29[#2250] #2250 forced refactoring: mixing of compile-time and runtime ↵rate-limiter-compile-time-and-runtime-settings-mix-with-increased-complexityIvan Tashkinov
settings for RateLimiter (warning: increases complexity, doesn't provide any speed benefits at all).
2020-02-29[#2250] Tiny refactoring per merge request review.Ivan Tashkinov
2020-02-28Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.exIvan Tashkinov
2020-02-27Runtime configurability of RateLimiter. Refactoring. Disabled default rate ↵Ivan Tashkinov
limits in tests.
2020-02-26Merge branch 'feat/instance-gen-improvements' into 'develop'lain
small instance.gen task improvements See merge request pleroma/pleroma!2245
2020-02-26instance.gen task: make example instance name less confusingrinpatch
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
2020-02-25instance.gen task: remind to transfer the config to the database afterrinpatch
migrations
2020-02-25instance.gen task: make instance name default to the domainrinpatch
2020-02-25Merge branch 'fix/dialyzer-warnings' into 'develop'rinpatch
Fix Dialyzer warnings See merge request pleroma/pleroma!2242
2020-02-25Merge branch 'merge/admin-fe-20200225' into 'develop'feld
Update AdminFE build See merge request pleroma/pleroma!2244
2020-02-25Update AdminFE buildMark Felder
2020-02-25Merge branch 'token-web-push-test' into 'develop'feld
Add a test to ensure OAuth tokens are tied to Push subscriptions Closes #1551 See merge request pleroma/pleroma!2241
2020-02-25Fix Dialyzer warningsEgor Kislitsyn
2020-02-25Add a test to ensure OAuth tokens are tied to Push subscriptionsEgor Kislitsyn
2020-02-25Merge branch 'test-fix' into 'develop'lain
Compile fix in tests See merge request pleroma/pleroma!2239
2020-02-25compile fixAlexander Strizhakov
2020-02-24Merge branch 'fix/instance-gen-custom-static' into 'develop'rinpatch
instance.gen task: fix crash when using custom static directory Closes #1082 See merge request pleroma/pleroma!2237
2020-02-24instance.gen task: fix crash when using custom static directoryrinpatch
Closes #1082
2020-02-24Merge branch 'status-visibility-count-stats' into 'develop'Haelwenn
Status count by visibility scope (`GET /api/pleroma/admin/stats` ) See merge request pleroma/pleroma!2097
2020-02-24Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility ↵eugenijm
scope
2020-02-24Merge branch 'theming_your_instance' into 'develop'lain
DOCS Theming your instance See merge request pleroma/pleroma!2232
2020-02-24DOCS Theming your instanceIlja
I added a new file to explain * where a custom theme can be created * where themes can be downloaded * where to add the theme on the server * how to make the theme available on the instance * how to set the theme as default on the instance
2020-02-24Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'lain
Bugfix: return invalid when answer_data is nil Closes #1585 See merge request pleroma/pleroma!2236
2020-02-24Merge branch '1505-threads-federation' into 'develop'Haelwenn
[#1505] Threads / replies federation Closes #1505 See merge request pleroma/pleroma!2129
2020-02-24Captcha: return invalid when answer_data is nilHaelwenn (lanodan) Monnier
2020-02-24captcha_test.exs: Use the same testing logic in Kocaptcha and nativeHaelwenn (lanodan) Monnier
2020-02-22Merge branch 'fix/missing-config-settings' into 'develop'feld
Add missing invites_enabled and account_activation_required settings See merge request pleroma/pleroma!2234
2020-02-22Add missing invites_enabled and account_activation_required settingsMark Felder
2020-02-22Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation # Conflicts: # CHANGELOG.md # config/config.exs
2020-02-21Merge branch 'patch-1' into 'develop'lain
added why doing a vacuum after restoring a backup is so important See merge request pleroma/pleroma!2230
2020-02-21added why doing a vacuum after restoring a backup is so importantIgeljäger
2020-02-20Merge branch 'migration-fixes-20' into 'develop'Haelwenn
Migrations: Make them not fail for old databases See merge request pleroma/pleroma!2227
2020-02-20Merge branch 'fix/gin-fuzzy' into 'develop'Haelwenn
Improve GIN full text search performance See merge request pleroma/pleroma!2228
2020-02-20Merge branch 'single_emoji_reaction' into 'develop'Haelwenn
Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226
2020-02-20Apply database session parameter to improve GIN full text searchMark Felder
2020-02-20Migrations: Make them not fail for old databaseslain
2020-02-20[#1505] Typo fix.Ivan Tashkinov
2020-02-20Merge branch 'require-signature' into 'develop'lain
Add an option to require fetches to be signed Closes #1444 See merge request pleroma/pleroma!2071
2020-02-20Merge branch 'features/remote-follow-userpage-redirect' into 'develop'lain
remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123
2020-02-20Merge branch 'docs_updating' into 'develop'lain
DOCS Add OTP to updating.md See merge request pleroma/pleroma!2108
2020-02-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation # Conflicts: # config/config.exs
2020-02-20Merge branch 'feature/new-registrations-digest' into 'develop'lain
New users digest email Closes #1514 See merge request pleroma/pleroma!2128
2020-02-20[#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3Ivan Tashkinov
2020-02-20Merge branch 'tests-clear-config-tweaks' into 'develop'lain
Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209
2020-02-19Emoji Reactions: Add documentationlain
2020-02-19Pleroma API: Add endpoint to get reaction information on a single emojilain
2020-02-18Merge branch 'fix/mrf-sample-doc' into 'develop'feld
Update MRF docs, make sample code actually compile See merge request pleroma/pleroma!2210
2020-02-18Merge branch 'develop' into 'fix/mrf-sample-doc'feld
# Conflicts: # docs/configuration/mrf.md
2020-02-18Merge branch 'fix/mrf-docs' into 'develop'feld
Fix MRF documentation See merge request pleroma/pleroma!2187
2020-02-18Merge branch 'chore/config-descriptions' into 'develop'feld
Additional config description improvements See merge request pleroma/pleroma!2207
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-05 09:01:35 +0000