rinpatch
|
2ae1128d9f
|
MastoAPI: Fix put_settings
|
2018-12-06 17:42:07 +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 |
|
|
kaniini
|
6ab58fdfa1
|
Merge branch 'dev_vald_fe/data_tag' into 'develop'
added data-user and data-tag attributes
Closes #410
See merge request pleroma/pleroma!504
|
2018-12-05 20:47:44 +00:00 |
|
|
Vald
|
194869c7db
|
added data attrs to twitter scrubber
|
2018-12-06 02:14:56 +05:30 |
|
|
lain
|
7d5720f2e4
|
Fix merge.
|
2018-12-05 21:31:02 +01: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 |
|
|
Vald
|
3ccfe226c0
|
added data attrs for user and tag
|
2018-12-06 01:05:41 +05:30 |
|
|
Ivan Tashkinov
|
3b5be09f45
|
[#210] Stylistic change.
|
2018-12-05 21:48:21 +03:00 |
|
|
lain
|
839526a913
|
TwitterAPI: Add network hiding.
|
2018-12-05 19:22:40 +01:00 |
|
|
lambda
|
5f0c2372bc
|
Merge branch 'support/oauth_fetch_token' into 'develop'
[#273] bugfix/273
See merge request pleroma/pleroma!502
|
2018-12-05 17:55:51 +00:00 |
|
|
lambda
|
991b62cb4d
|
Merge branch 'fix/mix-tasks-userinfo' into 'develop'
Update mix tasks that use User.info.info_changeset since it is deprecated
See merge request pleroma/pleroma!503
|
2018-12-05 17:53:35 +00:00 |
|
|
Ivan Tashkinov
|
c4f3c5e939
|
[#210] Stylistic change.
|
2018-12-05 20:23:28 +03:00 |
|
|
Rin Toshaka
|
c3519132df
|
Sorry
|
2018-12-05 16:44:15 +01:00 |
|
|
Rin Toshaka
|
5427d2af3a
|
Update mix tasks since User.info.info_changeset is deprecated
|
2018-12-05 16:41:50 +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 |
|
|
Ivan Tashkinov
|
be187f82f7
|
[#210] Further refactoring.
|
2018-12-05 11:48:50 +03:00 |
|
|
lambda
|
22eff17912
|
Merge branch 'bugfix/408' into 'develop'
ensure user info is populated when registering users
See merge request pleroma/pleroma!500
|
2018-12-05 08:28:14 +00:00 |
|
|
William Pitcock
|
0f061bea0c
|
tests: add regression test for bug #408
|
2018-12-05 03:41:32 +00:00 |
|
|
William Pitcock
|
956f3c75ca
|
user: put default user info when registering a user
|
2018-12-05 03:35:41 +00:00 |
|
|
kaniini
|
ec1ec32f20
|
Merge branch 'optional-retry-queue' into 'develop'
Make retry queue optional.
See merge request pleroma/pleroma!498
|
2018-12-04 19:00:18 +00:00 |
|
|
lain
|
925b05054f
|
Make retry queue optional.
At the moment, it can use a lot of memory really fast.
|
2018-12-04 19:54:42 +01:00 |
|
|
kaniini
|
114b95cee2
|
Merge branch 'feature/integration_tesla' into 'develop'
[#354] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
|
2018-12-04 18:41:00 +00:00 |
|
|
lambda
|
4a602230e4
|
Merge branch 'bugfix/mrf-simple-media-removal' into 'develop'
bugfix: MRF simple media removal
See merge request pleroma/pleroma!497
|
2018-12-04 18:36:34 +00:00 |
|
|
William Pitcock
|
b57d83e3c9
|
MRF: simple policy: fix media removal
|
2018-12-04 18:30:01 +00:00 |
|
|
Maksim Pechnikov
|
a9e3e387c9
|
add test
|
2018-12-04 20:37:13 +03:00 |
|
|
Ivan Tashkinov
|
44ab3dbe2c
|
[#210] Refactoring.
|
2018-12-04 19:45:09 +03:00 |
|
|
Ivan Tashkinov
|
48e6193bf2
|
[#210] Refactoring.
|
2018-12-04 19:24:41 +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
|
50e72f6c48
|
remove httpoison_mock
|
2018-12-04 18:09:22 +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
|
97252a27d9
|
fix http request in Salmon
|
2018-12-04 14:04:06 +03:00 |
|