kaniini
|
cff0292d4b
|
Merge branch 'reserve-user-names' into 'develop'
Reserve a few user names
See merge request pleroma/pleroma!594
|
2018-12-27 19:35:06 +00:00 |
|
Vyr Cossont
|
e4562105e7
|
Implement exclude_reblogs and include_rts
|
2018-12-26 21:38:00 -08:00 |
|
lain
|
551d80cc01
|
Expose restricted names in nodeinfo.
|
2018-12-26 12:46:16 +01:00 |
|
lain
|
5811e65e67
|
Add some hard limits on inserted activities.
|
2018-12-26 12:39:35 +01:00 |
|
Maxim Filippov
|
012b7ab5e6
|
Add test to check /object/:id does not leak the tombstone itself
|
2018-12-25 23:40:57 +03:00 |
|
Maxim Filippov
|
aeb89bece6
|
Remove unused test
|
2018-12-25 03:38:02 +03:00 |
|
Maxim Filippov
|
f75f707f6c
|
Revert Activity tombstones, add ObjectTombstone struct
|
2018-12-25 03:00:06 +03:00 |
|
Maxim Filippov
|
2bbec33c71
|
Fix failing tests
|
2018-12-25 00:29:13 +03:00 |
|
Maxim Filippov
|
18a4cbb244
|
Capitalize "tombstone"
|
2018-12-24 20:09:18 +03:00 |
|
Maxim Filippov
|
0f412cf6e6
|
Create tombstone instead of object deletion
|
2018-12-24 02:25:36 +03:00 |
|
William Pitcock
|
3c08d229db
|
tests: add legal boilerplate
|
2018-12-23 20:57:10 +00:00 |
|
William Pitcock
|
a2bceaf688
|
tests: twitter api: add test proving that peertube videos are correctly handled
|
2018-12-23 14:00:54 +00:00 |
|
William Pitcock
|
873938d223
|
tests: twitter api: activity view test: enable tesla mock
|
2018-12-23 14:00:54 +00:00 |
|
William Pitcock
|
9f48485f64
|
tests: mastodon api: add test verifying that peertube videos are correctly rendered
|
2018-12-23 13:44:01 +00:00 |
|
William Pitcock
|
71f6d9f418
|
transmogrifier: significantly rework handling of peertube videos, add test
|
2018-12-23 13:31:08 +00:00 |
|
Ivan Tashkinov
|
851db74f1c
|
[#114] Fixed test.
|
2018-12-20 15:23:16 +03:00 |
|
Ivan Tashkinov
|
7cab7de9ff
|
[#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
|
2018-12-20 14:48:48 +03:00 |
|
Ivan Tashkinov
|
f69cbf4755
|
[#114] Added :user_id component to email confirmation path to improve the security.
Added tests for `confirm_email` action.
|
2018-12-20 13:41:30 +03:00 |
|
Ivan Tashkinov
|
968d7490b6
|
[#114] User.Info: renamed confirmation_update to confirmation_changeset .
|
2018-12-19 16:31:03 +03:00 |
|
Ivan Tashkinov
|
59fc5d15df
|
[#114] User.Info: renamed confirmation_update to confirmation_change .
|
2018-12-19 16:27:16 +03:00 |
|
Ivan Tashkinov
|
b096e30cff
|
[#114] Added email confirmation resend action. Added tests
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
|
2018-12-18 17:22:46 +03:00 |
|
Ivan Tashkinov
|
aed0f90287
|
[#114] Added pleroma.confirmation_pending to user views, adjusted view tests.
|
2018-12-18 17:22:45 +03:00 |
|
Maksim Pechnikov
|
92a5133c42
|
fix text field
|
2018-12-17 22:53:16 +03:00 |
|
lambda
|
078b8b6d22
|
Merge branch 'phoenix14' into 'develop'
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
|
2018-12-17 19:30:05 +00:00 |
|
href
|
b12a904911
|
Integration tests for mastodon websocket
|
2018-12-17 17:09:06 +01:00 |
|
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 |
|
href
|
f672555ad3
|
Upgrade to Phoenix 1.4
|
2018-12-16 17:15:07 +01: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
|
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 |
|
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 |
|
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 |
|
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 |
|
lain
|
839526a913
|
TwitterAPI: Add network hiding.
|
2018-12-05 19:22:40 +01: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 |
|
Ivan Tashkinov
|
44ab3dbe2c
|
[#210] Refactoring.
|
2018-12-04 19:45:09 +03:00 |
|
Ivan Tashkinov
|
826fc446d5
|
[#210] TwitterAPI: implemented /api/media/metadata/create
to allow uploads description (alt text) setting.
|
2018-12-04 18:35:57 +03:00 |
|
Maksim Pechnikov
|
dd8aee332c
|
formatting the code
|
2018-12-04 17:48:55 +03:00 |
|
Maksim Pechnikov
|
5c6d47614d
|
all tests passed
|
2018-12-04 17:44:15 +03:00 |
|
Maksim Pechnikov
|
a9e4a97586
|
update test
|
2018-12-04 14:04:06 +03:00 |
|
Maksim Pechnikov
|
7ec64ac33f
|
update test
|
2018-12-04 14:04:06 +03:00 |
|
Maksim Pechnikov
|
80bfdb4e7d
|
update test
|
2018-12-04 14:04:06 +03:00 |
|
Maksim Pechnikov
|
6cfdc11e32
|
update test
|
2018-12-04 14:04:06 +03:00 |
|
Maksim Pechnikov
|
c508d41c34
|
add http requests mock
|
2018-12-04 14:04:06 +03:00 |
|
Maksim Pechnikov
|
87109482f3
|
status_code -> status
|
2018-12-04 14:04:06 +03:00 |
|
Maksim Pechnikov
|
ec34de0c1f
|
WebSub fix test
|
2018-12-04 14:03:32 +03:00 |
|
lambda
|
88b05aeabb
|
Merge branch 'fix/parse-user-bio' into 'develop'
Parse user's bio on register
See merge request pleroma/pleroma!492
|
2018-12-03 16:31:00 +00:00 |
|
Maxim Filippov
|
4b70e5eae9
|
Parse bio for MastodonAPI
|
2018-12-03 18:59:50 +03:00 |
|
Maxim Filippov
|
8148943368
|
Format files
|
2018-12-02 22:08:53 +03:00 |
|
Maxim Filippov
|
ce98d5eb9b
|
Parse user's bio on register
|
2018-12-02 22:03:53 +03:00 |
|
lain
|
8c9a4e8b40
|
TwitterAPI: Implement hide_network.
|
2018-12-02 18:14:13 +01:00 |
|
lain
|
2a639de9b3
|
MastodonApi: Implement hide_network.
|
2018-12-02 17:48:00 +01:00 |
|
lain
|
6be0ab1e55
|
Hide network in ap.
|
2018-12-02 17:35:32 +01:00 |
|
lain
|
91065e1968
|
Fix background updating / handling.
|
2018-12-02 11:20:38 +01:00 |
|
lain
|
f18b86fd5f
|
More fixes for Info schema.
|
2018-12-01 12:46:08 +01:00 |
|
lain
|
93f2dc19d9
|
TwitterAPI: Fix banner and background update.
|
2018-12-01 12:01:22 +01:00 |
|
lain
|
347df6421d
|
Fix masto api user updating.
|
2018-12-01 10:40:01 +01:00 |
|
lain
|
1c67277c80
|
Fix admin api.
|
2018-12-01 09:03:16 +01:00 |
|
lain
|
d0ec2812bd
|
Merge remote-tracking branch 'origin' into validate-user-info
|
2018-11-30 17:34:20 +01:00 |
|
lain
|
48b95a9b95
|
Assorted fixes.
|
2018-11-30 17:08:02 +01:00 |
|
lain
|
d407f662af
|
Fix TwitterApiController.
|
2018-11-30 17:07:37 +01:00 |
|
lain
|
a6812bc9df
|
Remove "most recent notification" endpoint.
|
2018-11-30 16:47:37 +01:00 |
|
lain
|
6ac5d48575
|
More fixes
|
2018-11-29 00:25:43 +01:00 |
|
KokaKiwi
|
87098d1676
|
Streamer: Don't send unwanted DMs to list streams
|
2018-11-27 20:50:19 +01:00 |
|
lain
|
e002858071
|
Fix ostatus test.
|
2018-11-27 18:37:46 +01:00 |
|
lain
|
3c61df6b9e
|
Webfinger fixes.
|
2018-11-27 18:31:44 +01:00 |
|