kaniini
|
0f5bff8c66
|
Merge branch 'develop' into 'feature/relay'
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
|
2018-08-26 21:06:15 +00:00 |
|
William Pitcock
|
aab2bdddf4
|
twitter api: provide object descriptions as attachment description field
|
2018-08-25 00:12:58 +00:00 |
|
ensra
|
e883587cc3
|
this should be looking at the follower's bio, not the user's bio.
fixes test.
|
2018-08-21 15:25:21 +01:00 |
|
ensra
|
f533daffdb
|
sync bio sanitization code in tests
|
2018-08-21 15:24:06 +01:00 |
|
lambda
|
13440a80e1
|
Merge branch 'feature/invites' into 'develop'
Invites
Closes #108
See merge request pleroma/pleroma!208
|
2018-08-12 12:04:15 +00:00 |
|
eal
|
ed9738e031
|
Add tests for emoji in user profiles
Also use the correct field in TwitterAPI...
|
2018-08-08 09:24:50 +03:00 |
|
eal
|
cee63ad3f7
|
TwitterAPI user view: add screen_name_html and description_html.
|
2018-08-08 08:38:25 +03:00 |
|
William Pitcock
|
3026177206
|
test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed
|
2018-08-06 11:29:03 +00:00 |
|
William Pitcock
|
4fb64c1d86
|
testsuite: twitter api: add summary where necessary
|
2018-07-12 16:12:25 +00:00 |
|
lambda
|
fe4387077a
|
Merge branch 'feature/default-scope' into 'develop'
default scope setting
See merge request pleroma/pleroma!239
|
2018-07-12 05:59:12 +00:00 |
|
William Pitcock
|
66819ea784
|
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
|
2018-06-27 13:38:07 +00:00 |
|
William Pitcock
|
32211c4ada
|
tests: add default_scope where appropriate
|
2018-06-27 13:17:07 +00:00 |
|
Vivian Lim
|
6160a1b3c0
|
mix format
|
2018-06-24 15:24:41 -07:00 |
|
Vivian Lim
|
1299bccc7d
|
return unquoted empty array from /api/qvitter/mutes.json
|
2018-06-23 23:20:30 -07:00 |
|
Vivian Lim
|
6316003946
|
fixes- found that TwitterAPI.Controller adds .json suffix already
|
2018-06-23 23:05:54 -07:00 |
|
lambda
|
8c7fdcb31b
|
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
|
2018-06-14 07:19:36 +00:00 |
|
Francis Dinh
|
fc15f30a3c
|
fixup test
|
2018-06-13 21:45:27 -04:00 |
|
Francis Dinh
|
1555c66650
|
Add unretweet TwAPI endpoint and cleanup AP.unannounce
|
2018-06-13 21:33:36 -04:00 |
|
Henry Jameson
|
9c1cf1befb
|
formatting
|
2018-06-12 15:01:40 +03:00 |
|
Henry Jameson
|
f42ffbe9a8
|
Initial invites support + tests.
|
2018-06-12 14:55:16 +03:00 |
|
William Pitcock
|
c773f42ca4
|
tests: update twitterapi user view tests for new locked variable
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
f8e0942745
|
twitter api: add approve/deny endpoints
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
d116af3bee
|
tests: add tests for /api/pleroma/friend_requests
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
993312cdb3
|
twitterapi: add profile setting for locked/unlocked accounts
|
2018-06-11 22:15:53 +00:00 |
|
lain
|
0f70e83e8c
|
Better error handling in TwitterApiController.
|
2018-06-03 19:11:22 +02:00 |
|
eal
|
935e544e19
|
TwitterAPI: fix "Follows you" being shown for the wrong user.
|
2018-05-31 15:27:42 +03:00 |
|
William Pitcock
|
f569b67cda
|
tests: update for html changes
|
2018-05-27 13:03:34 +00:00 |
|
lambda
|
c2dcd767cf
|
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
|
2018-05-24 19:52:24 +00:00 |
|
lambda
|
c41012053a
|
Merge branch 'feature/change-password' into 'develop'
Feature/change password
See merge request pleroma/pleroma!166
|
2018-05-24 17:16:37 +00:00 |
|
Francis Dinh
|
72b93d13f8
|
Hook up block/unblock to TwitterAPI
|
2018-05-22 05:41:17 -04:00 |
|
Syldexia
|
d0690622cd
|
Added endpoint for changing passwords
|
2018-05-21 23:06:03 +01:00 |
|
Thog
|
e55c6f311b
|
Migrate to comeonin 4 and Cachex 3
Also fix some warning in the code and add a missing alias
|
2018-05-20 20:08:40 +02:00 |
|
lain
|
413de8e4bc
|
More fixes.
|
2018-05-20 19:26:09 +02:00 |
|
lain
|
ff007af0c2
|
Return visilility in twitter api, too.
|
2018-05-20 18:01:24 +02:00 |
|
Syldexia
|
d1366f8d46
|
Modified deleting an account to run as a task
|
2018-05-19 13:35:49 +01:00 |
|
Syldexia
|
5bfb7b4ce6
|
Moved account deletion stuff to somewhere that hopefully makes more sense
|
2018-05-13 14:36:02 +01:00 |
|
Syldexia
|
a16117225f
|
Added endpoint for user account deletion
|
2018-05-13 14:35:48 +01:00 |
|
Pierrick Brun
|
89603eda9e
|
do not create notification for yourself
|
2018-05-11 11:31:17 +02:00 |
|
lain
|
bc215f5684
|
Fix format.
|
2018-04-29 11:28:26 +02:00 |
|
Wim Vanderbauwhede
|
6908f29e0a
|
Added a test (written by @andrewzah) for the MR
|
2018-04-28 12:01:43 +01:00 |
|
lain
|
a61e8ac154
|
Formatting.
|
2018-04-20 13:10:57 +02:00 |
|
eal
|
fa37acfcc7
|
TwitterAPI: Add Qvitter notification endpoint.
|
2018-04-19 21:46:59 +03:00 |
|
lain
|
b3b7ab5d9a
|
Load all users at once in timelines.
|
2018-04-02 16:35:41 +02:00 |
|
lain
|
360c51f1f5
|
Use context_ids directly if we have them.
|
2018-04-02 15:28:35 +02:00 |
|
lain
|
a4db3a732f
|
Pre-fetch conversation ids.
|
2018-04-02 14:46:56 +02:00 |
|
lain
|
1b57522bba
|
Fix some test stuff.
|
2018-04-02 13:13:04 +02:00 |
|
lain
|
802736679c
|
Remove unused ActivityRepresenter module.
|
2018-03-30 16:50:30 +02:00 |
|
lain
|
e90f8f6c4b
|
TwApi ActivityView: Add delete activities.
|
2018-03-30 15:32:43 +02:00 |
|
lain
|
1f32ba052c
|
TwApi ActivityView: Add follows.
|
2018-03-30 15:17:13 +02:00 |
|
lain
|
4afbef39f4
|
Format the code.
|
2018-03-30 15:01:53 +02:00 |
|