Egor Kislitsyn
|
b6f5b326e7
|
Fix credo warnings
|
5 years ago |
|
Egor Kislitsyn
|
aa0f0d4edd
|
Disable NewUsersDigestEmail by default
|
5 years ago |
|
Egor Kislitsyn
|
df0b8f1d08
|
Add new users digest email
|
5 years ago |
|
feld
|
52a0bf62f5
|
Merge branch 'ci/docker-imaging' into 'develop'
ci/docker imaging
See merge request pleroma/pleroma!2110
|
5 years ago |
|
jp
|
1e17ad2275
|
Update docker release / stable jobs
|
5 years ago |
|
jp
|
ffab411327
|
Update docker jobs for release branches and stable branches
|
5 years ago |
|
jp
|
0c9499bf25
|
Fix only: on docker develop/latest job
|
5 years ago |
|
jp
|
4d19f38753
|
update `only:` for release/ branch regex matching. and to avoid running image builds on unnecessary forks
|
5 years ago |
|
jp
|
cc4c3255fe
|
Fix odd spacing
|
5 years ago |
|
lain
|
6317183acd
|
Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'
[#1478] OAuth `admin` scopes tweaks
Closes #1478
See merge request pleroma/pleroma!2081
|
5 years ago |
|
Ivan Tashkinov
|
d1e9768e10
|
[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
|
5 years ago |
|
Ivan Tashkinov
|
5304c8cd21
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
|
5 years ago |
|
lain
|
1b233aa653
|
Merge branch 'notifications-from-account' into 'develop'
[#1470] Add support for `account_id` param to filter notifications by the account
See merge request pleroma/pleroma!2073
|
5 years ago |
|
Egor Kislitsyn
|
023b7f605b
|
Fix notification controller test
|
5 years ago |
|
Egor Kislitsyn
|
3849053c6a
|
Merge branch 'develop' into notifications-from-account
|
5 years ago |
|
Ivan Tashkinov
|
76c1948880
|
[#1478] Adjusted AdminAPIController admin subscope requirements.
|
5 years ago |
|
feld
|
77412d5dd2
|
Merge branch 'features/docker-updates' into 'develop'
Features/docker updates
See merge request pleroma/pleroma!2105
|
5 years ago |
|
jp
|
a58a0a7b1b
|
Remove forked test branch matching
|
5 years ago |
|
jp
|
ff15d6ef13
|
Remove artifacts passing by setting `dependencies: []`
|
5 years ago |
|
lain
|
b4532277b1
|
Merge branch 'features/docker-updates' into 'develop'
Features/docker updates
See merge request pleroma/pleroma!2104
|
5 years ago |
|
jp
|
964d188a96
|
Add allow_failure to docker jobs
|
5 years ago |
|
jp
|
fe57e5139f
|
Remove cache from docker jobs. Split devlop and stable branches into their own jobs
|
5 years ago |
|
lain
|
d150c598d7
|
Merge branch 'warnings-fix' into 'develop'
compilation warnings fix
See merge request pleroma/pleroma!2102
|
5 years ago |
|
Alexander Strizhakov
|
0d331f3d23
|
compilation warnings fix
|
5 years ago |
|
lain
|
12b28c8925
|
Merge branch 'feature/ci-registry' into 'develop'
Update Dockerfile with labels. Update gitlab-ci for registry usage
See merge request pleroma/pleroma!2098
|
5 years ago |
|
feld
|
a431e8c9f7
|
Merge branch 'feature/attachments-cleanup' into 'develop'
Delete attachments when status is deleted
See merge request pleroma/pleroma!2036
|
5 years ago |
|
Roman Chvanikov
|
88f0eed0f2
|
Delete attachments when status is deleted
|
5 years ago |
|
feld
|
8b4d81609d
|
Merge branch 'updated-at-on-conversation-read' into 'develop'
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
|
5 years ago |
|
feld
|
6cc5341d26
|
Merge branch 'config/benchmark' into 'develop'
Benchmark env uses test database so we should be able to use test.secret.exs
See merge request pleroma/pleroma!2057
|
5 years ago |
|
feld
|
bb5862ea2f
|
Merge branch 'issue/1354' into 'develop'
[#1354] fix remote follow
See merge request pleroma/pleroma!2079
|
5 years ago |
|
Mark Felder
|
e64059d218
|
Assign token that can write to follows
|
5 years ago |
|
Mark Felder
|
2f5b8fbeb3
|
Merge branch 'develop' into issue/1354
|
5 years ago |
|
feld
|
ea4a462858
|
Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
|
5 years ago |
|
rinpatch
|
ecb8fe183c
|
Merge branch 'patch-1' into 'develop'
docs: API: update Mastodon API link
See merge request pleroma/pleroma!2100
|
5 years ago |
|
rinpatch
|
a0bf928c98
|
Merge branch 'remove/remove-mdii-uploader' into 'develop'
Remove MDII uploader
See merge request pleroma/pleroma!2099
|
5 years ago |
|
Hakaba Hitoyo
|
0c9c62509d
|
Remove MDII uploader
|
5 years ago |
|
Alibek Omarov
|
e1308f10bd
|
docs: API: update Mastodon API link
|
5 years ago |
|
jp
|
2ef8f0be6c
|
Update Dockerfile with labels. Update gitlab-ci for registry usage
|
5 years ago |
|
Ivan Tashkinov
|
39ce894a07
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
|
lain
|
05ca420c09
|
Merge branch 'issue/1490' into 'develop'
[#1490] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
|
5 years ago |
|
lain
|
9b5cd8b1b7
|
Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
OAuth tweaks and tests rework
See merge request pleroma/pleroma!2068
|
5 years ago |
|
lain
|
e118d639a0
|
Merge branch 'fix/captcha-time' into 'develop'
Fix captcha time, which was meant to be 5 minutes
See merge request pleroma/pleroma!2094
|
5 years ago |
|
Ivan Tashkinov
|
6c94b7498b
|
[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
|
5 years ago |
|
Mark Felder
|
89243fee8e
|
Fix captcha time, which was meant to be 5 minutes
|
5 years ago |
|
feld
|
e8b0c7689a
|
Merge branch 'update/adminfe-20201019' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2093
|
5 years ago |
|
Mark Felder
|
fd3c23af63
|
Update AdminFE build
|
5 years ago |
|
Maksim Pechnikov
|
70410dfafd
|
fix create service actor
|
5 years ago |
|
rinpatch
|
fcd5dd259a
|
Merge branch 'bugfix/smtp-config-examples' into 'develop'
Fix SMTP mailer example
See merge request pleroma/pleroma!2091
|
5 years ago |
|
lain
|
180f257ced
|
Update CHANGELOG.md
|
5 years ago |
|
RX14
|
b55f2563d0
|
Fix SMTP mailer example
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail.
|
5 years ago |
