lain
|
fd4b7239cd
|
nothing
|
2019-08-01 17:25:46 +02:00 |
|
Ivan Tashkinov
|
23d279e03e
|
[#1149] Replaced RetryQueue with oban-based retries.
|
2019-08-01 17:28:00 +03:00 |
|
rinpatch
|
955985fe2c
|
Merge branch 'cleanup-tests' into 'develop'
Clean up `AdminAPIControllerTest` output
See merge request pleroma/pleroma!1516
|
2019-08-01 13:38:15 +00:00 |
|
rinpatch
|
81412240e6
|
Fix Invalid SemVer version generation
when the current branch does not have commits ahead of tag/checked out on a tag
|
2019-08-01 14:15:18 +03:00 |
|
Egor Kislitsyn
|
f98235f2ad
|
Clean up tests output
|
2019-08-01 16:33:36 +07:00 |
|
Egor Kislitsyn
|
9ca4506355
|
Add configurable length limits for User.bio and User.name
|
2019-08-01 15:53:37 +07:00 |
|
kaniini
|
cdfd02e904
|
Merge branch 'chore/changelog-update' into 'develop'
Add a changelog entry for disallowing locked accounts follows over OStatus
See merge request pleroma/pleroma!1513
|
2019-07-31 20:08:27 +00:00 |
|
rinpatch
|
def0c49ead
|
Add a changelog entry for disallowing locked accounts follows over OStatus
|
2019-07-31 23:03:46 +03:00 |
|
kaniini
|
6c06529cd4
|
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
|
2019-07-31 19:13:56 +00:00 |
|
rinpatch
|
813c686dd7
|
Disallow following locked accounts over OStatus
|
2019-07-31 22:05:12 +03:00 |
|
kaniini
|
b431b565f0
|
Merge branch 'test/web_common_api_utils' into 'develop'
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
See merge request pleroma/pleroma!1510
|
2019-07-31 18:35:15 +00:00 |
|
Maksim
|
6eb33e7303
|
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
|
2019-07-31 18:35:15 +00:00 |
|
kaniini
|
8980c1c769
|
Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'
ostatus: explicitly disallow protocol downgrade from activitypub
See merge request pleroma/pleroma!1511
|
2019-07-31 18:30:40 +00:00 |
|
Ariadne Conill
|
f72e0b7cad
|
ostatus: explicitly disallow protocol downgrade from activitypub
This closes embargoed bug #1135.
|
2019-07-31 18:17:31 +00:00 |
|
rinpatch
|
301ea0dc04
|
Add tests for counters being updated on follow
|
2019-07-31 21:09:13 +03:00 |
|
kaniini
|
957de9d771
|
Merge branch 'test/twitter/util_controller' into 'develop'
tests for TwitterApi/UtilController
See merge request pleroma/pleroma!1509
|
2019-07-31 15:14:36 +00:00 |
|
Maksim
|
58443d0cd6
|
tests for TwitterApi/UtilController
|
2019-07-31 15:14:36 +00:00 |
|
sadposter
|
3cc6cb266b
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-07-31 14:23:03 +01:00 |
|
lain
|
7483679a7b
|
StatusView: Return direct conversation id.
|
2019-07-31 15:12:29 +02:00 |
|
rinpatch
|
f42719506c
|
Fix credo issues
|
2019-07-31 14:20:34 +03:00 |
|
rinpatch
|
c88a5d3251
|
Merge branch 'develop' into feature/hide-follows-remote
|
2019-07-31 14:12:29 +03:00 |
|
kaniini
|
373a7c6739
|
Merge branch 'admin-changes' into 'develop'
Admin changes
See merge request pleroma/pleroma!1489
|
2019-07-30 16:36:05 +00:00 |
|
Alexander Strizhakov
|
51b3b6d816
|
Admin changes
|
2019-07-30 16:36:05 +00:00 |
|
kaniini
|
677df5ceb3
|
Merge branch 'security/remote-follow-commonapi' into 'develop'
twitter api: utils: rework do_remote_follow() to use CommonAPI
Closes #1138
See merge request pleroma/pleroma!1506
|
2019-07-29 20:10:59 +00:00 |
|
Ariadne Conill
|
3850812503
|
twitter api: utils: rework do_remote_follow() to use CommonAPI
Closes #1138
|
2019-07-29 20:00:57 +00:00 |
|
kaniini
|
6657506185
|
Merge branch 'revert-83508418' into 'develop'
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
See merge request pleroma/pleroma!1505
|
2019-07-29 19:42:35 +00:00 |
|
kaniini
|
5835069215
|
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
This reverts merge request !1504
|
2019-07-29 19:42:26 +00:00 |
|
Haelwenn
|
83508418fb
|
Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'
markdown: clean up html generated by earmark
See merge request pleroma/pleroma!1504
|
2019-07-29 19:24:14 +00:00 |
|
Ariadne Conill
|
5795a890e9
|
markdown: clean up html generated by earmark
|
2019-07-29 19:09:58 +00:00 |
|
lain
|
1dfde4151c
|
Merge branch 'refactor/use-constants' into 'develop'
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
|
2019-07-29 16:30:47 +00:00 |
|
kaniini
|
3b8cd27b05
|
Merge branch 'mailer-enabled-nodeinfo' into 'develop'
Add `mailerEnabled` to the NodeInfo metadata
See merge request pleroma/pleroma!1502
|
2019-07-29 16:17:41 +00:00 |
|
Eugenij
|
0bee2131ce
|
Add mailerEnabled to the NodeInfo metadata
|
2019-07-29 16:17:40 +00:00 |
|
kaniini
|
8be0154094
|
Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'
Redirect not logged-in users to the MastoFE login page on private instances
Closes #1045
See merge request pleroma/pleroma!1503
|
2019-07-29 16:17:23 +00:00 |
|
Sergey Suprunenko
|
c0e258cf21
|
Redirect not logged-in users to the MastoFE login page on private instances
|
2019-07-29 16:17:22 +00:00 |
|
kaniini
|
1f7c8d9615
|
Merge branch 'tests/ostatus_controller' into 'develop'
added tests for OstatusController
See merge request pleroma/pleroma!1501
|
2019-07-29 05:02:20 +00:00 |
|
Maksim
|
159bbec570
|
added tests for OstatusController
|
2019-07-29 05:02:20 +00:00 |
|
Ariadne Conill
|
b93498eb52
|
constants: add as_public constant and use it everywhere
|
2019-07-29 02:43:19 +00:00 |
|
Ariadne Conill
|
9d78b3b281
|
mix: add ex_const dependency
|
2019-07-29 02:12:35 +00:00 |
|
kaniini
|
b38d21060e
|
Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
Closes #1104
See merge request pleroma/pleroma!1498
|
2019-07-28 21:40:55 +00:00 |
|
Ariadne Conill
|
492d854e7a
|
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
Closes #1104
|
2019-07-28 21:32:04 +00:00 |
|
kaniini
|
44bfff22a7
|
Merge branch 'confirmation-resend' into 'develop'
add account confirmation email resend in mastodon api
See merge request pleroma/pleroma!1492
|
2019-07-28 20:30:10 +00:00 |
|
Sachin Joshi
|
242f5c585e
|
add account confirmation email resend in mastodon api
|
2019-07-28 20:30:10 +00:00 |
|
kaniini
|
0d05ec3855
|
Merge branch 'fix/user_update_and_set_cache' into 'develop'
fixed User.update_and_set_cache for stale user
See merge request pleroma/pleroma!1493
|
2019-07-28 20:29:27 +00:00 |
|
Maksim
|
6a4b8b2681
|
fixed User.update_and_set_cache for stale user
|
2019-07-28 20:29:26 +00:00 |
|
kaniini
|
488c06b6f5
|
Merge branch 'develop' into 'develop'
Fix HTTP sig tweak on KeyId
See merge request pleroma/pleroma!1496
|
2019-07-28 20:25:35 +00:00 |
|
kaniini
|
f78390ffdf
|
Merge branch 'feature/hackney-303-redirect' into 'develop'
Handle 303 redirects
Closes #1127
See merge request pleroma/pleroma!1497
|
2019-07-28 20:24:39 +00:00 |
|
Sergey Suprunenko
|
02dc651828
|
Handle 303 redirects
|
2019-07-28 20:24:39 +00:00 |
|
Thomas Sileo
|
961e778531
|
Fix HTTP sig tweak on KeyId
|
2019-07-28 14:17:56 +02:00 |
|
rinpatch
|
08960d5016
|
Merge branch 'issue/1097' into 'develop'
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/
See merge request pleroma/pleroma!1495
|
2019-07-26 20:27:38 +00:00 |
|
Maksim
|
6b77a88365
|
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/
|
2019-07-26 20:27:38 +00:00 |
|