akkoma
5 years agoUpdate link in README.md
Pierce McGoran [Sun, 4 Aug 2019 03:01:21 +0000 (03:01 +0000)]
Update link in README.md

5 years agoMerge branch 'bugfix/password-reset-link-styling' into 'develop'
kaniini [Sat, 3 Aug 2019 21:29:39 +0000 (21:29 +0000)]
Merge branch 'bugfix/password-reset-link-styling' into 'develop'

templates/layout/app.html.eex: Style anchors

See merge request pleroma/pleroma!1527

5 years agotemplates/layout/app.html.eex: Style anchors
Haelwenn (lanodan) Monnier [Sat, 3 Aug 2019 20:56:20 +0000 (22:56 +0200)]
templates/layout/app.html.eex: Style anchors

[ci skip]

5 years agoMerge branch 'patch-2' into 'develop'
kaniini [Sat, 3 Aug 2019 18:55:09 +0000 (18:55 +0000)]
Merge branch 'patch-2' into 'develop'

Add preferredUsername to service actors so Mastodon can resolve them

See merge request pleroma/pleroma!1526

5 years agoRefactor
Thibaut Girka [Sat, 3 Aug 2019 18:37:20 +0000 (18:37 +0000)]
Refactor

5 years agoOnly add `preferredUsername` to service actor json when the underlying user actually...
Thibaut Girka [Sat, 3 Aug 2019 18:28:08 +0000 (18:28 +0000)]
Only add `preferredUsername` to service actor json when the underlying user actually has a username

5 years agoMerge branch 'admin-fixes' into 'develop'
kaniini [Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)]
Merge branch 'admin-fixes' into 'develop'

Admin fixes

See merge request pleroma/pleroma!1524

5 years agoAdmin fixes
Alexander Strizhakov [Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)]
Admin fixes

5 years agoMerge branch 'fix/search-space-error' into 'develop'
kaniini [Sat, 3 Aug 2019 18:13:21 +0000 (18:13 +0000)]
Merge branch 'fix/search-space-error' into 'develop'

Remove spaces from the domain search

Closes #1154

See merge request pleroma/pleroma!1521

5 years agoRemove spaces from the domain search
Sergey Suprunenko [Sat, 3 Aug 2019 18:13:20 +0000 (18:13 +0000)]
Remove spaces from the domain search

5 years agoMerge branch 'fix/with-reject-nil-clause' into 'develop'
kaniini [Sat, 3 Aug 2019 18:12:39 +0000 (18:12 +0000)]
Merge branch 'fix/with-reject-nil-clause' into 'develop'

Handle MRF rejections of incoming AP activities

Closes #1095

See merge request pleroma/pleroma!1520

5 years agoHandle MRF rejections of incoming AP activities
Sergey Suprunenko [Sat, 3 Aug 2019 18:12:38 +0000 (18:12 +0000)]
Handle MRF rejections of incoming AP activities

5 years agoMerge branch 'official-docker-support' into 'develop'
kaniini [Sat, 3 Aug 2019 18:12:03 +0000 (18:12 +0000)]
Merge branch 'official-docker-support' into 'develop'

Add Dockerfile

See merge request pleroma/pleroma!1523

5 years agoRun mix format
Ashlynn Anderson [Sat, 3 Aug 2019 17:42:57 +0000 (13:42 -0400)]
Run mix format

5 years agoAdd preferredUsername to service actors so Mastodon can resolve them
Thibaut Girka [Sat, 3 Aug 2019 17:24:57 +0000 (17:24 +0000)]
Add preferredUsername to service actors so Mastodon can resolve them

5 years agoAdd .dockerignore
Ashlynn Anderson [Sat, 3 Aug 2019 03:33:47 +0000 (23:33 -0400)]
Add .dockerignore

5 years agoOptimize Dockerfile
Ashlynn Anderson [Sat, 3 Aug 2019 02:40:31 +0000 (22:40 -0400)]
Optimize Dockerfile

Just merging RUNs to decrease the number of layers

5 years agoCreate docker.exs and docker-entrypoint + round out Dockerfile
Ashlynn Anderson [Sat, 3 Aug 2019 02:28:48 +0000 (22:28 -0400)]
Create docker.exs and docker-entrypoint + round out Dockerfile

At this point, the implementation is completely working and has been
tested running live and federating with other instances.

5 years agoBasic working Dockerfile
Ashlynn Anderson [Wed, 31 Jul 2019 23:35:14 +0000 (19:35 -0400)]
Basic working Dockerfile

No fancy script or minit automatic migration, etc, but if you start
the docker image and go in and manually do everything, it works.

5 years agoMerge branch 'docfix/mix_task_options' into 'develop'
Haelwenn [Fri, 2 Aug 2019 21:38:28 +0000 (21:38 +0000)]
Merge branch 'docfix/mix_task_options' into 'develop'

tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at

Closes #1155

See merge request pleroma/pleroma!1522

5 years agotasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at
Haelwenn (lanodan) Monnier [Fri, 2 Aug 2019 21:30:47 +0000 (23:30 +0200)]
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155
[ci skip]

5 years agoMerge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'
feld [Fri, 2 Aug 2019 17:07:09 +0000 (17:07 +0000)]
Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'

Fix/mediaproxy whitelist base url

See merge request pleroma/pleroma!1486

5 years agoFix/mediaproxy whitelist base url
feld [Fri, 2 Aug 2019 17:07:09 +0000 (17:07 +0000)]
Fix/mediaproxy whitelist base url

5 years agoMerge branch 'feature/hide-follows-remote' into 'develop'
lain [Fri, 2 Aug 2019 11:23:07 +0000 (11:23 +0000)]
Merge branch 'feature/hide-follows-remote' into 'develop'

Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users

See merge request pleroma/pleroma!1411

5 years agoMerge branch 'fix/semver-violations' into 'develop'
kaniini [Thu, 1 Aug 2019 16:37:04 +0000 (16:37 +0000)]
Merge branch 'fix/semver-violations' into 'develop'

Fix Invalid SemVer version generation

See merge request pleroma/pleroma!1517

5 years agoMerge branch 'cleanup-tests' into 'develop'
rinpatch [Thu, 1 Aug 2019 13:38:15 +0000 (13:38 +0000)]
Merge branch 'cleanup-tests' into 'develop'

Clean up `AdminAPIControllerTest` output

See merge request pleroma/pleroma!1516

5 years agoFix Invalid SemVer version generation
rinpatch [Thu, 1 Aug 2019 11:15:18 +0000 (14:15 +0300)]
Fix Invalid SemVer version generation

when the current branch does not have commits ahead of tag/checked out on a tag

5 years agoClean up tests output
Egor Kislitsyn [Thu, 1 Aug 2019 09:33:36 +0000 (16:33 +0700)]
Clean up tests output

5 years agoMerge branch 'chore/changelog-update' into 'develop'
kaniini [Wed, 31 Jul 2019 20:08:27 +0000 (20:08 +0000)]
Merge branch 'chore/changelog-update' into 'develop'

Add a changelog entry for disallowing locked accounts follows over OStatus

See merge request pleroma/pleroma!1513

5 years agoAdd a changelog entry for disallowing locked accounts follows over OStatus
rinpatch [Wed, 31 Jul 2019 20:03:06 +0000 (23:03 +0300)]
Add a changelog entry for disallowing locked accounts follows over OStatus

5 years agoMerge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
kaniini [Wed, 31 Jul 2019 19:13:56 +0000 (19:13 +0000)]
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'

Disallow following locked accounts over OStatus

See merge request pleroma/pleroma!1512

5 years agoDisallow following locked accounts over OStatus
rinpatch [Wed, 31 Jul 2019 19:05:12 +0000 (22:05 +0300)]
Disallow following locked accounts over OStatus

5 years agoMerge branch 'test/web_common_api_utils' into 'develop'
kaniini [Wed, 31 Jul 2019 18:35:15 +0000 (18:35 +0000)]
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

5 years agotest for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
Maksim [Wed, 31 Jul 2019 18:35:15 +0000 (18:35 +0000)]
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id

5 years agoMerge branch 'hardening/disallow-ostatus-downgrade' into 'develop'
kaniini [Wed, 31 Jul 2019 18:30:40 +0000 (18:30 +0000)]
Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'

ostatus: explicitly disallow protocol downgrade from activitypub

See merge request pleroma/pleroma!1511

5 years agoostatus: explicitly disallow protocol downgrade from activitypub
Ariadne Conill [Wed, 31 Jul 2019 17:23:16 +0000 (17:23 +0000)]
ostatus: explicitly disallow protocol downgrade from activitypub

This closes embargoed bug #1135.

5 years agoAdd tests for counters being updated on follow
rinpatch [Wed, 31 Jul 2019 16:37:55 +0000 (19:37 +0300)]
Add tests for counters being updated on follow

5 years agoMerge branch 'test/twitter/util_controller' into 'develop'
kaniini [Wed, 31 Jul 2019 15:14:36 +0000 (15:14 +0000)]
Merge branch 'test/twitter/util_controller' into 'develop'

tests for TwitterApi/UtilController

See merge request pleroma/pleroma!1509

5 years agotests for TwitterApi/UtilController
Maksim [Wed, 31 Jul 2019 15:14:36 +0000 (15:14 +0000)]
tests for TwitterApi/UtilController

5 years agoFix credo issues
rinpatch [Wed, 31 Jul 2019 11:20:34 +0000 (14:20 +0300)]
Fix credo issues

5 years agoMerge branch 'develop' into feature/hide-follows-remote
rinpatch [Wed, 31 Jul 2019 11:12:29 +0000 (14:12 +0300)]
Merge branch 'develop' into feature/hide-follows-remote

5 years agoMerge branch 'admin-changes' into 'develop'
kaniini [Tue, 30 Jul 2019 16:36:05 +0000 (16:36 +0000)]
Merge branch 'admin-changes' into 'develop'

Admin changes

See merge request pleroma/pleroma!1489

5 years agoAdmin changes
Alexander Strizhakov [Tue, 30 Jul 2019 16:36:05 +0000 (16:36 +0000)]
Admin changes

5 years agoMerge branch 'security/remote-follow-commonapi' into 'develop'
kaniini [Mon, 29 Jul 2019 20:10:59 +0000 (20:10 +0000)]
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

5 years agotwitter api: utils: rework do_remote_follow() to use CommonAPI
Ariadne Conill [Mon, 29 Jul 2019 20:00:57 +0000 (20:00 +0000)]
twitter api: utils: rework do_remote_follow() to use CommonAPI

Closes #1138

5 years agoMerge branch 'revert-83508418' into 'develop'
kaniini [Mon, 29 Jul 2019 19:42:35 +0000 (19:42 +0000)]
Merge branch 'revert-83508418' into 'develop'

Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

See merge request pleroma/pleroma!1505

5 years agoRevert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
kaniini [Mon, 29 Jul 2019 19:42:26 +0000 (19:42 +0000)]
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

This reverts merge request !1504

5 years agoMerge branch 'bugfix/clean-up-markdown-rendering' into 'develop'
Haelwenn [Mon, 29 Jul 2019 19:24:14 +0000 (19:24 +0000)]
Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'

markdown: clean up html generated by earmark

See merge request pleroma/pleroma!1504

5 years agomarkdown: clean up html generated by earmark
Ariadne Conill [Mon, 29 Jul 2019 19:09:58 +0000 (19:09 +0000)]
markdown: clean up html generated by earmark

5 years agoMerge branch 'refactor/use-constants' into 'develop'
lain [Mon, 29 Jul 2019 16:30:47 +0000 (16:30 +0000)]
Merge branch 'refactor/use-constants' into 'develop'

refactoring: begin to use constants

See merge request pleroma/pleroma!1500

5 years agoMerge branch 'mailer-enabled-nodeinfo' into 'develop'
kaniini [Mon, 29 Jul 2019 16:17:41 +0000 (16:17 +0000)]
Merge branch 'mailer-enabled-nodeinfo' into 'develop'

Add `mailerEnabled` to the NodeInfo metadata

See merge request pleroma/pleroma!1502

5 years agoAdd `mailerEnabled` to the NodeInfo metadata
Eugenij [Mon, 29 Jul 2019 16:17:40 +0000 (16:17 +0000)]
Add `mailerEnabled` to the NodeInfo metadata

5 years agoMerge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'
kaniini [Mon, 29 Jul 2019 16:17:23 +0000 (16:17 +0000)]
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

5 years agoRedirect not logged-in users to the MastoFE login page on private instances
Sergey Suprunenko [Mon, 29 Jul 2019 16:17:22 +0000 (16:17 +0000)]
Redirect not logged-in users to the MastoFE login page on private instances

5 years agoMerge branch 'tests/ostatus_controller' into 'develop'
kaniini [Mon, 29 Jul 2019 05:02:20 +0000 (05:02 +0000)]
Merge branch 'tests/ostatus_controller' into 'develop'

added tests for OstatusController

See merge request pleroma/pleroma!1501

5 years agoadded tests for OstatusController
Maksim [Mon, 29 Jul 2019 05:02:20 +0000 (05:02 +0000)]
added tests for OstatusController

5 years agoconstants: add as_public constant and use it everywhere
Ariadne Conill [Mon, 29 Jul 2019 02:43:19 +0000 (02:43 +0000)]
constants: add as_public constant and use it everywhere

5 years agomix: add ex_const dependency
Ariadne Conill [Mon, 29 Jul 2019 02:12:35 +0000 (02:12 +0000)]
mix: add ex_const dependency

5 years agoMerge branch 'bugfix/transmogrifier-fix-delete' into 'develop'
kaniini [Sun, 28 Jul 2019 21:40:55 +0000 (21:40 +0000)]
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

5 years agotransmogrifier: use User.delete() instead of handrolled user deletion code for remote...
Ariadne Conill [Sun, 28 Jul 2019 21:29:10 +0000 (21:29 +0000)]
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users

Closes #1104

5 years agoMerge branch 'confirmation-resend' into 'develop'
kaniini [Sun, 28 Jul 2019 20:30:10 +0000 (20:30 +0000)]
Merge branch 'confirmation-resend' into 'develop'

add account confirmation email resend in mastodon api

See merge request pleroma/pleroma!1492

5 years agoadd account confirmation email resend in mastodon api
Sachin Joshi [Sun, 28 Jul 2019 20:30:10 +0000 (20:30 +0000)]
add account confirmation email resend in mastodon api

5 years agoMerge branch 'fix/user_update_and_set_cache' into 'develop'
kaniini [Sun, 28 Jul 2019 20:29:27 +0000 (20:29 +0000)]
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

5 years agofixed User.update_and_set_cache for stale user
Maksim [Sun, 28 Jul 2019 20:29:26 +0000 (20:29 +0000)]
fixed User.update_and_set_cache for stale user

5 years agoMerge branch 'develop' into 'develop'
kaniini [Sun, 28 Jul 2019 20:25:35 +0000 (20:25 +0000)]
Merge branch 'develop' into 'develop'

Fix HTTP sig tweak on KeyId

See merge request pleroma/pleroma!1496

5 years agoMerge branch 'feature/hackney-303-redirect' into 'develop'
kaniini [Sun, 28 Jul 2019 20:24:39 +0000 (20:24 +0000)]
Merge branch 'feature/hackney-303-redirect' into 'develop'

Handle 303 redirects

Closes #1127

See merge request pleroma/pleroma!1497

5 years agoHandle 303 redirects
Sergey Suprunenko [Sun, 28 Jul 2019 20:24:39 +0000 (20:24 +0000)]
Handle 303 redirects

5 years agoFix HTTP sig tweak on KeyId
Thomas Sileo [Sun, 28 Jul 2019 12:17:56 +0000 (14:17 +0200)]
Fix HTTP sig tweak on KeyId

5 years agoMerge branch 'issue/1097' into 'develop'
rinpatch [Fri, 26 Jul 2019 20:27:38 +0000 (20:27 +0000)]
Merge branch 'issue/1097' into 'develop'

[#1097] added redirect: /pleroma/admin -> /pleroma/admin/

See merge request pleroma/pleroma!1495

5 years ago[#1097] added redirect: /pleroma/admin -> /pleroma/admin/
Maksim [Fri, 26 Jul 2019 20:27:38 +0000 (20:27 +0000)]
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/

5 years agoMerge branch 'changelog/1484-base_url-remove-media' into 'develop'
Haelwenn [Fri, 26 Jul 2019 15:27:12 +0000 (15:27 +0000)]
Merge branch 'changelog/1484-base_url-remove-media' into 'develop'

Changelog: !1484 base_url removed /media/

See merge request pleroma/pleroma!1494

5 years agoCHANGELOG.md: Add entry for !1484
Haelwenn (lanodan) Monnier [Fri, 26 Jul 2019 13:33:25 +0000 (15:33 +0200)]
CHANGELOG.md: Add entry for !1484

Related to: https://git.pleroma.social/pleroma/pleroma/merge_requests/1484

[ci skip]

5 years agoMerge branch 'develop' into feature/hide-follows-remote
rinpatch [Thu, 25 Jul 2019 15:43:30 +0000 (18:43 +0300)]
Merge branch 'develop' into feature/hide-follows-remote

5 years agoMerge branch 'tests/filter_dedupe' into 'develop'
kaniini [Thu, 25 Jul 2019 03:43:13 +0000 (03:43 +0000)]
Merge branch 'tests/filter_dedupe' into 'develop'

fixed test for elixir 1.7.4

See merge request pleroma/pleroma!1487

5 years agofixed test for elixir 1.7.4
Maksim [Thu, 25 Jul 2019 03:43:13 +0000 (03:43 +0000)]
fixed test for elixir 1.7.4

5 years agoMerge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
kaniini [Wed, 24 Jul 2019 19:29:01 +0000 (19:29 +0000)]
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'

Fix remote follow from /ostatus_subscribe

Closes #1103

See merge request pleroma/pleroma!1472

5 years agoMerge branch 'fix/put-correct-activity-url' into 'develop'
kaniini [Wed, 24 Jul 2019 19:28:21 +0000 (19:28 +0000)]
Merge branch 'fix/put-correct-activity-url' into 'develop'

Show the url advertised in the Activity in the Status JSON response

Closes #1077

See merge request pleroma/pleroma!1485

5 years agoShow the url advertised in the Activity in the Status JSON response
Sergey Suprunenko [Wed, 24 Jul 2019 19:28:21 +0000 (19:28 +0000)]
Show the url advertised in the Activity in the Status JSON response

5 years agoAdd WebFinger test for AP-only account
kPherox [Wed, 24 Jul 2019 16:27:34 +0000 (01:27 +0900)]
Add WebFinger test for AP-only account

5 years agoMerge branch 'fix/Upload_base_url' into 'develop'
kaniini [Wed, 24 Jul 2019 15:35:25 +0000 (15:35 +0000)]
Merge branch 'fix/Upload_base_url' into 'develop'

Fix/upload base url

See merge request pleroma/pleroma!1484

5 years agoDo not prepend /media/ when using base_url
feld [Wed, 24 Jul 2019 15:35:25 +0000 (15:35 +0000)]
Do not prepend /media/ when using base_url

This ensures admin has full control over the path where media resides.

5 years agoChange to not require `magic-public-key` on WebFinger
kPherox [Wed, 24 Jul 2019 14:38:38 +0000 (23:38 +0900)]
Change to not require `magic-public-key` on WebFinger

5 years agoMerge branch 'tests/web_finger' into 'develop'
kaniini [Wed, 24 Jul 2019 15:13:11 +0000 (15:13 +0000)]
Merge branch 'tests/web_finger' into 'develop'

tests WebFinger

See merge request pleroma/pleroma!1483

5 years agotests WebFinger
Maksim [Wed, 24 Jul 2019 15:13:10 +0000 (15:13 +0000)]
tests WebFinger

5 years agoMerge branch 'domain-blocking-relationship-api' into 'develop'
kaniini [Wed, 24 Jul 2019 15:12:27 +0000 (15:12 +0000)]
Merge branch 'domain-blocking-relationship-api' into 'develop'

Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)

See merge request pleroma/pleroma!1481

5 years agoAdd `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
Eugenij [Wed, 24 Jul 2019 15:12:27 +0000 (15:12 +0000)]
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)

5 years agoMerge branch 'develop' into 'develop'
lain [Wed, 24 Jul 2019 11:28:05 +0000 (11:28 +0000)]
Merge branch 'develop' into 'develop'

Honour domain blocks on streamed notifications/statuses

See merge request pleroma/pleroma!1482

5 years agocheck both item and parent domain blocks
sadposter [Wed, 24 Jul 2019 10:35:16 +0000 (11:35 +0100)]
check both item and parent domain blocks

5 years agomove domain block check to with block
Sadposter [Wed, 24 Jul 2019 10:11:33 +0000 (11:11 +0100)]
move domain block check to with block

5 years agohonour domain blocks on streaming notifications
Sadposter [Wed, 24 Jul 2019 10:09:06 +0000 (11:09 +0100)]
honour domain blocks on streaming notifications

5 years agoMerge branch 'Fix-static-dir-doc' into 'develop'
kaniini [Wed, 24 Jul 2019 01:59:41 +0000 (01:59 +0000)]
Merge branch 'Fix-static-dir-doc' into 'develop'

Fix static_dir docs

See merge request pleroma/pleroma!1465

5 years agoAdd text about gitignore
aries [Wed, 24 Jul 2019 01:50:56 +0000 (01:50 +0000)]
Add text about gitignore

5 years agoMerge branch 'feature/admin-api-user-statuses' into 'develop'
kaniini [Tue, 23 Jul 2019 23:59:21 +0000 (23:59 +0000)]
Merge branch 'feature/admin-api-user-statuses' into 'develop'

Admin API: Endpoint for fetching latest user's statuses

See merge request pleroma/pleroma!1413

5 years agoMerge branch 'bugfix/rich-media-splice-url' into 'develop'
kaniini [Tue, 23 Jul 2019 23:59:06 +0000 (23:59 +0000)]
Merge branch 'bugfix/rich-media-splice-url' into 'develop'

rich media: parser: splice the given URL into the result

See merge request pleroma/pleroma!1480

5 years agorich media: parser: splice the given URL into the result
Ariadne Conill [Tue, 23 Jul 2019 22:58:31 +0000 (22:58 +0000)]
rich media: parser: splice the given URL into the result

5 years agoMerge branch 'develop' into feature/admin-api-user-statuses
Maxim Filippov [Tue, 23 Jul 2019 23:42:28 +0000 (02:42 +0300)]
Merge branch 'develop' into feature/admin-api-user-statuses

5 years agoAdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private...
Maxim Filippov [Tue, 23 Jul 2019 22:50:09 +0000 (01:50 +0300)]
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)

5 years agoMerge branch 'chore/update-mix-lock' into 'develop'
kaniini [Tue, 23 Jul 2019 19:59:15 +0000 (19:59 +0000)]
Merge branch 'chore/update-mix-lock' into 'develop'

update mix.lock

See merge request pleroma/pleroma!1478

5 years agoupdate mix.lock
Ariadne Conill [Tue, 23 Jul 2019 19:49:36 +0000 (19:49 +0000)]
update mix.lock

5 years agoMerge branch 'chore/adminapi-deprecated-endpoints' into 'develop'
kaniini [Tue, 23 Jul 2019 19:48:34 +0000 (19:48 +0000)]
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'

Router: Remove deprecated AdminAPI endpoints

See merge request pleroma/pleroma!1466