a18f1e7cd7
namings
5 years ago
17ff63b3c3
docs fix
5 years ago
2263c8b6b9
little fixes
5 years ago
4faf2b1555
post for creating invite tokens in admin api
5 years ago
40c968626d
Merge branch 'chore/changelog-separate-1.1' into 'develop'
...
Sync develop changelog with master and create a new section for post-1.1 changes
See merge request pleroma/pleroma!1689
5 years ago
ea6d4137da
Apply suggestion to CHANGELOG.md
5 years ago
bf8567996c
Sync develop changelog with master and create a new section for post-1.1
...
changes
5 years ago
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
...
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
5 years ago
e686f9be81
Apply suggestion to CHANGELOG.md
5 years ago
764931fc9f
Merge branch 'deps/update-tesla' into 'develop'
...
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
5 years ago
228bfd8a70
Bump elixir version to ~> 1.8
5 years ago
79376abae3
Merge branch 'support/package_versions' into 'develop'
...
[#1263 ] fixed ecto version
See merge request pleroma/pleroma!1685
5 years ago
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
5 years ago
d201eec45c
fixed ecto version
5 years ago
8d812c28a7
Update Tesla to 1.3
...
This version includes a couple of fixes, adds Gun and Mint adapters and
removes 0.x -> 1.0 config migrator, which for some reason fails under
certain conditions. I had to set `override: true` because Quack pins
Tesla to `1.2.0`, but I have looked through the source code and verified
that updating Tesla doesn't break anything there.
5 years ago
7318095657
Merge branch 'fix-notification-warnings' into 'develop'
...
Fix notification warnings
See merge request pleroma/pleroma!1683
5 years ago
6193157f19
Fix notification warnings
5 years ago
2301de3d75
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
...
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
See merge request pleroma/pleroma!1677
5 years ago
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
5 years ago
1fc8fabecf
Merge branch 'eliminate-test-errors' into 'develop'
...
remove remaining errors from tests
See merge request pleroma/pleroma!1682
5 years ago
80c5c3495b
remove remaining errors from tests
5 years ago
bb6d172e74
Merge branch 'deps/update-oban' into 'develop'
...
Update oban to 0.8.1
Closes #1261
See merge request pleroma/pleroma!1680
5 years ago
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
5 years ago
a58f29b826
Merge branch 'update-fields-limit' into 'develop'
...
Set `account_field_value_length` limit to 2048 by default
Closes #1249
See merge request pleroma/pleroma!1678
5 years ago
d6ab78e610
Set `account_field_value_length` limit to 2048 by default
5 years ago
085d014f08
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
5 years ago
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
5 years ago
409e701ab8
Merge branch 'fix/develop' into 'develop'
...
Add "Streamer refactoring" back to `develop`
See merge request pleroma/pleroma!1675
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
4397a3fe4a
Merge branch 'fix/signed-fetch-inclusion-test' into 'develop'
...
Fix signed fetch inclusion publisher test
See merge request pleroma/pleroma!1676
5 years ago
e8120944d8
Fix signed fetch inclusion publisher test
...
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
5 years ago
fe7fd33126
Merge branch 'revert-4fabf83a' into 'develop'
...
Revert "Merge branch 'streamer-refactoring' into 'develop'"
See merge request pleroma/pleroma!1674
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
4fabf83ad0
Merge branch 'streamer-refactoring' into 'develop'
...
Streamer refactoring
See merge request pleroma/pleroma!1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
5 years ago
d1a84ceec8
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
...
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
5 years ago
74eba5afe2
Merge branch 'fix/race-in-tests' into 'develop'
...
Fix a race condition in tests
See merge request pleroma/pleroma!1673
5 years ago
ca88e37a8f
Fix a race condition in tests
5 years ago
2990c0a53b
Merge branch '1149-oban-job-queue' into 'develop'
...
[#1149 ] `oban`-based job & retry queues
Closes #1149
See merge request pleroma/pleroma!1518
5 years ago
b4cf74c106
added prepare html for RichMedia.Parser
5 years ago
8751809e1e
Merge branch 'develop' into support/tests
5 years ago
3b8ec98b0e
[ #1149 ] Reinstated docs/config.md changes.
5 years ago
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
9c64a25713
Merge branch 'config-changes' into 'develop'
...
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
5 years ago
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
5 years ago
e127b9ab6d
[ #1149 ] Rewritten readme as config/description.exs.
5 years ago
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
3ae448b592
Merge branch 'fix-tests' into 'develop'
...
Fix `Activity.all_by_actor_and_id/2` test
See merge request pleroma/pleroma!1668
5 years ago
b870ae08fd
Fix `Activity.all_by_actor_and_id/2` test
5 years ago
Alex S