Mark Felder
b5a2d384f7
Redundant Repo.get_by usage was recently removed from the codebase
2019-04-05 11:41:41 -05: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
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
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
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
lambda
3c7f5bb1dc
Merge branch 'fix/add-oauth-token-indexes' into 'develop'
...
adding indexes to oauth_tokens table
See merge request pleroma/pleroma!1016
2019-04-04 08:01:12 +00:00
lambda
c900ff39af
Merge branch 'features/pleroma-tan-mastofe' into 'develop'
...
mastodon_api_controller.ex: Add pleroma-tan to initial_state
See merge request pleroma/pleroma!1018
2019-04-04 07:34:20 +00:00
Haelwenn (lanodan) Monnier
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
2019-04-04 09:07:25 +02:00
lambda
3f8be270c6
Merge branch 'feature/robotstxt' into 'develop'
...
Generate permissive or restrictive robots.txt in the config generator
See merge request pleroma/pleroma!1012
2019-04-03 17:31:34 +00:00
Sachin Joshi
cd41584ac4
Generate permissive or restrictive robots.txt in the config generator
2019-04-03 22:12:58 +05:45
lambda
9bb122d5a7
Merge branch 'update-autolinker' into 'develop'
...
Update `auto_linker` dependency
See merge request pleroma/pleroma!1015
2019-04-03 14:42:59 +00:00
Alex S
86f90c0a54
adding indexes to oauth_tokens table
2019-04-03 20:51:09 +07:00
Egor Kislitsyn
d313a0c49c
Update `auto_linker` dependency
2019-04-03 19:41:15 +07:00
lambda
7c003991d6
Merge branch 'fix/preview-not-working-with-form-data' into 'develop'
...
Fix preview not being usable in form data
See merge request pleroma/pleroma!1013
2019-04-03 06:51:44 +00:00
rinpatch
79cb34a4b0
Fix preview not being usable in form data
2019-04-02 23:07:16 +03: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
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
lambda
bd961a3bad
Merge branch 'features/pleroma-tan' into 'develop'
...
priv/static/images: Add pleroma-tan
See merge request pleroma/pleroma!913
2019-04-02 11:54:04 +00: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
lambda
b5d486d9ac
Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'
...
Fix account lookup for nicknames beginning with numbers
See merge request pleroma/pleroma!1003
2019-04-02 10:51:33 +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
Egor Kislitsyn
88d3cb44c3
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
2019-04-02 17:47:02 +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
Egor Kislitsyn
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
2019-04-02 17:01:26 +07:00
Egor Kislitsyn
4212527928
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
2019-04-02 16:50:31 +07:00
Sergey Suprunenko
3db9235150
Ignore dates in wrong formats
2019-04-02 11:32:36 +02:00
Egor Kislitsyn
a14742f495
add `user delete_activities` mix task
2019-04-02 16:30:11 +07:00
lambda
9305e241cb
Merge branch 'ci-speedup-2-electric-boogalo' into 'develop'
...
CI speedup: split into proper stages to benefit from parallel execution
See merge request pleroma/pleroma!1007
2019-04-02 08:50:47 +00:00
Egor Kislitsyn
a1869f5272
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
2019-04-02 15:41:30 +07:00
Sachin Joshi
f20e8d28de
add support for all status type (ostatus) and replase case with if
2019-04-02 12:18:00 +05:45
rinpatch
8c71ea5a1a
remove reduntant services in docs deploy and change job names to kebab case
2019-04-02 09:13:34 +03:00
rinpatch
5ee54d8183
what the fuck
2019-04-02 09:07:58 +03:00
rinpatch
7827b929fc
huh
2019-04-02 09:02:21 +03:00
rinpatch
4861558b93
Separate CI jobs to 3 stages to allow them to be executed in parallel
2019-04-02 08:58:09 +03:00
rinpatch
f8aa917eef
Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop'
...
router: Add fake identity proof endpoint
See merge request pleroma/pleroma!1006
2019-04-02 05:31:41 +00:00
Sachin Joshi
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
2019-04-02 10:26:09 +05:45
Haelwenn (lanodan) Monnier
f56eef8d8c
router: Add fake identity proof endpoint
2019-04-02 01:53:38 +02:00