59e16fc45a
enable synchronization by default
5 years ago
4016341a77
Merge branch 'fix/1005-idna-domains' into 'develop'
...
support for idna domains
Closes #1005
See merge request pleroma/pleroma!1330
5 years ago
a237c6a2d4
support for idna domains
5 years ago
3ff4a06ebe
Merge branch 'features/mastoapi-emoji-categories' into 'develop'
...
MastoAPI: Add categories to custom emojis
See merge request pleroma/pleroma!1365
5 years ago
252e129b1e
MastoAPI: Add categories to custom emojis
...
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
5 years ago
beba7bbc85
removing synchronization worker
5 years ago
ade213cb35
robots txt test fix
5 years ago
936050257d
saving following_address for existing users
5 years ago
f8786fa6f2
adding following_address field to user
5 years ago
b972b972e0
Merge branch 'feature/render-mentions-for-tags' into 'develop'
...
Create mentions only for explicitly mentioned users
Closes #999
See merge request pleroma/pleroma!1375
5 years ago
ff55e3c16f
Create mentions only for explicitly mentioned users
5 years ago
f295b9fba9
Merge branch 'localization' into 'develop'
...
Error Localization
See merge request pleroma/pleroma!1396
5 years ago
ed8ce21a22
Fix unused import warning
5 years ago
406efb3688
Add Russian translation
5 years ago
a42da8f311
Fix response
5 years ago
c2a589d9a3
Fix credo warning
5 years ago
5104f65b69
Wrap error messages into gettext helpers
5 years ago
26a6871609
Add translation helpers
5 years ago
663aebdd59
Update `gettext` dependency
5 years ago
0d54a571ca
Add SetLocalePlug
5 years ago
42422f3ff2
Merge branch 'tests/web/mastodon_api/search_controller' into 'develop'
...
add test for search_controller/ 100% coverage
See merge request pleroma/pleroma!1377
5 years ago
008c55e4e9
add test for search_controller/ 100% coverage
5 years ago
9822f3a05e
Merge branch 'hotfix/disable-email-changelog-fix' into 'develop'
...
Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance
See merge request pleroma/pleroma!1395
5 years ago
e2782c342f
Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance
5 years ago
d91231f0be
Merge branch 'feature/disable_send_emails' into 'develop'
...
[#1062 ] added option to disable send email
See merge request pleroma/pleroma!1389
5 years ago
12b1454245
[ #1062 ] added option to disable send email
5 years ago
b00620b378
Merge branch 'feature/send-delete-user-activity' into 'develop'
...
Send and handle "Delete" activity for deleted users
Closes #1071 and #1059
See merge request pleroma/pleroma!1384
5 years ago
2d2b50ccca
Send and handle "Delete" activity for deleted users
5 years ago
75be90a6d1
Merge branch 'release/listener' into 'develop'
...
add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393
5 years ago
8f2cb820c0
Merge branch 'fix/license-attribution' into 'develop'
...
Add license/copyright to all project files
See merge request pleroma/pleroma!1394
5 years ago
93a0eeab16
Add license/copyright to all project files
5 years ago
37b0bd0d86
Merge branch 'tests/mrf_policy' into 'develop'
...
tests MRF filters
See merge request pleroma/pleroma!1379
5 years ago
bb8065a1fd
tests MRF filters
5 years ago
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
5 years ago
81f1017b84
Merge branch '878-activity-object-decoupling-in-tests' into 'develop'
...
[#878 ] Refactored assumptions on embedded object presence in tests
Closes #878
See merge request pleroma/pleroma!1390
5 years ago
8a41d34673
[ #878 ] Tests improvements per code review.
5 years ago
6fc0c27be3
[ #878 ] Uncommented test statement.
5 years ago
829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
5 years ago
2bb945cb70
Merge branch 'docs/more-mastodon-api' into 'develop'
...
Docs/more mastodon api
See merge request pleroma/pleroma!1392
5 years ago
c91b5c87ff
Docs/more mastodon api
5 years ago
670a77ecbc
Merge branch 'feature/allow-user-query-via-id' into 'develop'
...
Admin API: Allow querying user by ID
See merge request pleroma/pleroma!1380
5 years ago
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
5 years ago
9a9b60cfbc
Merge branch 'develop' into feature/allow-user-query-via-id
5 years ago
e19e829758
Merge branch 'fix/1019-correct-count-remote-users' into 'develop'
...
Fix/1019 correct count remote users
Closes #1019
See merge request pleroma/pleroma!1376
5 years ago
d6b0fce6e9
Fix/1019 correct count remote users
5 years ago
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
5 years ago
b6fd16d0a4
Merge branch 'test-coverage' into 'develop'
...
reverse proxy tests
See merge request pleroma/pleroma!1385
5 years ago
4e6e5d8042
reverse proxy tests
5 years ago
1179a13533
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
...
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
5 years ago
1ab4e35f27
Merge branch 'enable-ogp-by-default' into 'develop'
...
Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes #1034
See merge request pleroma/pleroma!1388
5 years ago
Alex S