Roger Braun
|
266d9c008d
|
MastoAPI: Fetch statuses in search.
|
2017-11-09 16:48:45 +01:00 |
|
lambda
|
2247d7580e
|
Merge branch 'fix-tootdon-image-uploads' into 'develop'
Correct mimetype on bad uploads.
See merge request pleroma/pleroma!12
|
2017-11-09 14:41:44 +00:00 |
|
Roger Braun
|
ccde03285d
|
add sort index for activities
|
2017-11-09 15:16:10 +01:00 |
|
eal
|
e942e1e552
|
Correct mimetype on bad uploads.
|
2017-11-09 15:01:59 +02:00 |
|
Roger Braun
|
9e60de695d
|
Fix migration for empty db.
|
2017-11-09 13:45:17 +01:00 |
|
Roger Braun
|
6bf261589f
|
Update activities in own migration.
|
2017-11-09 13:32:53 +01:00 |
|
Roger Braun
|
20b8b87743
|
Update in chunks.
|
2017-11-09 12:33:38 +01:00 |
|
Roger Braun
|
f1d27a5fbb
|
Add actor column to activities.
|
2017-11-09 10:41:19 +01:00 |
|
Roger Braun
|
41b8a76e96
|
Re-fetch user data on salmon decode error.
|
2017-11-09 08:32:54 +01:00 |
|
lambda
|
77e272df2d
|
Merge branch 'following-you-in-user-view' into 'develop'
TwitterAPI user view: add follows_you.
See merge request pleroma/pleroma!11
|
2017-11-08 17:57:13 +00:00 |
|
eal
|
f7fc048aeb
|
TwitterAPI user view: add follows_you.
|
2017-11-08 19:13:03 +02:00 |
|
Roger Braun
|
d2430d5007
|
Look through whole db for user timelines.
They already have an index that's good enough.
|
2017-11-08 17:25:18 +01:00 |
|
Roger Braun
|
36557155af
|
Update frontend.
|
2017-11-08 16:16:29 +01:00 |
|
lambda
|
8bbbfd72aa
|
Merge branch 'blocks-in-user-view' into 'develop'
TwitterAPI user view: add blocks.
See merge request pleroma/pleroma!10
|
2017-11-08 13:39:02 +00:00 |
|
eal
|
4656cb9b99
|
TwitterAPI user view: add blocks.
|
2017-11-08 13:02:00 +02:00 |
|
lambda
|
3bbefd0a1e
|
Merge branch 'twitter-api-blocks' into 'develop'
TwitterAPI: Add blocks.
See merge request pleroma/pleroma!9
|
2017-11-08 10:35:23 +00:00 |
|
eal
|
6c0758e041
|
TwitterAPI: Add blocks.
|
2017-11-08 00:04:53 +02:00 |
|
lambda
|
be67db5547
|
Merge branch 'mastodon-emoji-endpoint' into 'develop'
Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8
|
2017-11-07 20:01:15 +00:00 |
|
eal
|
c6210183e1
|
Add mastodon API endpoint for custom emoji.
|
2017-11-07 21:55:01 +02:00 |
|
lambda
|
d761b1543a
|
Merge branch 'authenticated-profile-fetching' into 'develop'
Allow profile fetching for authenticated users only.
Closes #54
See merge request pleroma/pleroma!7
|
2017-11-07 18:58:22 +00:00 |
|
Roger Braun
|
f801b695d7
|
Update frontend.
|
2017-11-07 18:33:06 +01:00 |
|
Roger Braun
|
abfcf93dfc
|
Update fronted.
|
2017-11-07 18:27:08 +01:00 |
|
Roger Braun
|
722c4614ad
|
Allow self-rt.
|
2017-11-07 16:45:27 +01:00 |
|
Roger Braun
|
7da978f3f5
|
Linkify fixes.
|
2017-11-07 12:06:37 +01:00 |
|
Roger Braun
|
6dfa62800a
|
Revert "Longer timeouts for user fetching."
Breaks too many tests.
This reverts commit 7de3a65214.
|
2017-11-07 09:41:35 +01:00 |
|
Roger Braun
|
7de3a65214
|
Longer timeouts for user fetching.
|
2017-11-07 09:11:19 +01:00 |
|
eal
|
f85566324e
|
Allow profile fetching for authenticated users only.
|
2017-11-07 00:33:44 +02:00 |
|
lambda
|
ed1eb5deea
|
Merge branch 'fix-tootdon-oauth' into 'develop'
Fix tootdon logins.
See merge request pleroma/pleroma!6
|
2017-11-06 20:27:31 +00:00 |
|
eal
|
d1c126ac98
|
Update README.
|
2017-11-06 22:22:36 +02:00 |
|
eal
|
b0e27b21dd
|
Fix tootdon logins.
|
2017-11-06 21:51:31 +02:00 |
|
Roger Braun
|
7252f6b054
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2017-11-05 12:12:19 +01:00 |
|
Roger Braun
|
046bee34d3
|
Fix bug when no posts are in the db.
|
2017-11-05 12:11:59 +01:00 |
|
lambda
|
fa1f11e8e9
|
Merge branch 'feature/blocks' into 'develop'
Feature/blocks
See merge request pleroma/pleroma!5
|
2017-11-03 08:56:44 +00:00 |
|
Roger Braun
|
c6b9b777da
|
MastoAPI: Add list of blocked users.
|
2017-11-03 08:51:17 +01:00 |
|
Roger Braun
|
5bf92e50be
|
MastoAPI: Add blocking.
|
2017-11-03 08:38:05 +01:00 |
|
Roger Braun
|
33beb51da4
|
MastoAPI: Add blocking to AccountView.
|
2017-11-03 08:23:31 +01:00 |
|
Roger Braun
|
8a1a7191fd
|
MastoAPI: Fix mentions always being for an anonymous user.
|
2017-11-03 08:13:39 +01:00 |
|
Roger Braun
|
9b63647aff
|
MastoApi: Add blocking to fetches.
|
2017-11-02 22:53:34 +01:00 |
|
Roger Braun
|
d89a7a0b34
|
TwitterAPI: Add blocking to fetches.
|
2017-11-02 22:50:42 +01:00 |
|
Roger Braun
|
867ac1e4f5
|
Handle nil cases.
|
2017-11-02 22:47:48 +01:00 |
|
Roger Braun
|
8ef58a266b
|
Don't return blocked users' activities in contexts.
|
2017-11-02 22:44:36 +01:00 |
|
Roger Braun
|
a47727adde
|
Don't return activities from blocked users.
|
2017-11-02 22:37:26 +01:00 |
|
Roger Braun
|
632da6c927
|
Don't create notifications if the user is blocked.
|
2017-11-02 22:08:22 +01:00 |
|
Roger Braun
|
6a5f087174
|
Add blocks to User.
|
2017-11-02 21:57:37 +01:00 |
|
Roger Braun
|
345ad870f7
|
Clean up user_test.exs.
|
2017-11-02 21:57:21 +01:00 |
|
Roger Braun
|
9554436d61
|
update gitlab ci
|
2017-11-02 17:52:53 +01:00 |
|
Roger Braun
|
5794558077
|
Read variable for testing db.
|
2017-11-02 17:45:33 +01:00 |
|
lambda
|
32e1e52bd8
|
Update .gitlab-ci.yml
|
2017-11-02 16:33:05 +00:00 |
|
lambda
|
520cc0c80f
|
Update .gitlab-ci.yml
|
2017-11-02 16:31:03 +00:00 |
|
lambda
|
41425fd64a
|
Update .gitlab-ci.yml
|
2017-11-02 16:28:38 +00:00 |
|