Commit Graph

12632 Commits (2f8ec8a9ccf7aeec198642b23598b3d7fb4aa10d)
 

Author SHA1 Message Date
Maksim 137b7f9e28 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim e91e2399ee Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim ce11f0bc33 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim 25eb222bed Apply 1 suggestion(s) to 1 file(s)
4 years ago
feld fe7008ee39 Merge branch 'update/admin-fe-20201117' into 'develop'
4 years ago
Mark Felder ad7fc35252 Update AdminFE build to pleroma/admin-fe@5b38aea2790686647a39f505864331bb9838e20d
4 years ago
Mark Felder 415481a4d9 Add test for POST when push is disabled
4 years ago
Mark Felder 3eaa5335c9 Revert adding extra alert types here
4 years ago
Mark Felder d9732fb7d3 Fix incorrect test description
4 years ago
Mark Felder ccddedb504 Credo
4 years ago
Mark Felder ff7a4b6aa2 Test that we ignore invalid subscription alert types separately.
4 years ago
Mark Felder 30f140e570 Ensure all supported push notification subscription alert types are tested
4 years ago
Mark Felder 499faa82f6 Synchronize reaction notification text with PleromaFE's style
4 years ago
Mark Felder 5d0bc5e028 Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
4 years ago
Mark Felder 67a6abd071 Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
4 years ago
Mark Felder 80e21903d4 Spelling
4 years ago
Mark Felder 1433d3c59c Document the API extensions for push subscriptions
4 years ago
Mark Felder 83ec2f1384 Allow subscribing for pleroma:emoji_reaction push notifications
4 years ago
Mark Felder 3ce11b830e Add capability for emoji reaction push notifications
4 years ago
lain e6d4d62f85 Docs: Add info about frontend install error response
4 years ago
lain bb9650f3c2 FrontendController: Return error on installation error.
4 years ago
Mark Felder 56d95203b5 Document fixing the pleroma.user delete_activities mix task
4 years ago
Mark Felder 97201f7e37 Need to start web_resp cache or mix task fails
4 years ago
feld d33b9e7b33 Merge branch 'remove/fedsockets' into 'develop'
4 years ago
rinpatch cf99b1c1fd Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'
4 years ago
Egor Kislitsyn f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn d48dbfab2b
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions
4 years ago
Egor Kislitsyn 79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
rinpatch 2c55f7d7cb Remove FedSockets
4 years ago
lain 61f86774d1 Merge branch 'chores/note-handling-move' into 'develop'
4 years ago
lain fbd6217ed9 Merge branch 'feature/local-only-scope' into 'develop'
4 years ago
lain fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
rinpatch 9b9afe6b3f Merge branch 'fix/debian-install-libmagic-typo' into 'develop'
4 years ago
rinpatch f711a41933 Debian installation guide: fix libmagic header package name
4 years ago
rinpatch c7536f16cb Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'
4 years ago
rinpatch 83ec4aadd6 Merge branch 'chores/tesla_1.4.0' into 'develop'
4 years ago
rinpatch 6c3273892f Merge branch 'sync-stable/2.2.0' into 'develop'
4 years ago
rinpatch 9960383925 .gitattributes: Treat js/css/source maps as binary files
4 years ago
rinpatch 11d8fefa7b CHANGELOG.md: Use a period after every bullet point for unreleased sections
4 years ago
rinpatch ba214f3f16 CHANGELOG.md: Add back an entry for S3 fix
4 years ago
Haelwenn 651fade275 Merge branch 'weblate-pleroma-pleroma' into 'develop'
4 years ago
rinpatch b1fc9fe951 mix.exs: bump development version to 2.2.50 after 2.2.0 release
4 years ago
rinpatch 77c239f309 Import stable commits into develop after releasing 2.2.0
4 years ago
lain 81293e5aad ActivityPubController: Don't return local only objects
4 years ago
Haelwenn (lanodan) Monnier 3f69680ed9
mix.exs: Update tesla to 1.4.0
4 years ago
lain ffc2bb70ff Gitlab CI: Specify image architecture for arm64 images
4 years ago
Guy Sheffer 26b74f4c58 Added translation using Weblate (Hebrew)
4 years ago
lain a81f0a4a7d Merge branch 'fix/s3-uploads-elixir-1.11' into 'develop'
4 years ago
lain 9d4797f61b Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'
4 years ago
Mark Felder b1466661eb Use absolute URLs to thumbnail and background in /api/v1/instance
4 years ago