Haelwenn
908b6ee49a
Merge branch 'status-visibility-count-stats' into 'develop'
...
Status count by visibility scope (`GET /api/pleroma/admin/stats` )
See merge request pleroma/pleroma!2097
5 years ago
eugenijm
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
lain
d240ce41b5
Merge branch 'theming_your_instance' into 'develop'
...
DOCS Theming your instance
See merge request pleroma/pleroma!2232
5 years ago
Ilja
c0146f4859
DOCS Theming your instance
...
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
5 years ago
lain
81f29e7c6a
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
...
Bugfix: return invalid when answer_data is nil
Closes #1585
See merge request pleroma/pleroma!2236
5 years ago
Haelwenn
1e1156b645
Merge branch '1505-threads-federation' into 'develop'
...
[#1505 ] Threads / replies federation
Closes #1505
See merge request pleroma/pleroma!2129
5 years ago
Haelwenn (lanodan) Monnier
f9fe6a9e30
Captcha: return invalid when answer_data is nil
5 years ago
Haelwenn (lanodan) Monnier
ee57663d34
captcha_test.exs: Use the same testing logic in Kocaptcha and native
5 years ago
feld
1961a680ec
Merge branch 'fix/missing-config-settings' into 'develop'
...
Add missing invites_enabled and account_activation_required settings
See merge request pleroma/pleroma!2234
5 years ago
Mark Felder
9fe60c3b9c
Add missing invites_enabled and account_activation_required settings
5 years ago
Ivan Tashkinov
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
5 years ago
lain
114e7b764e
Merge branch 'patch-1' into 'develop'
...
added why doing a vacuum after restoring a backup is so important
See merge request pleroma/pleroma!2230
5 years ago
Igeljäger
1ed485ec1d
added why doing a vacuum after restoring a backup is so important
5 years ago
Haelwenn
292031f6dd
Merge branch 'migration-fixes-20' into 'develop'
...
Migrations: Make them not fail for old databases
See merge request pleroma/pleroma!2227
5 years ago
Haelwenn
499d9405d5
Merge branch 'fix/gin-fuzzy' into 'develop'
...
Improve GIN full text search performance
See merge request pleroma/pleroma!2228
5 years ago
Haelwenn
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
5 years ago
Mark Felder
b6bb73f43e
Apply database session parameter to improve GIN full text search
5 years ago
lain
2d5cf0f8cd
Migrations: Make them not fail for old databases
5 years ago
Ivan Tashkinov
0d14c3f410
[ #1505 ] Typo fix.
5 years ago
lain
3eddd9caa6
Merge branch 'require-signature' into 'develop'
...
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
5 years ago
lain
c69b04c490
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
...
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
5 years ago
lain
d536a00d42
Merge branch 'docs_updating' into 'develop'
...
DOCS Add OTP to updating.md
See merge request pleroma/pleroma!2108
5 years ago
Ivan Tashkinov
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
lain
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
5 years ago
Ivan Tashkinov
3432294657
[ #1505 ] Fixed @spec for Queries.by_object_in_reply_to_id/3
5 years ago
lain
cf4ecffcea
Merge branch 'tests-clear-config-tweaks' into 'develop'
...
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
5 years ago
lain
3af6d3f8e2
Emoji Reactions: Add documentation
5 years ago
lain
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
feld
3b78695c98
Merge branch 'fix/mrf-sample-doc' into 'develop'
...
Update MRF docs, make sample code actually compile
See merge request pleroma/pleroma!2210
5 years ago
feld
53a7680c16
Merge branch 'develop' into 'fix/mrf-sample-doc'
...
# Conflicts:
# docs/configuration/mrf.md
5 years ago
feld
3416948cdf
Merge branch 'fix/mrf-docs' into 'develop'
...
Fix MRF documentation
See merge request pleroma/pleroma!2187
5 years ago
feld
264d18be32
Merge branch 'chore/config-descriptions' into 'develop'
...
Additional config description improvements
See merge request pleroma/pleroma!2207
5 years ago
lain
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
5 years ago
Ivan Tashkinov
226f4d5ef9
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
...
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
5 years ago
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain
3fa2ac68df
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
...
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
5 years ago
lain
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
5 years ago
Egor Kislitsyn
ca7ac068f0
Add a test
5 years ago
lain
fb6c2576dc
Merge branch 'chore/floki-update' into 'develop'
...
Update floki to 0.25
See merge request pleroma/pleroma!2217
5 years ago
Egor Kislitsyn
2ef70b55f5
Fix `status.expires_at` type
5 years ago
feld
962eb8d4ac
Merge branch 'update/admin-fe-20200217' into 'develop'
...
Update adminFE build
See merge request pleroma/pleroma!2221
5 years ago
Mark Felder
6a97c1b9ff
Update adminFE build
5 years ago
Mark Felder
81cc9dd085
Merge branch 'develop' into chore/floki-update
5 years ago
rinpatch
5178c8dbc3
Merge branch 'upgrade_crypto' into 'develop'
...
Update plug_crypto
See merge request pleroma/pleroma!2219
5 years ago
lain
7df13e6f3a
Update plug_crypto
5 years ago
rinpatch
02809dc276
Merge branch 'feat/git-attributes-elixir' into 'develop'
...
.gitattributes: use native support for elixir definitions
See merge request pleroma/pleroma!2218
5 years ago
rinpatch
b4b472d782
.gitattributes: use native support for elixir definitions
...
see https://github.com/elixir-lang/elixir/pull/9823
5 years ago
rinpatch
472132215e
Use floki's new APIs for parsing fragments
5 years ago
Ivan Tashkinov
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
lain
0b5a2bbe5b
Merge branch 'bugfix/link-preview-site_name' into 'develop'
...
MastodonAPI.StatusView: Do not use site_name
See merge request pleroma/pleroma!2216
5 years ago