summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-04-02Fix preview not being usable in form datarinpatch
2019-04-02Merge branch 'fix-slow-relationships' into 'develop'Haelwenn
2019-04-02Merge branch 'bugfix/wrong-date-format' into 'develop'lambda
2019-04-02Merge branch 'feature/fake-statuses' into 'develop'lambda
2019-04-02Merge remote-tracking branch 'origin/develop' into fix-slow-relationshipslain
2019-04-02ActivityPub Utils: Greatly speed up the follow / block activity fetching.lain
2019-04-02Merging develop into feature/770-add-emoji-tagsAlex S
2019-04-02second level of headertext change in docAlex S
2019-04-02syntax highlightingAlex S
2019-04-02Merge branch 'bugfix/share-mastodon' into 'develop'lambda
2019-04-02Merge branch 'remove-user-activities' into 'develop'lambda
2019-04-02Merge branch 'get_by_id' into 'develop'lambda
2019-04-02Merge develop into feature/770-add-emoji-tagsAlex S
2019-04-02Merge branch 'features/pleroma-tan' into 'develop'lambda
2019-04-02Rename fake param to preview and make the tests check that the object was not...rinpatch
2019-04-02Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauthIvan Tashkinov
2019-04-02replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(ni...Egor Kislitsyn
2019-04-02Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'lambda
2019-04-02Merge branch 'get_by_id' into 'develop'lambda
2019-04-02Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'lambda
2019-04-02Fix account lookup for nicknames beginning with numberscascode
2019-04-02[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_o...Ivan Tashkinov
2019-04-02replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`Egor Kislitsyn
2019-04-02replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(ni...Egor Kislitsyn
2019-04-02Added "GET /oauth/authorize" tests.Ivan Tashkinov
2019-04-02change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in testsEgor Kislitsyn
2019-04-02change `Repo.get(User, id)` => `User.get_by_id(id)`Egor Kislitsyn
2019-04-02change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`Egor Kislitsyn
2019-04-02Ignore dates in wrong formatsSergey Suprunenko
2019-04-02add `user delete_activities` mix taskEgor Kislitsyn
2019-04-02test fixAlex S
2019-04-02little changes and typosAlex S
2019-04-02updating custom_emoji docsAlex S
2019-04-02Merge branch 'ci-speedup-2-electric-boogalo' into 'develop'lambda
2019-04-02refactoring of emoji tags config to use groupsAlex S
2019-04-02Merge remote-tracking branch 'pleroma/develop' into remove-user-activitiesEgor Kislitsyn
2019-04-02add support for all status type (ostatus) and replase case with ifSachin Joshi
2019-04-02Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoap...Ivan Tashkinov
2019-04-02remove reduntant services in docs deploy and change job names to kebab caserinpatch
2019-04-02what the fuckrinpatch
2019-04-02huhrinpatch
2019-04-02Separate CI jobs to 3 stages to allow them to be executed in parallelrinpatch
2019-04-02Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop'rinpatch
2019-04-02fetch url for OStatus to know if it is a/c or statusSachin Joshi
2019-04-02router: Add fake identity proof endpointHaelwenn (lanodan) Monnier
2019-04-01Merge branch 'fix/default-mail-adapter' into 'develop'lambda
2019-04-01Merge branch 'documentation-improvements' into 'develop'lambda
2019-04-01Handle dates in the Unix timestamp format (Fixes #763)Sergey Suprunenko
2019-04-01[OStatus] adds status to pleroma instance if the url given is a statusSachin Joshi
2019-04-01COPYING: WordingHaelwenn (lanodan) Monnier