lain
|
b5cecebbc1
|
Conversations: Fix specs.
|
2019-04-10 09:32:17 +02:00 |
|
lain
|
a9f805c871
|
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
|
2019-04-08 14:10:51 +02:00 |
|
Egor Kislitsyn
|
9abf832b03
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
2019-04-08 18:48:10 +07:00 |
|
lambda
|
e19590c93f
|
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
|
2019-04-08 11:42:20 +00:00 |
|
lambda
|
fd45cab9ec
|
Merge branch 'twitter_oauth' into 'develop'
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
|
2019-04-08 11:41:50 +00:00 |
|
Alexander Strizhakov
|
36c0a10fdf
|
adding language tag
|
2019-04-08 11:03:10 +00:00 |
|
lambda
|
23067908de
|
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
|
2019-04-08 09:50:00 +00:00 |
|
Egor Kislitsyn
|
c3d5c3513a
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
2019-04-08 16:46:59 +07:00 |
|
Ivan Tashkinov
|
44829d9181
|
AdminApiControllerTest unused variables fix.
|
2019-04-08 12:32:55 +03:00 |
|
Egor Kislitsyn
|
a1a854646e
|
Merge branch 'develop' into use-jobs-in-webpush
|
2019-04-08 16:29:20 +07:00 |
|
Ivan Tashkinov
|
bffddf5e31
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
2019-04-08 12:20:26 +03:00 |
|
lambda
|
b4da2bc1d0
|
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
# config/config.exs
# docs/config.md
|
2019-04-08 09:18:01 +00:00 |
|
lambda
|
b177e1e7f3
|
Merge branch 'scheduled-activities' into 'develop'
Scheduled activities
See merge request pleroma/pleroma!989
|
2019-04-08 09:08:18 +00:00 |
|
|
|
fb2040d061
|
Merge branch 'fix/deactivated-user-error' into 'develop'
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
|
2019-04-06 22:19:30 +00:00 |
|
eugenijm
|
2056efa714
|
Add scheduler for sending scheduled activities to the queue
|
2019-04-06 23:56:29 +03:00 |
|
eugenijm
|
fc92a0fd8d
|
Added limits and media attachments for scheduled activities.
|
2019-04-06 23:55:58 +03:00 |
|
eugenijm
|
b3870df51f
|
Handle scheduled_at on status creation.
|
2019-04-06 23:55:58 +03:00 |
|
eugenijm
|
7bf622ce73
|
Add scheduled activities
|
2019-04-06 23:55:58 +03:00 |
|
eugenijm
|
7aa53d52bd
|
Return 403 on oauth token exchange for a deactivated user
|
2019-04-06 23:27:55 +03:00 |
|
|
|
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
|
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 |
|
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 |
|
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 |
|
Roger Braun
|
7895ee37fa
|
Add user following / unfollowing to the admin api.
|
2019-04-05 11:27:07 -05:00 |
|
Egor Kislitsyn
|
f1712cd2f1
|
Use PleromaJobQueue in Pleroma.Web.Push
|
2019-04-05 19:38:44 +07: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 |
|
Ivan Tashkinov
|
f7cd9131d4
|
[#923] OAuth consumer controller tests. Misc. improvements.
|
2019-04-04 22:41:03 +03:00 |
|
Egor Kislitsyn
|
cfa6e7289f
|
Improve Transmogrifier.upgrade_user_from_ap_id/2
|
2019-04-04 16:10:43 +07:00 |
|
Haelwenn
|
0cb94cfa94
|
Merge branch 'fix-slow-relationships' into 'develop'
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
|
2019-04-02 18:43:48 +00:00 |
|
lambda
|
256b492a58
|
Merge branch 'bugfix/wrong-date-format' into 'develop'
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
|
2019-04-02 14:18:23 +00:00 |
|
lambda
|
a79ce94dd4
|
Merge branch 'feature/fake-statuses' into 'develop'
Add fake status submit
See merge request pleroma/pleroma!995
|
2019-04-02 14:17:43 +00:00 |
|
lain
|
39bcf93007
|
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
|
2019-04-02 16:10:38 +02:00 |
|
lain
|
fd07745d1b
|
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
|
2019-04-02 16:08:55 +02:00 |
|
Alex S
|
fa8483cb80
|
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
|
2019-04-02 20:39:52 +07:00 |
|
lambda
|
180b87257c
|
Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
|
2019-04-02 12:47:40 +00:00 |
|
lambda
|
ce9284b36f
|
Merge branch 'remove-user-activities' into 'develop'
[#757] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
|
2019-04-02 12:45:29 +00:00 |
|
lambda
|
b95cf3d490
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
|
2019-04-02 12:43:28 +00:00 |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
2019-04-02 19:16:29 +07:00 |
|
rinpatch
|
fdb4357e9b
|
Rename fake param to preview and make the tests check that the object was not inserted to the db
|
2019-04-02 14:31:18 +03:00 |
|
Egor Kislitsyn
|
20c619f85f
|
replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests
|
2019-04-02 17:58:32 +07:00 |
|
lambda
|
091baf9316
|
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
|
2019-04-02 10:57:38 +00:00 |
|
lambda
|
26d509cc86
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
|
2019-04-02 10:52:29 +00:00 |
|
cascode
|
95c92c49c9
|
Fix account lookup for nicknames beginning with numbers
|
2019-04-02 10:51:33 +00:00 |
|
Egor Kislitsyn
|
9a59c26619
|
replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id)
|
2019-04-02 17:47:52 +07:00 |
|
Ivan Tashkinov
|
15ce710460
|
Added "GET /oauth/authorize" tests.
|
2019-04-02 13:43:33 +03:00 |
|
Egor Kislitsyn
|
11c2d6bdc4
|
change Repo.get(Activity, id) => Activity.get_by_id(id) in tests
|
2019-04-02 17:08:03 +07:00 |
|
