aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-04-10Participations: Add marking as read and unread.lain
2019-04-10Conversation: Add Conversations and Participations.lain
2019-04-10Conversations: Fix specs.lain
2019-04-08Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-co...lain
2019-04-08Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pl...lain
2019-04-08Merge branch 'use-jobs-in-webpush' into 'develop'lambda
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'lambda
2019-04-08Merge branch 'twitter_oauth' into 'develop'lambda
2019-04-08Merge branch 'feature/697-language-tag-metadata' into 'develop'lambda
2019-04-08adding language tagAlexander Strizhakov
2019-04-08Merge branch 'feature/770-add-emoji-tags' into 'develop'lambda
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08AdminApiControllerTest unused variables fix.Ivan Tashkinov
2019-04-08Merge branch 'develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_o...Ivan Tashkinov
2019-04-08Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'lambda
2019-04-08Merge branch 'scheduled-activities' into 'develop'lambda
2019-04-07[#923] Removed <br> elements from auth forms, adjusted docs, minor auth setti...Ivan Tashkinov
2019-04-06Merge branch 'fix/deactivated-user-error' into 'develop'feld
2019-04-06Add scheduler for sending scheduled activities to the queueeugenijm
2019-04-06Added limits and media attachments for scheduled activities.eugenijm
2019-04-06Handle `scheduled_at` on status creation.eugenijm
2019-04-06Add scheduled activitieseugenijm
2019-04-06Return 403 on oauth token exchange for a deactivated usereugenijm
2019-04-06Merge branch 'fix/failed-legacy-test' into 'develop'feld
2019-04-06Merge branch 'feature/prometheus' into 'develop'feld
2019-04-06Pin recon dependency to 2.4.0Mark Felder
2019-04-06Merge develop to 770-add-emoji-tagsAlex S
2019-04-05Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'Haelwenn
2019-04-05Redirect to the referer url after mastofe authorizationSergey Suprunenko
2019-04-05Mock :crypt.crypt/2 because otherwise the test fails on Mac OSSergey Suprunenko
2019-04-05Merge branch 'revert-8607ae68' into 'develop'rinpatch
2019-04-05Revert "Merge branch 'test-coverage' into 'develop'"rinpatch
2019-04-05Merge branch 'test-coverage' into 'develop'rinpatch
2019-04-05Use --cover option when running CI testsoptikfluffel
2019-04-05Merge branch 'feature/admin-api-follow' into 'develop'feld
2019-04-05We actually want the user id not nickname in the test...Mark Felder
2019-04-05Also remove Repo functions in the testsMark Felder
2019-04-05Redundant Repo.get_by usage was recently removed from the codebaseMark Felder
2019-04-05Document the admin API endpoints for controlling follow/unfollowMark Felder
2019-04-05Add user following / unfollowing to the admin api.Roger Braun
2019-04-05fix credoEgor Kislitsyn
2019-04-05Merge branch 'hotfix/html-sanitization' into 'develop'lambda
2019-04-05Use PleromaJobQueue in Pleroma.Web.PushEgor Kislitsyn
2019-04-05Refactor html caching functions to have a key instead of a module, use more c...rinpatch
2019-04-05[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.Ivan Tashkinov
2019-04-05[#923] OAuthController#callback adjustments (with tests).Ivan Tashkinov
2019-04-04[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_o...Ivan Tashkinov
2019-04-04Merge branch 'develop' into feature/prometheusMark Felder
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 20:54:55 +0000