lambda
|
567359790e
|
Merge branch 'testfix/webfinger-jrd' into 'develop'
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554
|
2018-12-17 09:19:27 +00:00 |
eal
|
28478a9c4f
|
Merge branch 'fix/masto-put-settings' into 'develop'
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
|
2018-12-16 11:21:26 +00:00 |
eal
|
4c783e35c0
|
Mastodon API: Fix PUT /api/web/settings
|
2018-12-16 13:15:34 +02:00 |
Haelwenn (lanodan) Monnier
|
cddab5700b
|
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
|
2018-12-15 17:56:12 +01:00 |
Haelwenn (lanodan) Monnier
|
5af91020f8
|
Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints
|
2018-12-15 16:17:44 +01:00 |
href
|
e74f384b68
|
Merge branch 'fix/issue_433' into 'develop'
[#433] fix markdown formatting
See merge request pleroma/pleroma!545
|
2018-12-14 20:30:35 +00:00 |
href
|
bfe27c1b55
|
Merge branch '114_email_invites' into 'develop'
[#114] Email invites
See merge request pleroma/pleroma!541
|
2018-12-14 20:22:24 +00:00 |
Maksim Pechnikov
|
ea72ac549b
|
fix case when tags is invalid
|
2018-12-14 23:16:12 +03:00 |
Maksim Pechnikov
|
d3ec09bb38
|
fix tags
|
2018-12-14 22:09:04 +03:00 |
Maksim Pechnikov
|
baead4ea4b
|
fix markdown formatting
|
2018-12-14 16:03:58 +03:00 |
Ivan Tashkinov
|
07e93f9940
|
[#114] Improved tests.
|
2018-12-14 13:52:04 +03:00 |
Ivan Tashkinov
|
a89e3b4b60
|
[#114] Moved email_invite action to AdminAPIController, adjusted tests.
|
2018-12-14 12:28:23 +03:00 |
Ivan Tashkinov
|
3cbf16a5fe
|
[#114] Added UserInviteToken creation, adjusted invitation email link to include it.
|
2018-12-14 12:28:22 +03:00 |
Ivan Tashkinov
|
cc83d7ffe7
|
[#114] Naive implementation of email invitations.
|
2018-12-14 12:28:14 +03:00 |
href
|
30dc81667c
|
Merge branch '114_user_registration_emails' into 'develop'
[#114] User registration emails
Closes #114
See merge request pleroma/pleroma!531
|
2018-12-14 09:16:03 +00:00 |
lambda
|
262cc6d44b
|
Merge branch 'fix/double-rt-or-fav' into 'develop'
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
|
2018-12-14 08:26:08 +00:00 |
eal
|
61ad2ce422
|
TwitterAPI: Include favorited post in json
|
2018-12-14 08:24:18 +02:00 |
eal
|
1ca080c862
|
Prevent accidental double RTs or favorites
|
2018-12-14 07:56:49 +02:00 |
Ivan Tashkinov
|
18b9467d1a
|
[#114] Removed `email_invite` implementation (to be addressed separately).
|
2018-12-13 16:22:42 +03:00 |
Ivan Tashkinov
|
00744c6b03
|
[#114] Initial implementation of user email invitations.
|
2018-12-13 14:30:48 +03:00 |
href
|
7d9ddbe689
|
Allow underscores in usernames.
Fixes #429.
|
2018-12-12 18:57:33 +01:00 |
Ivan Tashkinov
|
4e7d98922e
|
[#114] Added tests for "POST /api/account/password_reset".
|
2018-12-12 17:04:52 +03:00 |
Maksim Pechnikov
|
89b3729afa
|
fix warnings
|
2018-12-12 09:09:19 +03:00 |
lambda
|
0863ec2737
|
Merge branch 'fix_empty_bio_crash' into 'develop'
Fixes #415. Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529
|
2018-12-10 19:08:35 +00:00 |
lambda
|
ff10b9927b
|
Merge branch 'support/bugfix_272' into 'develop'
[#272] fix hashtags in api
See merge request pleroma/pleroma!510
|
2018-12-10 19:05:16 +00:00 |
lain
|
c81c74d847
|
Treat warnings as errors outside of tests.
|
2018-12-10 19:13:53 +01:00 |
raeno
|
9ba4a1c5fe
|
Fixes #415. Properly handle nil and empty string by User.parse_bio
|
2018-12-10 01:01:43 +04:00 |
Maksim Pechnikov
|
9442588ae9
|
fix hashtags in api response
|
2018-12-09 11:24:46 +03:00 |
href
|
bdc8112e40
|
Media proxy: fix url encoding
|
2018-12-07 21:57:59 +01:00 |
Ivan Tashkinov
|
6ed5044c4e
|
[#394] Refactoring (using Ecto.Multi; "untag" route change).
|
2018-12-07 11:04:39 +03:00 |
Ivan Tashkinov
|
7a2162bbcb
|
[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
|
2018-12-06 22:26:25 +03:00 |
Ivan Tashkinov
|
abbf347dc7
|
[#394] View tests fix.
|
2018-12-06 20:38:52 +03:00 |
Ivan Tashkinov
|
22830c8fc9
|
[#394] Formatting fix.
|
2018-12-06 20:13:07 +03:00 |
Ivan Tashkinov
|
7b19487389
|
[#394] Added `users.tags` and admin routes to tag and untag users. Added tests.
|
2018-12-06 20:06:50 +03:00 |
kaniini
|
ccf0b46dd6
|
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
|
2018-12-06 07:36:21 +00:00 |
Ivan Tashkinov
|
3e90f688f1
|
[#210] Mastodon: actor storing for media uploads, ownership check to update_media.
Refactoring.
|
2018-12-06 10:26:17 +03:00 |
kaniini
|
48a0315646
|
Merge branch 'follower-hiding' into 'develop'
Network hiding
Closes #356
See merge request pleroma/pleroma!490
|
2018-12-05 21:41:53 +00:00 |
lain
|
76d6b1c6ab
|
Merge remote-tracking branch 'origin' into follower-hiding
|
2018-12-05 21:27:56 +01:00 |
lain
|
3ea4476445
|
MastodonAPI: Show users their own network.
|
2018-12-05 21:25:06 +01:00 |
Vald
|
3c8ffe7ed3
|
resolved activity view test
|
2018-12-06 01:54:04 +05:30 |
Vald
|
028904c333
|
lint
|
2018-12-06 01:46:53 +05:30 |
Vald
|
911a877576
|
resolved api and controller test failures
|
2018-12-06 01:46:30 +05:30 |
lain
|
fdac215091
|
TwitterAPI: Show users their own network.
|
2018-12-05 21:14:06 +01:00 |
Vald
|
743a09132b
|
linting
|
2018-12-06 01:28:52 +05:30 |
Vald
|
812b20d49f
|
resolved formatter_test failures
|
2018-12-06 01:27:08 +05:30 |
lain
|
839526a913
|
TwitterAPI: Add network hiding.
|
2018-12-05 19:22:40 +01:00 |
Maksim Pechnikov
|
c524c50509
|
fix/273
|
2018-12-05 17:32:06 +03:00 |
Ivan Tashkinov
|
ba345e4c29
|
[#210] Formatting fix.
|
2018-12-05 13:43:00 +03:00 |
Ivan Tashkinov
|
848151f7cb
|
[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
|
2018-12-05 13:37:06 +03:00 |
Ivan Tashkinov
|
53797d19c5
|
[#210] Test update (replaced bang- with non-bang method).
|
2018-12-05 11:56:31 +03:00 |