sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
5,814 Commits 136 Branches 24 Tags 254 MiB
Commit Graph

5814 Commits

Author SHA1 Message Date
lain 9ff32999f5 Tests: Run the daemon 2019-07-22 16:32:50 +02:00
lain d7a6d1ce7e CI: Add testing stage for federated tests. 2019-07-22 16:18:37 +02:00
lain cb9c94d712 Tests: Don't run federated tests by default 2019-07-22 16:17:18 +02:00
lain 38d6c43d1a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fed-tests 2019-07-12 18:34:39 +09:00
Chris McCord 5a69af8cf7 Add federated test infrastructure 2019-07-12 18:26:02 +09:00
kaniini db75288b71 Merge branch 'search-limit-offset-type' into 'develop' 
Add account_id, type, limit, and offset to GET /api/v1/search and /api/v2/search

See merge request pleroma/pleroma!1386
 2019-07-11 13:55:31 +00:00
Eugenij 4198c3ac39 Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel 2019-07-11 13:55:31 +00:00
kaniini 4d382d1347 Merge branch 'admin-configure' into 'develop' 
admin api configure changes

See merge request pleroma/pleroma!1345
 2019-07-11 13:02:13 +00:00
Alexander Strizhakov 846ad9a463 admin api configure changes 2019-07-11 13:02:13 +00:00
kaniini e4e3fd7e55 Merge branch 'fix/1019-refactor' into 'develop' 
Fix/1019 refactor

See merge request pleroma/pleroma!1397
 2019-07-11 13:01:11 +00:00
kaniini 6c491b2006 Merge branch 'chore/mailmap' into 'develop' 
add mailmap [ci skip]

See merge request pleroma/pleroma!1399
 2019-07-11 09:03:17 +00:00
Ariadne Conill 347a1823fd add mailmap [ci skip] 2019-07-11 08:57:51 +00:00
Alex S 59e16fc45a enable synchronization by default 2019-07-10 18:55:11 +03:00
kaniini 4016341a77 Merge branch 'fix/1005-idna-domains' into 'develop' 
support for idna domains

Closes #1005

See merge request pleroma/pleroma!1330
 2019-07-10 15:23:25 +00:00
Alexander Strizhakov a237c6a2d4 support for idna domains 2019-07-10 15:23:25 +00:00
Haelwenn 3ff4a06ebe Merge branch 'features/mastoapi-emoji-categories' into 'develop' 
MastoAPI: Add categories to custom emojis

See merge request pleroma/pleroma!1365
 2019-07-10 15:07:37 +00:00
Haelwenn (lanodan) Monnier 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.
 2019-07-10 17:02:37 +02:00
Alex S beba7bbc85 removing synchronization worker 2019-07-10 17:42:18 +03:00
Alex S ade213cb35 robots txt test fix 2019-07-10 17:42:18 +03:00
Alex S 936050257d saving following_address for existing users 2019-07-10 17:42:18 +03:00
Alex S f8786fa6f2 adding following_address field to user 2019-07-10 17:42:18 +03:00
kaniini 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
 2019-07-10 13:29:50 +00:00
Sergey Suprunenko ff55e3c16f Create mentions only for explicitly mentioned users 2019-07-10 13:29:50 +00:00
kaniini f295b9fba9 Merge branch 'localization' into 'develop' 
Error Localization

See merge request pleroma/pleroma!1396
 2019-07-10 13:27:59 +00:00
Egor Kislitsyn ed8ce21a22 Fix unused import warning 2019-07-10 18:10:09 +07:00
Egor Kislitsyn 406efb3688 Add Russian translation 2019-07-10 18:10:09 +07:00
Egor Kislitsyn a42da8f311 Fix response 2019-07-10 18:10:09 +07:00
Egor Kislitsyn c2a589d9a3 Fix credo warning 2019-07-10 18:10:09 +07:00
Egor Kislitsyn 5104f65b69 Wrap error messages into gettext helpers 2019-07-10 18:10:09 +07:00
Egor Kislitsyn 26a6871609 Add translation helpers 2019-07-10 18:10:09 +07:00
Egor Kislitsyn 663aebdd59 Update `gettext` dependency 2019-07-10 18:10:09 +07:00
Egor Kislitsyn 0d54a571ca Add SetLocalePlug 2019-07-10 18:08:03 +07:00
kaniini 42422f3ff2 Merge branch 'tests/web/mastodon_api/search_controller' into 'develop' 
add test for search_controller/ 100% coverage

See merge request pleroma/pleroma!1377
 2019-07-10 08:28:03 +00:00
Maksim 008c55e4e9 add test for search_controller/ 100% coverage 2019-07-10 08:28:03 +00:00
rinpatch 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
 2019-07-10 08:18:12 +00:00
rinpatch e2782c342f Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance 2019-07-10 11:09:55 +03:00
kaniini d91231f0be Merge branch 'feature/disable_send_emails' into 'develop' 
[#1062] added option to disable send email

See merge request pleroma/pleroma!1389
 2019-07-10 05:34:21 +00:00
Maksim 12b1454245 [#1062] added option to disable send email 2019-07-10 05:34:21 +00:00
kaniini 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
 2019-07-10 05:16:08 +00:00
Sergey Suprunenko 2d2b50ccca Send and handle "Delete" activity for deleted users 2019-07-10 05:16:08 +00:00
kaniini 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
 2019-07-10 05:14:08 +00:00
kaniini 8f2cb820c0 Merge branch 'fix/license-attribution' into 'develop' 
Add license/copyright to all project files

See merge request pleroma/pleroma!1394
 2019-07-10 05:13:23 +00:00
feld 93a0eeab16 Add license/copyright to all project files 2019-07-10 05:13:23 +00:00
kaniini 37b0bd0d86 Merge branch 'tests/mrf_policy' into 'develop' 
tests MRF filters

See merge request pleroma/pleroma!1379
 2019-07-10 05:12:21 +00:00
Maksim bb8065a1fd tests MRF filters 2019-07-10 05:12:21 +00:00
Sachin Joshi 6d0ae264fc add listener port and ip option for 'pleroma.instance gen' and enable its test 2019-07-10 01:46:49 +05:45
rinpatch 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
 2019-07-09 20:00:37 +00:00
Ivan Tashkinov 8a41d34673 [#878] Tests improvements per code review. 2019-07-09 22:37:59 +03:00
Ivan Tashkinov 6fc0c27be3 [#878] Uncommented test statement. 2019-07-09 22:28:04 +03:00
Ivan Tashkinov 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
 2019-07-09 21:46:16 +03:00