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 |
|
|
|
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 |
|
|
|
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 |
|
Mark Felder
|
69038887b2
|
Code readability tweak
|
2019-04-04 12:36:57 -05:00 |
|
Mark Felder
|
7222afe01b
|
Clean merge crumbs
|
2019-04-04 12:29:10 -05:00 |
|
href
|
7e930559fe
|
Serve metrics at /api/pleroma/app_metrics
|
2019-04-04 12:27:44 -05:00 |
|
Mark Felder
|
5564cd421d
|
Document Prometheus
|
2019-04-04 12:19:31 -05:00 |
|
Egor Kislitsyn
|
0b5c818cb7
|
[#1] fix telemetry
|
2019-04-04 11:35:09 -05:00 |
|
href
|
bc3618a38d
|
Set up telemetry and prometheus
|
2019-04-04 11:30:43 -05:00 |
|
href
|
b655a8ea83
|
Add recon
|
2019-04-04 11:22:30 -05:00 |
|
Egor Kislitsyn
|
cfa6e7289f
|
Improve Transmogrifier.upgrade_user_from_ap_id/2
|
2019-04-04 16:10:43 +07: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 |
|
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 |
|
Alex S
|
d140738edf
|
second level of headertext change in doc
|
2019-04-02 20:36:36 +07:00 |
|
Alex S
|
3465b7ba9a
|
syntax highlighting
|
2019-04-02 20:32:37 +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 |
|
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 |
|
Ivan Tashkinov
|
37925cbe78
|
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
|
2019-04-02 14:05:34 +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 |
|
Ivan Tashkinov
|
590c935d95
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-02 13:50:12 +03: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 |
|
