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 |
|
lain
|
c1d529ee94
|
TwApi ActivityView: Add announces.
|
2018-03-30 14:46:36 +02:00 |
|
lain
|
1f1caab138
|
TwApi ActivityView: Add Like rendering.
|
2018-03-30 13:49:09 +02:00 |
|
lain
|
361016349f
|
Add ActivityViewTest.
|
2018-03-30 12:57:55 +02:00 |
|
lain
|
e30752bc79
|
Add basic activity view.
|
2018-03-27 22:24:19 +02:00 |
|
Francis Dinh
|
9556c8f6e7
|
Forgot to fix one of the links in a test
|
2018-03-27 02:08:46 -04:00 |
|
Francis Dinh
|
5ba2f4b6d8
|
Update tests to reflect hashtag link changes
|
2018-03-27 02:07:07 -04:00 |
|
lain
|
eb7ce61ca5
|
Fix hashtags.
|
2018-03-24 11:03:10 +01:00 |
|
lain
|
8a47974217
|
Fix specs.
|
2018-02-25 18:11:03 +01:00 |
|
lain
|
4ea2a41014
|
Fix more specs.
|
2018-02-25 17:48:31 +01:00 |
|
lain
|
94db9ac4db
|
Merge branch 'develop' into feature/activitypub
|
2018-02-21 18:34:19 +01:00 |
|
lain
|
5bc810c452
|
Add moderator function.
|
2018-02-20 18:44:50 +01:00 |
|
lain
|
b331cb449a
|
Merge branch 'develop' into feature/activitypub
|
2018-02-12 10:24:15 +01:00 |
|
lain
|
26ccb768d3
|
Make test output easier to read.
|
2018-02-12 10:14:11 +01:00 |
|
lain
|
33a5d0a238
|
Fix some test warnings.
|
2018-02-12 09:33:01 +01:00 |
|
lain
|
ce31f3a922
|
Twitter Representers: Handle Mastodon attachments.
|
2018-02-11 17:21:06 +01:00 |
|
lambda
|
61c16193de
|
Merge branch 'move-backend-images' into 'develop'
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
|
2018-02-03 13:05:20 +00:00 |
|
Hakaba Hitoyo
|
ea6d1b2b17
|
move avi.png & banner.png from /priv/static/static to /priv/static/images
|
2018-02-03 20:43:14 +09:00 |
|
eal
|
ab83e0de6d
|
TwitterAPI: Add is_local to user view.
|
2018-02-01 21:41:19 +02:00 |
|
eal
|
b3e7d7ae6d
|
Fetch external profile in the background.
|
2018-01-16 15:31:03 +02:00 |
|
eal
|
14b086eec2
|
Add a default profile picture and banner.
This removes the placehold.it dependency.
|
2018-01-15 22:18:17 +02:00 |
|
eal
|
1969773fb4
|
Fix follower/following lists.
Add tests.
|
2017-12-18 16:37:26 +02:00 |
|
eal
|
9223038319
|
Fix some more tests.
|
2017-12-11 21:01:36 +02:00 |
|
eal
|
79b3397c17
|
Fix tests.
|
2017-12-11 18:41:03 +02:00 |
|
Lain Iwakura
|
e7c2472abd
|
Fix tests.
|
2017-12-05 12:18:04 +01:00 |
|
eal
|
3d29fc5462
|
Make /api/friends/ids test deterministic.
|
2017-11-20 19:16:43 +02:00 |
|
Roger Braun
|
747a68a075
|
Treat internal emoji like external.
|
2017-11-20 17:53:21 +01:00 |
|
eal
|
edc3e5bc30
|
Make users in tests follow themselves by default.
Also fix the semantics of all tests to match.
|
2017-11-20 07:52:02 +02:00 |
|
Roger Braun
|
40ca379357
|
Fix flakey test.
|
2017-11-19 13:07:29 +01:00 |
|
eal
|
fb118b2978
|
Don't insert newlines to generated HTML.
MastoFE doesn't like them.
|
2017-11-18 14:46:54 +02:00 |
|
eal
|
66e78c3ec4
|
Escape HTML instead of discarding it.
|
2017-11-18 14:43:41 +02:00 |
|
lambda
|
1cca544e20
|
Merge branch 'twitterapi-bitlbee' into 'develop'
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
|
2017-11-14 16:47:54 +00:00 |
|
eal
|
f9828e578c
|
TwitterAPI: Add /users/show.
|
2017-11-14 17:34:48 +02:00 |
|
eal
|
3533bf7eac
|
TwitterAPI: Add /friends/ids.
|
2017-11-14 16:04:58 +02:00 |
|
eal
|
f7fc048aeb
|
TwitterAPI user view: add follows_you.
|
2017-11-08 19:13:03 +02:00 |
|
eal
|
4656cb9b99
|
TwitterAPI user view: add blocks.
|
2017-11-08 13:02:00 +02:00 |
|
eal
|
6c0758e041
|
TwitterAPI: Add blocks.
|
2017-11-08 00:04:53 +02:00 |
|
eal
|
f85566324e
|
Allow profile fetching for authenticated users only.
|
2017-11-07 00:33:44 +02:00 |
|
Roger Braun
|
0c871e5c6e
|
Fix specs.
|
2017-10-31 17:57:26 +01:00 |
|
Roger Braun
|
04217f52c9
|
TwitterAPI: Display cws.
|
2017-10-31 17:43:37 +01:00 |
|
Roger Braun
|
6d5bd4dcc0
|
TwitterAPI: Use correct endpoint for tag timeline.
|
2017-09-17 13:03:46 +02:00 |
|
Roger Braun
|
255a681782
|
TwitterAPI: Add tag timeline.
|
2017-09-17 11:45:16 +02:00 |
|
Roger Braun
|
959e993c7d
|
Apply incoming custom emoji.
|
2017-09-16 16:40:20 +02:00 |
|
Roger Braun
|
5d1f8dcd1c
|
TwitterAPI: Add search.
|
2017-09-16 14:33:47 +02:00 |
|
Roger Braun
|
50409326a8
|
Refactor posting and make character limit configurable.
|
2017-09-15 14:17:36 +02:00 |
|
Roger Braun
|
d625d8db7d
|
Add unfav to Mastodon API.
|
2017-09-09 18:30:02 +02:00 |
|
Roger Braun
|
454dc18570
|
Add favoriting to Mastodon API.
|
2017-09-09 18:09:37 +02:00 |
|
Roger Braun
|
66e4c710d4
|
Add reblogging to MastodonAPI.
|
2017-09-09 17:48:57 +02:00 |
|
Roger Braun
|
d1c10ad2fb
|
Fix specs.
|
2017-09-05 09:35:00 +02:00 |
|
Roger Braun
|
fcf3128a56
|
Add TwAPI representer for deletes.
|
2017-09-04 20:03:28 +02:00 |
|
Roger Braun
|
4b03c43fd7
|
fix specs.
|
2017-08-29 17:22:22 +02:00 |
|
Roger Braun
|
5142a8efbb
|
Add profile update.
|
2017-08-29 15:14:00 +02:00 |
|
Roger Braun
|
171ef33cbb
|
More sensible attachment names.
|
2017-08-28 19:17:38 +02:00 |
|
Roger Braun
|
67bfa19b35
|
Set twitter-style possibly_sensitive boolena.
|
2017-08-24 16:27:37 +02:00 |
|
Roger Braun
|
5dc278b1a6
|
Add activity_type to twitter api output.
|
2017-08-24 16:18:26 +02:00 |
|
Roger Braun
|
7d34cec58d
|
escape attachment urls on creation.
|
2017-08-09 16:55:18 +02:00 |
|
Roger Braun
|
00b722430f
|
Revert "Close br tags."
This reverts commit 2eba8e74cc.
|
2017-07-31 13:27:38 +02:00 |
|
Roger Braun
|
19e8421947
|
Revert "Wrap in <p>."
This reverts commit c81d0b6f89.
|
2017-07-31 13:27:29 +02:00 |
|
Roger Braun
|
3063e3b440
|
Revert "Remove newlines completely so mastodon doesn't bug out."
This reverts commit 0ca3ab7b59.
|
2017-07-31 13:27:19 +02:00 |
|
Roger Braun
|
0ca3ab7b59
|
Remove newlines completely so mastodon doesn't bug out.
|
2017-07-31 13:06:31 +02:00 |
|
Roger Braun
|
c81d0b6f89
|
Wrap in <p>.
|
2017-07-31 12:16:44 +02:00 |
|
Roger Braun
|
2eba8e74cc
|
Close br tags.
|
2017-07-31 10:46:29 +02:00 |
|
Roger Braun
|
72ca58c540
|
Save follower count and note count in user.
|
2017-07-22 17:42:15 +02:00 |
|
Roger Braun
|
a027b0027c
|
Add friends endpoint.
|
2017-07-20 20:35:30 +02:00 |
|
Roger Braun
|
94a394e3a8
|
Add followers endpoint.
|
2017-07-20 20:29:15 +02:00 |
|
Roger Braun
|
140f72725d
|
Use follower address in user entry.
|
2017-07-19 19:06:49 +02:00 |
|
Roger Braun
|
7e9647b146
|
Fix undo activity.
|
2017-07-08 11:17:35 +02:00 |
|
Roger Braun
|
e343c0c9c4
|
Add way to update most recent notification id.
|
2017-07-02 15:01:59 +02:00 |
|
Roger Braun
|
201804b836
|
Only return posts in TwAPI conversations.
|
2017-06-30 16:41:09 +02:00 |
|
Roger Braun
|
d4de38e8ff
|
Order conversation fetches like GS does.
|
2017-06-30 16:30:19 +02:00 |
|
Roger Braun
|
1c074efeaf
|
Add external links to twapi.
|
2017-06-25 12:07:08 +02:00 |
|
dtluna
|
069daf644d
|
Replace UserRepresenter with UserView
|
2017-06-20 00:12:37 +03:00 |
|
Roger Braun
|
fa82822932
|
Revert "Add invisible tags to TwAPI output."
This reverts commit a92a9dce94.
|
2017-06-18 18:59:13 +02:00 |
|
Roger Braun
|
d00571ff75
|
Fetch user feed on externalprofile request.
This is so we always have something to show.
|
2017-06-18 17:20:39 +02:00 |
|
Roger Braun
|
fafb765c48
|
Output tags list in TwAPI.
|
2017-06-18 14:43:44 +02:00 |
|
Roger Braun
|
8feec8d390
|
Strip unsafe html on output in TwAPI.
|
2017-06-18 13:40:35 +02:00 |
|
Roger Braun
|
7b41e103e1
|
Remove html from user bios on display.
This is mainly to fix problems of bios coming from mastodong.
|
2017-06-18 13:17:35 +02:00 |
|
Roger Braun
|
83c657afa5
|
Do some basic escaping.
|
2017-06-14 14:46:18 +02:00 |
|
Roger Braun
|
1af9c77736
|
Move mention parsing to Formatter module.
|
2017-06-14 13:58:56 +02:00 |
|
Roger Braun
|
eb18b9ebba
|
Enable user timelines.
|
2017-06-12 17:12:55 +02:00 |
|
Roger Braun
|
00c032783d
|
Fix NaN statuses per day.
|
2017-06-05 15:47:37 +02:00 |
|
Roger Braun
|
c6aa60c829
|
Shorten names in links.
|
2017-05-30 14:26:31 +02:00 |
|
Roger Braun
|
48f9df2391
|
Keep newlines around.
|
2017-05-18 16:41:16 +02:00 |
|
Roger Braun
|
a92a9dce94
|
Add invisible tags to TwAPI output.
|
2017-05-18 16:24:41 +02:00 |
|
Roger Braun
|
0da6ade619
|
Save tags in object.
|
2017-05-18 15:16:49 +02:00 |
|
Roger Braun
|
9033bfffd2
|
Twitter API refactoring.
|
2017-05-17 18:00:20 +02:00 |
|
Roger Braun
|
423194520e
|
Fix mention replacing.
|
2017-05-15 18:25:21 +02:00 |
|
Roger Braun
|
36448d6483
|
Add externalprofile to TwAPI.
|
2017-05-10 18:44:57 +02:00 |
|
Roger Braun
|
1418d72749
|
Add class=attachment to attachment links.
|
2017-05-08 20:12:36 +02:00 |
|
Roger Braun
|
7303786160
|
Add some twapi fixes.
|
2017-05-07 20:20:53 +02:00 |
|
Roger Braun
|
b403ea4d2b
|
Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity
|
2017-05-07 19:28:23 +02:00 |
|
Roger Braun
|
95ab0dc3c5
|
Add conversation ids to twapi announce representer.
|
2017-05-07 12:46:21 +02:00 |
|
Roger Braun
|
33c803d6da
|
Add attachment link to posts.
|
2017-05-02 18:25:39 +02:00 |
|
Roger Braun
|
16f8406eb6
|
Add statusnet_profile_url to the TwAPI.
|
2017-05-02 14:36:04 +02:00 |
|
Roger Braun
|
32a95d73da
|
Add twkn timeline.
|
2017-05-02 14:12:43 +02:00 |
|
Roger Braun
|
56bacc90d1
|
Fix specs, add local marker to actitivies.
|
2017-05-02 10:43:35 +02:00 |
|
Roger Braun
|
09f7ed4214
|
Don't set statusnetConversationIds on replies anymore.
|
2017-04-30 14:26:29 +02:00 |
|
Roger Braun
|
009fcd2acf
|
Stop adding statusnetConversationIds.
|
2017-04-30 14:02:04 +02:00 |
|
Roger Braun
|
4c8111c334
|
Use conversation mapping objects to get / retrieve context from TwAPI.
|
2017-04-30 13:53:26 +02:00 |
|
Roger Braun
|
22e936372e
|
Fix retweet spec.
|
2017-04-26 08:55:00 +02:00 |
|
dtluna
|
42105497ca
|
Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
|
2017-04-24 14:17:23 +03:00 |
|
dtluna
|
5b6070ec40
|
Deny whitespace statuses
|
2017-04-24 12:09:11 +03:00 |
|
dtluna
|
f723b23691
|
Add error response to self-repeats
|
2017-04-24 01:11:38 +03:00 |
|
dtluna
|
6b6bc9435c
|
Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
|
2017-04-24 01:05:02 +03:00 |
|
dtluna
|
1e3791877c
|
Add error response on empty status
|
2017-04-23 19:08:25 +03:00 |
|
dtluna
|
a9b3f99d48
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-name
|
2017-04-21 18:36:03 +03:00 |
|
Roger Braun
|
1e88f102c4
|
Fix specs, add some user info.
|
2017-04-21 00:51:09 +02:00 |
|
dtluna
|
3a56d7318f
|
Add statuses/mentions endpoint
|
2017-04-20 15:18:54 +03:00 |
|
dtluna
|
01901d9835
|
Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
|
2017-04-20 10:46:27 +03:00 |
|
dtluna
|
d952b6cd7b
|
Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
|
2017-04-20 10:39:18 +03:00 |
|
lambadalambda
|
eda742c78b
|
Merge branch 'feature/user-timeline' into 'develop'
Feature/user timeline
See merge request !8
|
2017-04-19 05:50:24 -04:00 |
|
dtluna
|
470f5f7cd6
|
Add user timeline spec test
|
2017-04-17 16:31:19 +03:00 |
|
lambadalambda
|
ac9817bdb0
|
Merge branch 'bugfix/repeated-follow-unfollow' into 'develop'
Add error messages for repeated follows and unfollows
See merge request !7
|
2017-04-17 05:46:59 -04:00 |
|
Roger Braun
|
6a0e69a8a3
|
Fix syntax error.
|
2017-04-17 11:43:44 +02:00 |
|
Roger Braun
|
a185ea63af
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
|
2017-04-17 11:37:21 +02:00 |
|
Roger Braun
|
6bfd521974
|
Switch cache implementation for size limiting.
|
2017-04-17 11:36:17 +02:00 |
|
dtluna
|
369be708b2
|
Remove unnecesary queries
|
2017-04-16 17:42:15 +03:00 |
|
dtluna
|
f6e632d25b
|
Remove unnecesary asserts
|
2017-04-16 17:39:34 +03:00 |
|
dtluna
|
ef5033d7a7
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
|
2017-04-16 17:18:34 +03:00 |
|
dtluna
|
f6547f7b7f
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
|
2017-04-16 17:13:42 +03:00 |
|
dtluna
|
82914e1e4d
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
|
2017-04-16 17:12:28 +03:00 |
|
dtluna
|
85bd480be3
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
|
2017-04-16 17:10:25 +03:00 |
|
dtluna
|
5229b01944
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
|
2017-04-16 17:08:17 +03:00 |
|
Roger Braun
|
eb9358c8d6
|
Add basic Avatar updating code.
|
2017-04-16 16:06:19 +02:00 |
|
dtluna
|
63f04b314d
|
Fix typo
|
2017-04-16 17:05:48 +03:00 |
|
dtluna
|
4b4ece2c74
|
Add user timeline fetching without credentials
|
2017-04-16 16:44:30 +03:00 |
|
Roger Braun
|
03a9c11d25
|
Display the users avatar if he has one set.
|
2017-04-16 15:40:50 +02:00 |
|
Roger Braun
|
d7e3b72c6a
|
Add avatar objects to user, fix specs.
|
2017-04-16 15:28:28 +02:00 |
|
dtluna
|
7a0046d127
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
|
2017-04-16 13:32:56 +03:00 |