554bc88e8a
Update AdminFE build
5 years ago
97dae77240
Merge branch 'token-web-push-test' into 'develop'
...
Add a test to ensure OAuth tokens are tied to Push subscriptions
Closes #1551
See merge request pleroma/pleroma!2241
5 years ago
6b012ddd69
some docs
5 years ago
22018adae6
Fix Dialyzer warnings
5 years ago
c495e6d387
Add a test to ensure OAuth tokens are tied to Push subscriptions
5 years ago
87e8d792bd
Merge branch 'test-fix' into 'develop'
...
Compile fix in tests
See merge request pleroma/pleroma!2239
5 years ago
3eccdd15aa
compile fix
5 years ago
e4804137b3
Document database default changes
5 years ago
f71aa644b1
Add :unnamed option to default database configuration
5 years ago
035c2c1415
Merge branch 'fix/instance-gen-custom-static' into 'develop'
...
instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237
5 years ago
5e4fe0e8f7
instance.gen task: fix crash when using custom static directory
...
Closes #1082
5 years ago
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
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
d240ce41b5
Merge branch 'theming_your_instance' into 'develop'
...
DOCS Theming your instance
See merge request pleroma/pleroma!2232
5 years ago
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
8efae966b1
open conn in separate task
5 years ago
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
1e1156b645
Merge branch '1505-threads-federation' into 'develop'
...
[#1505 ] Threads / replies federation
Closes #1505
See merge request pleroma/pleroma!2129
5 years ago
f9fe6a9e30
Captcha: return invalid when answer_data is nil
5 years ago
ee57663d34
captcha_test.exs: Use the same testing logic in Kocaptcha and native
5 years ago
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
9fe60c3b9c
Add missing invites_enabled and account_activation_required settings
5 years ago
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
5 years ago
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
1ed485ec1d
added why doing a vacuum after restoring a backup is so important
5 years ago
d44f9e3b6c
fix for timeout clause
5 years ago
f604f9e470
hackney pool timeout
5 years ago
6806df80dd
don't log info ssl messages
5 years ago
ad8f26c0a4
more info in Connections.checkin timout errors
5 years ago
a03c420b84
by default don't use gun retries
...
remove conn depends on retry setting from config
5 years ago
3849bbb60d
temp using tesla from fork
5 years ago
13918cb545
Merge branch 'develop' into gun
5 years ago
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
499d9405d5
Merge branch 'fix/gin-fuzzy' into 'develop'
...
Improve GIN full text search performance
See merge request pleroma/pleroma!2228
5 years ago
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
5 years ago
b6bb73f43e
Apply database session parameter to improve GIN full text search
5 years ago
2d5cf0f8cd
Migrations: Make them not fail for old databases
5 years ago
0d14c3f410
[ #1505 ] Typo fix.
5 years ago
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
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
d536a00d42
Merge branch 'docs_updating' into 'develop'
...
DOCS Add OTP to updating.md
See merge request pleroma/pleroma!2108
5 years ago
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
5 years ago
3432294657
[ #1505 ] Fixed @spec for Queries.by_object_in_reply_to_id/3
5 years ago
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
3af6d3f8e2
Emoji Reactions: Add documentation
5 years ago
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
c9db0507f8
removing retry option and changing some logger messages levels
5 years ago
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
53a7680c16
Merge branch 'develop' into 'fix/mrf-sample-doc'
...
# Conflicts:
# docs/configuration/mrf.md
5 years ago
Mark Felder