| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-09-15 | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1149-oban-job-queue # Conflicts: # docs/config.md | |||
| 2019-09-14 | Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1' | rinpatch | |
| Backport a test fix to 1.1 See merge request pleroma/pleroma!1671 | |||
| 2019-09-14 | Merge branch 'fix-tests' into 'develop' | rinpatch | |
| Fix `Activity.all_by_actor_and_id/2` test See merge request pleroma/pleroma!1668 (cherry picked from commit 3ae448b592214b43af1d079c997c6f6b91d31aeb) b870ae08 Fix `Activity.all_by_actor_and_id/2` test | |||
| 2019-09-14 | Merge branch 'cherry-pick-9c64a257' into 'maint/1.1' | rinpatch | |
| Backport config.md readdition to 1.1 See merge request pleroma/pleroma!1670 | |||
| 2019-09-14 | Merge branch 'config-changes' into 'develop' | rinpatch | |
| two separate files for config.md and generated config.md See merge request pleroma/pleroma!1666 (cherry picked from commit 9c64a25713790fefa8b5c419aeadf55113c17073) 69faec03 markdown generation to the new file c625fe6f config.md back 4da0da9a don't track generated_config.md | |||
| 2019-09-14 | Merge branch 'config-changes' into 'develop' | rinpatch | |
| two separate files for config.md and generated config.md See merge request pleroma/pleroma!1666 | |||
| 2019-09-14 | Merge branch 'fix/truncate-remote-user-fields' into 'develop' | rinpatch | |
| Truncate remote user fields See merge request pleroma/pleroma!1619 | |||
| 2019-09-14 | Merge branch 'develop' into refactor/subscription | Roman Chvanikov | |
| 2019-09-14 | [#1149] Rewritten readme as config/description.exs. | Ivan Tashkinov | |
| 2019-09-14 | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock | |||
| 2019-09-14 | Merge branch 'fix-tests' into 'develop' | rinpatch | |
| Fix `Activity.all_by_actor_and_id/2` test See merge request pleroma/pleroma!1668 | |||
| 2019-09-14 | Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1' | rinpatch | |
| Backport/fav reblog access control See merge request pleroma/pleroma!1669 | |||
| 2019-09-14 | Fix `Activity.all_by_actor_and_id/2` test | Egor Kislitsyn | |
| 2019-09-14 | Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs | rinpatch | |
| 2019-09-14 | Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs | rinpatch | |
| 2019-09-14 | Mastodon API: Respect post privacy in favourited/reblogged endpoints | rinpatch | |
| 2019-09-14 | Merge branch 'security/fav-reblog-access-control' into 'develop' | rinpatch | |
| Mastodon API: Respect post privacy in favourited/reblogged endpoints See merge request pleroma/pleroma!1667 | |||
| 2019-09-14 | Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs | rinpatch | |
| 2019-09-14 | Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs | rinpatch | |
| 2019-09-14 | Mastodon API: Respect post privacy in favourited/reblogged endpoints | rinpatch | |
| 2019-09-13 | Merge branch 'capture-test-errors' into 'develop' | lain | |
| Capture test error messages where appropriate See merge request pleroma/pleroma!1665 | |||
| 2019-09-13 | Merge branch 'refactor/add_link_headers' into 'develop' | lain | |
| Refactor `add_link_headers/7` -> `add_link_headers/3` See merge request pleroma/pleroma!1636 | |||
| 2019-09-13 | Merge branch 'develop' into feature/delivery-tracking | rinpatch | |
| 2019-09-13 | Disallow NULLs in deliveries | rinpatch | |
| 2019-09-13 | Emoji: Generate emoji detecting functions at compile time. | lain | |
| Suggested by jvalim | |||
| 2019-09-13 | don't track generated_config.md | Alex S | |
| 2019-09-13 | config.md back | Alex S | |
| 2019-09-13 | markdown generation to the new file | Alex S | |
| 2019-09-13 | Capture test error messages where appropriate | stwf | |
| 2019-09-13 | Separate Subscription Notifications from regular Notifications | Roman Chvanikov | |
| 2019-09-13 | Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex | rinpatch | |
| 2019-09-13 | Apply suggestion to lib/pleroma/delivery.ex | rinpatch | |
| 2019-09-13 | Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex | rinpatch | |
| 2019-09-13 | Merge branch 'cleanup-activity' into 'develop' | lain | |
| Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623 | |||
| 2019-09-13 | Linting. | lain | |
| 2019-09-13 | Merge remote-tracking branch 'origin/develop' into reactions | lain | |
| 2019-09-13 | Pleroma API Docs: Documented Emoji reaction endpoints. | lain | |
| 2019-09-13 | ActivityPub: Use is_unicode_emoji? function. | lain | |
| 2019-09-13 | Merge branch 'feature/change-email' into 'develop' | Haelwenn | |
| Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580 | |||
| 2019-09-13 | Merge branch 'admin-config-description' into 'develop' | rinpatch | |
| Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611 | |||
| 2019-09-13 | fix formatting | Maksim Pechnikov | |
| 2019-09-13 | fix tests | Maksim Pechnikov | |
| 2019-09-13 | Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex | rinpatch | |
| 2019-09-13 | Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex | rinpatch | |
| 2019-09-13 | Remove unused functions and fix credo issues | rinpatch | |
| 2019-09-13 | Use delivery info when federating deletes | rinpatch | |
| 2019-09-13 | Add a note about compatibility with Mastodon | Egor Kislitsyn | |
| 2019-09-13 | Add email change endpoint | Egor Kislitsyn | |
| 2019-09-13 | Add more tests for Pleroma.Activity | Egor Kislitsyn | |
| 2019-09-13 | Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils | Egor Kislitsyn | |
 |
index : pleroma | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiff |