alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,856 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

6856 Commits

Author SHA1 Message Date
kaniini 9e7c633b39 Merge branch 'patch-2' into 'develop' 
Replace "impode" with "implode"

See merge request pleroma/pleroma!1532
 2019-08-04 17:05:17 +00:00
x0rz3q 3411f506b3 Replace "impode" with "implode" for 2019-08-04 14:35:45 +00:00
kaniini cee0d35566 Merge branch 'remove-longfox-emoji-set' into 'develop' 
Remove longfox emoji set

See merge request pleroma/pleroma!1525
 2019-08-04 04:32:45 +00:00
Hakaba Hitoyo 39c7bbe18f Remove longfox emoji set 2019-08-04 04:32:45 +00:00
kaniini b9497ead35 Merge branch 'develop' into 'develop' 
Fix a stale link and a few typos

See merge request pleroma/pleroma!1529
 2019-08-04 04:32:09 +00:00
Pierce McGoran 9b9453ceaf Fix some typos and rework a few lines in howto_mediaproxy.md 2019-08-04 03:12:38 +00:00
Pierce McGoran c10a3e035b Update link in README.md 2019-08-04 03:01:21 +00:00
Ariadne Conill cef3af5536 tasks: relay: add list task 2019-08-03 23:17:17 +00:00
kaniini b1fb5b93ae Merge branch 'bugfix/password-reset-link-styling' into 'develop' 
templates/layout/app.html.eex: Style anchors

See merge request pleroma/pleroma!1527
 2019-08-03 21:29:39 +00:00
Haelwenn (lanodan) Monnier a035ab8c1d
templates/layout/app.html.eex: Style anchors 
[ci skip]
 2019-08-03 23:18:22 +02:00
kaniini 86fffe9c27 Merge branch 'patch-2' into 'develop' 
Add preferredUsername to service actors so Mastodon can resolve them

See merge request pleroma/pleroma!1526
 2019-08-03 18:55:09 +00:00
Thibaut Girka 1fce56c7df Refactor 2019-08-03 18:37:20 +00:00
Thibaut Girka 16cfb89240 Only add `preferredUsername` to service actor json when the underlying user actually has a username 2019-08-03 18:28:08 +00:00
kaniini 4ae0a6652f Merge branch 'admin-fixes' into 'develop' 
Admin fixes

See merge request pleroma/pleroma!1524
 2019-08-03 18:16:09 +00:00
Alexander Strizhakov de0f3b73dd Admin fixes 2019-08-03 18:16:09 +00:00
kaniini 99ce6d6044 Merge branch 'fix/search-space-error' into 'develop' 
Remove spaces from the domain search

Closes #1154

See merge request pleroma/pleroma!1521
 2019-08-03 18:13:21 +00:00
Sergey Suprunenko 040347b248 Remove spaces from the domain search 2019-08-03 18:13:20 +00:00
kaniini 7319b41e34 Merge branch 'fix/with-reject-nil-clause' into 'develop' 
Handle MRF rejections of incoming AP activities

Closes #1095

See merge request pleroma/pleroma!1520
 2019-08-03 18:12:39 +00:00
Sergey Suprunenko 8b2fa31fed Handle MRF rejections of incoming AP activities 2019-08-03 18:12:38 +00:00
kaniini ba72d02f86 Merge branch 'official-docker-support' into 'develop' 
Add Dockerfile

See merge request pleroma/pleroma!1523
 2019-08-03 18:12:03 +00:00
Ashlynn Anderson 4007717534 Run mix format 2019-08-03 13:42:57 -04:00
Thibaut Girka a187dbb326 Add preferredUsername to service actors so Mastodon can resolve them 2019-08-03 17:24:57 +00:00
Ashlynn Anderson 04327721d7 Add .dockerignore 2019-08-03 00:21:54 -04:00
Ashlynn Anderson c86db959cb Optimize Dockerfile 
Just merging RUNs to decrease the number of layers
 2019-08-03 00:21:54 -04:00
Ashlynn Anderson 4a418698db 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.
 2019-08-03 00:21:54 -04:00
Ashlynn Anderson 7efca4317b 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.
 2019-08-03 00:21:54 -04:00
Haelwenn e553a17e98 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
 2019-08-02 21:38:28 +00:00
Haelwenn (lanodan) Monnier 8815f07058
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155

[ci skip]
 2019-08-02 23:38:02 +02:00
lain eee98aaa73 Pleroma API: Add endpoint to get conversation statuses. 2019-08-02 19:53:08 +02:00
feld 5eec0abe09 Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop' 
Fix/mediaproxy whitelist base url

See merge request pleroma/pleroma!1486
 2019-08-02 17:07:09 +00:00
feld d93d777915 Fix/mediaproxy whitelist base url 2019-08-02 17:07:09 +00:00
Roman Chvanikov 9d4f34fbcb Merge branch 'develop' into feature/digest-email 2019-08-02 18:16:04 +03:00
lain 56b1c3af13 CommonAPI: Extend api with conversation replies. 2019-08-02 15:05:27 +02:00
lain 5ff8f07ca9 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
 2019-08-02 11:23:07 +00:00
lain f88560accd Conversations: Add recipient list to conversation participation. 
This enables to address the same group of people every time.
 2019-08-02 11:55:41 +02:00
kaniini 1fe092e03c Merge branch 'fix/semver-violations' into 'develop' 
Fix Invalid SemVer version generation

See merge request pleroma/pleroma!1517
 2019-08-01 16:37:04 +00:00
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