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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Maksim Pechnikov
|
ec34de0c1f
|
WebSub fix test
|
2018-12-04 14:03:32 +03:00 |
|
Maksim Pechnikov
|
3ce16e5a56
|
init tesla and updated the http requests in Pleroma.Web.Websub
|
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 |
|
lambda
|
42ef7cd227
|
Merge branch 'fix-media-proxy-defaults' into 'develop'
Fix media proxy config defaults
See merge request pleroma/pleroma!495
|
2018-12-03 16:14:58 +00:00 |
|
Maxim Filippov
|
4b70e5eae9
|
Parse bio for MastodonAPI
|
2018-12-03 18:59:50 +03:00 |
|
kaniini
|
a3f9cca78c
|
Merge branch 'update-pleroma-frontend' into 'develop'
update-pleroma-frontend
See merge request pleroma/pleroma!494
|
2018-12-03 06:03:09 +00:00 |
|
hakabahitoyo
|
a7b1a66be3
|
update-pleroma-frontend
|
2018-12-03 13:24:25 +09:00 |
|
Haelwenn
|
e1204c6f25
|
Merge branch 'user_info_fixes_again' into 'develop'
User info fixes again
See merge request pleroma/pleroma!489
|
2018-12-02 23:07:24 +00: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 |
|
href
|
43d5e4f7fa
|
Fix media proxy config defaults
|
2018-12-02 11:24:02 +01:00 |
|
lain
|
e3f3d13d99
|
Add uuid generation extension to sample_psql.eex.
|
2018-12-02 11:20:49 +01:00 |
|
lain
|
91065e1968
|
Fix background updating / handling.
|
2018-12-02 11:20:38 +01:00 |
|
kaniini
|
371d96b1da
|
Merge branch 'validate-user-info' into 'develop'
Validate user info
See merge request pleroma/pleroma!465
|
2018-12-01 22:11:52 +00:00 |
|
lambda
|
a836d7b93a
|
Merge branch 'fix/config-replace-try-catch-with-file-exists' into 'develop'
#292 Replace try/rescue with File.Exists? in dev.exs
See merge request pleroma/pleroma!488
|
2018-12-01 15:17:41 +00:00 |
|
rinpatch
|
d9a4aed3b3
|
replace try/catch with File.Exists? in dev.exs
|
2018-12-01 17:38:45 +03: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 |
|