Roman Chvanikov
|
d2da3d30f3
|
Merge branch 'develop' into feature/digest-email
|
2019-07-24 16:37:52 +03:00 |
|
Maxim Filippov
|
f46805bb40
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
2019-07-24 02:42:28 +03:00 |
|
Maksim
|
c49a09ed88
|
tests for Pleroma.Web.ActivityPub.Publisher
|
2019-07-23 19:15:48 +00:00 |
|
|
Maxim Filippov
|
14ab2fd0f4
|
remove pry
|
2019-07-23 12:30:37 +03:00 |
|
|
Roman Chvanikov
|
36049f08ef
|
Merge develop
|
2019-07-20 01:03:25 +03:00 |
|
|
Maxim Filippov
|
9570a5be40
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
2019-07-18 23:38:38 +03:00 |
|
|
Maksim
|
b6b748d3e7
|
tests for Uploader with webhook
|
2019-07-18 12:30:18 +00:00 |
|
|
Roman Chvanikov
|
c729883936
|
Merge branch 'develop' into feature/digest-email
|
2019-07-14 21:43:30 +03:00 |
|
Haelwenn (lanodan) Monnier
|
f00562ed6b
|
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
|
2019-07-14 13:55:41 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
efa9a13d4e
|
HttpRequestMock: Add missing mocks for object containment tests
|
2019-07-14 13:55:41 +02:00 |
|
|
Maxim Filippov
|
a9459ff98f
|
Admin API: Endpoint for fetching latest user's statuses
|
2019-07-14 00:37:26 +03:00 |
|
|
Roman Chvanikov
|
eae991b06a
|
merge develop
|
2019-07-12 18:08:27 +03: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 |
|
Alexander Strizhakov
|
a237c6a2d4
|
support for idna domains
|
2019-07-10 15:23:25 +00:00 |
|
|
Alex S
|
beba7bbc85
|
removing synchronization worker
|
2019-07-10 17:42:18 +03:00 |
|
Sergey Suprunenko
|
ff55e3c16f
|
Create mentions only for explicitly mentioned users
|
2019-07-10 13:29:50 +00: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 |
|
|
Roman Chvanikov
|
371d39e160
|
Merge develop
|
2019-07-09 21:21:09 +03:00 |
|
|
Alexander Strizhakov
|
d6b0fce6e9
|
Fix/1019 correct count remote users
|
2019-07-09 17:36:35 +00:00 |
|
kaniini
|
4948117fcf
|
Merge branch 'remove-swift' into 'develop'
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
|
2019-07-09 16:54:32 +00:00 |
|
|
Ivan Tashkinov
|
46cf81a544
|
[#878] Formatting fix.
|
2019-07-08 20:05:02 +03:00 |
|
|
Ivan Tashkinov
|
daff85a985
|
[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
|
2019-07-08 19:53:02 +03:00 |
|
|
Maksim
|
6dadf5d6f4
|
[#1043] fix search accounts.
|
2019-07-05 04:22:08 +00:00 |
|
Egor Kislitsyn
|
11143c542a
|
Remove httpoison from dependencies
|
2019-07-03 14:42:24 +07:00 |
|
|
Roman Chvanikov
|
657277ffc0
|
Resolve conflicts
|
2019-06-29 00:52:50 +03:00 |
|
|
Maksim Pechnikov
|
4ad15ad2a9
|
add ignore hosts and TLDs for rich_media
|
2019-06-25 22:25:37 +03:00 |
|
|
Alex S
|
982cad0268
|
support for config groups
|
2019-06-23 08:16:16 +03:00 |
|
|
Alex S
|
0f59265a50
|
salmon fix
removed some ownership sandbox error
|
2019-06-16 20:10:12 +08:00 |
|
|
Alexander Strizhakov
|
c2ca1f22a2
|
it is changed in compile time
we can't change module attributes and endpoint settings in runtime
|
2019-06-14 15:45:05 +00:00 |
|
Roman Chvanikov
|
b1b1a270e8
|
Fix conflict
|
2019-06-05 02:45:21 +03:00 |
|
|
Sergey Suprunenko
|
84cc131b59
|
Add missing HTTP Request mocks
|
2019-06-04 05:46:19 +00:00 |
|
Mark Felder
|
6ef145b4fc
|
Merge branch 'develop' into feature/digest-email
|
2019-06-03 15:29:53 -05:00 |
|
rinpatch
|
65db5e9f52
|
Resolve merge conflicts
|
2019-06-01 16:29:58 +03:00 |
|
|
Sergey Suprunenko
|
1690be991e
|
Replace missing non-nullable Card attributes with empty strings
|
2019-05-30 21:03:31 +00:00 |
|
Roman Chvanikov
|
ce47017c89
|
Merge develop
|
2019-05-29 18:18:22 +03:00 |
|
William Pitcock
|
56fd7dbdd7
|
remove @websub and @ostatus module-level constants
|
2019-05-25 04:43:11 +00:00 |
|
|
rinpatch
|
5ece901af3
|
Resolve merge conflicts and remove IO.inspects
|
2019-05-18 13:37:38 +03:00 |
|
|
Alexander Strizhakov
|
7ed682213f
|
Fix/902 random compile failing
|
2019-05-17 07:25:20 +00:00 |
|
|
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
2019-05-16 19:09:18 +00:00 |
|
|
rinpatch
|
62e42b03ab
|
Handle incoming Question objects
|
2019-05-15 20:10:16 +03:00 |
|
|
Roman Chvanikov
|
b6b5b16ba4
|
Merge develop
|
2019-05-08 17:08:06 +07:00 |
|
lain
|
45f790becc
|
Merge remote-tracking branch 'origin/develop' into conversations_three
|
2019-05-01 18:40:41 +02:00 |
|
|
Roman Chvanikov
|
bc7862106d
|
Fix tests
|
2019-04-19 23:26:41 +07:00 |
|
|
lain
|
64c1c3a407
|
Participations: Add marking as read and unread.
|
2019-04-10 15:12:01 +02:00 |
|
|
lain
|
d1da6b155a
|
Conversation: Add Conversations and Participations.
|
2019-04-10 15:01:42 +02:00 |
|
|
lambda
|
e5d553aa45
|
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
|
2019-04-10 10:10:08 +00:00 |
|
|
Ivan Tashkinov
|
bffddf5e31
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
2019-04-08 12:20:26 +03:00 |
|
eugenijm
|
fc92a0fd8d
|
Added limits and media attachments for scheduled activities.
|
2019-04-06 23:55:58 +03:00 |
|
|
eugenijm
|
7bf622ce73
|
Add scheduled activities
|
2019-04-06 23:55:58 +03:00 |
|
|
Alex S
|
be54e40890
|
twitter api registration
fix for twitter api tests
|
2019-04-06 17:18:59 +07:00 |
|