feld
876965a7e7
Merge branch 'fix/failed-legacy-test' into 'develop'
...
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS
See merge request pleroma/pleroma!1030
2019-04-06 16:03:35 +00:00
Alex S
ce8d457132
little channges
2019-04-06 22:38:35 +07:00
Sadposter
e6778003ab
JSON need quotes!
2019-04-06 16:24:21 +01:00
Sadposter
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
2019-04-06 16:20:06 +01:00
feld
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
2019-04-06 14:51:46 +00:00
Mark Felder
b395aebf24
Pin recon dependency to 2.4.0
2019-04-06 09:30:36 -05:00
Alex S
76d8928cf1
fix for field name
2019-04-06 20:49:43 +07:00
Alex S
a53d591ac5
code style
2019-04-06 20:47:05 +07:00
Alex S
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06 20:34:00 +07:00
Alex S
dcc54f8cfa
admin api endpoints for invites
2019-04-06 20:25:19 +07:00
Alex S
47b07cec49
token -> invite renaming
2019-04-06 20:24:22 +07:00
Alex S
be54e40890
twitter api registration
...
fix for twitter api tests
2019-04-06 17:18:59 +07:00
Alex S
0484f3a8b1
generating tokens with mix
2019-04-06 16:58:22 +07:00
Haelwenn
3c5daa0235
Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'
...
Redirect to the referer url after mastofe authorization
Closes #717
See merge request pleroma/pleroma!1025
2019-04-05 23:36:42 +00:00
Sergey Suprunenko
325a268017
Redirect to the referer url after mastofe authorization
2019-04-05 23:36:42 +00:00
Sergey Suprunenko
e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS
2019-04-05 22:48:11 +02:00
rinpatch
e3ca9f708f
Merge branch 'revert-8607ae68' into 'develop'
...
Revert "Merge branch 'test-coverage' into 'develop'"
See merge request pleroma/pleroma!1028
2019-04-05 20:04:16 +00:00
rinpatch
e5df8cadea
Revert "Merge branch 'test-coverage' into 'develop'"
...
This reverts merge request !1027
2019-04-05 19:59:03 +00:00
rinpatch
8607ae6841
Merge branch 'test-coverage' into 'develop'
...
Use --cover option when running CI tests
See merge request pleroma/pleroma!1027
2019-04-05 19:49:20 +00:00
optikfluffel
fb1be1d798
Use --cover option when running CI tests
2019-04-05 20:12:44 +02:00
feld
3fb3f42e77
Merge branch 'feature/admin-api-follow' into 'develop'
...
Feature/admin api follow
See merge request pleroma/pleroma!1026
2019-04-05 17:15:55 +00:00
Mark Felder
fac76bfa35
We actually want the user id not nickname in the test...
2019-04-05 12:11:19 -05:00
Mark Felder
c746087f57
Also remove Repo functions in the tests
2019-04-05 11:59:56 -05:00
Mark Felder
b5a2d384f7
Redundant Repo.get_by usage was recently removed from the codebase
2019-04-05 11:41:41 -05:00
Sadposter
ffac2593ea
Add index on subscribers
2019-04-05 17:30:54 +01:00
Mark Felder
da64a5aece
Document the admin API endpoints for controlling follow/unfollow
2019-04-05 11:29:34 -05:00
Roger Braun
7895ee37fa
Add user following / unfollowing to the admin api.
2019-04-05 11:27:07 -05:00
Sadposter
a270e7a191
Mix format everything
2019-04-05 17:07:58 +01:00
Sadposter
f6e131eeb9
Don't use twitterAPI for subscription tests
2019-04-05 17:02:09 +01:00
Sadposter
9ca91cbb87
Change relationship direction of subscriptions
2019-04-05 17:02:07 +01:00
Sadposter
d35f6551c1
Move subscriptions endpoint to be under /pleroma
2019-04-05 17:02:02 +01:00
Sadposter
73afd13c21
Add subscription key to one test I forgot about
2019-04-05 15:37:36 +01:00
Sadposter
06cd547fc6
Format subscriptions related stuff
2019-04-05 15:30:34 +01:00
Sadposter
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
2019-04-05 15:30:31 +01:00
Sadposter
75c4ceb4a2
Add tests for subscriptions
2019-04-05 15:30:29 +01:00
Sadposter
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
2019-04-05 15:30:26 +01:00
Sadposter
23c4f49494
Fix subscription endpoint return formats
2019-04-05 15:30:24 +01:00
Sadposter
007762e767
Add notification checks
2019-04-05 15:30:23 +01:00
Sadposter
79910ce5cc
Add API endpoints and user column for subscription
2019-04-05 15:30:18 +01:00
Egor Kislitsyn
1c2e4f88d1
fix credo
2019-04-05 19:46:28 +07:00
lambda
5499750054
Merge branch 'hotfix/html-sanitization' into 'develop'
...
Refactor html caching functions to use a key instead of a module, use more correct terminology and fix summaries in mastoapi
See merge request pleroma/pleroma!1022
2019-04-05 12:43:57 +00:00
Egor Kislitsyn
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
2019-04-05 19:38:44 +07:00
rinpatch
f0f30019e1
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
2019-04-05 15:19:44 +03:00
Ivan Tashkinov
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
2019-04-05 15:12:02 +03:00
Ivan Tashkinov
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
2019-04-05 09:19:17 +03:00
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-04 23:43:08 +03:00
Mark Felder
66e7b03372
Merge branch 'develop' into feature/prometheus
2019-04-04 15:39:42 -05:00
feld
9c9eec62c2
Merge branch 'feature/quack' into 'develop'
...
Add ability to ship logs to a Slack channel
See merge request pleroma/pleroma!1014
2019-04-04 19:52:22 +00:00
feld
3b12eeda19
Add ability to ship logs to a Slack channel
2019-04-04 19:52:22 +00:00
Ivan Tashkinov
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
2019-04-04 22:41:03 +03:00
