summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-11Merge branch 'fix/1019-refactor' into 'develop'kaniini
Fix/1019 refactor See merge request pleroma/pleroma!1397
2019-07-11Merge branch 'chore/mailmap' into 'develop'kaniini
add mailmap [ci skip] See merge request pleroma/pleroma!1399
2019-07-11add mailmap [ci skip]Ariadne Conill
2019-07-10enable synchronization by defaultAlex S
2019-07-10Merge branch 'fix/1005-idna-domains' into 'develop'kaniini
support for idna domains Closes #1005 See merge request pleroma/pleroma!1330
2019-07-10support for idna domainsAlexander Strizhakov
2019-07-10Merge branch 'features/mastoapi-emoji-categories' into 'develop'Haelwenn
MastoAPI: Add categories to custom emojis See merge request pleroma/pleroma!1365
2019-07-10MastoAPI: Add categories to custom emojisHaelwenn (lanodan) Monnier
Note: This isn’t in a release yet, can be seen in mastofe on the rebase/glitch-soc branch.
2019-07-10removing synchronization workerAlex S
2019-07-10robots txt test fixAlex S
2019-07-10saving following_address for existing usersAlex S
2019-07-10adding following_address field to userAlex S
2019-07-10Merge branch 'feature/render-mentions-for-tags' into 'develop'kaniini
Create mentions only for explicitly mentioned users Closes #999 See merge request pleroma/pleroma!1375
2019-07-10Create mentions only for explicitly mentioned usersSergey Suprunenko
2019-07-10Merge branch 'localization' into 'develop'kaniini
Error Localization See merge request pleroma/pleroma!1396
2019-07-10Fix unused import warningEgor Kislitsyn
2019-07-10Add Russian translationEgor Kislitsyn
2019-07-10Fix responseEgor Kislitsyn
2019-07-10Fix credo warningEgor Kislitsyn
2019-07-10Wrap error messages into gettext helpersEgor Kislitsyn
2019-07-10Add translation helpersEgor Kislitsyn
2019-07-10Update `gettext` dependencyEgor Kislitsyn
2019-07-10Add SetLocalePlugEgor Kislitsyn
2019-07-10Merge branch 'tests/web/mastodon_api/search_controller' into 'develop'kaniini
add test for search_controller/ 100% coverage See merge request pleroma/pleroma!1377
2019-07-10add test for search_controller/ 100% coverageMaksim
2019-07-10Merge branch 'hotfix/disable-email-changelog-fix' into 'develop'rinpatch
Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance See merge request pleroma/pleroma!1395
2019-07-10Add a breaking changelog entry for explicitly disabling the mailer and ↵rinpatch
reorder changelog sections in order of importance
2019-07-10Merge branch 'feature/disable_send_emails' into 'develop'kaniini
[#1062] added option to disable send email See merge request pleroma/pleroma!1389
2019-07-10[#1062] added option to disable send emailMaksim
2019-07-10Merge branch 'feature/send-delete-user-activity' into 'develop'kaniini
Send and handle "Delete" activity for deleted users Closes #1071 and #1059 See merge request pleroma/pleroma!1384
2019-07-10Send and handle "Delete" activity for deleted usersSergey Suprunenko
2019-07-10Merge branch 'release/listener' into 'develop'kaniini
add listener port and ip option for 'pleroma.instance gen' and enable its test See merge request pleroma/pleroma!1393
2019-07-10Merge branch 'fix/license-attribution' into 'develop'kaniini
Add license/copyright to all project files See merge request pleroma/pleroma!1394
2019-07-10Add license/copyright to all project filesfeld
2019-07-10Merge branch 'tests/mrf_policy' into 'develop'kaniini
tests MRF filters See merge request pleroma/pleroma!1379
2019-07-10tests MRF filtersMaksim
2019-07-10add listener port and ip option for 'pleroma.instance gen' and enable its testSachin Joshi
2019-07-09Merge branch '878-activity-object-decoupling-in-tests' into 'develop'rinpatch
[#878] Refactored assumptions on embedded object presence in tests Closes #878 See merge request pleroma/pleroma!1390
2019-07-09[#878] Tests improvements per code review.Ivan Tashkinov
2019-07-09[#878] Uncommented test statement.Ivan Tashkinov
2019-07-09[#878] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
878-activity-object-decoupling-in-tests # Conflicts: # lib/pleroma/object.ex # test/web/activity_pub/transmogrifier_test.exs # test/web/ostatus/ostatus_test.exs
2019-07-09Merge branch 'docs/more-mastodon-api' into 'develop'kaniini
Docs/more mastodon api See merge request pleroma/pleroma!1392
2019-07-09Docs/more mastodon apifeld
2019-07-09Merge branch 'feature/allow-user-query-via-id' into 'develop'kaniini
Admin API: Allow querying user by ID See merge request pleroma/pleroma!1380
2019-07-09Merge branch 'remove-avatar-header' into 'develop'kaniini
Ability to reset avatar, profile banner and backgroud See merge request pleroma/pleroma!1187
2019-07-09Merge branch 'develop' into feature/allow-user-query-via-idMark Felder
2019-07-09Merge branch 'fix/1019-correct-count-remote-users' into 'develop'kaniini
Fix/1019 correct count remote users Closes #1019 See merge request pleroma/pleroma!1376
2019-07-09Fix/1019 correct count remote usersAlexander Strizhakov
2019-07-09Merge branch 'remove-swift' into 'develop'kaniini
Remove Uploaders.Swift and `httpoison` dependency Closes #1051 See merge request pleroma/pleroma!1374
2019-07-09Merge branch 'test-coverage' into 'develop'kaniini
reverse proxy tests See merge request pleroma/pleroma!1385
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-10 15:09:14 +0000