summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-03-08Correctly identify release.v0.9.99lain
2019-03-08Merge branch 'master' of git.pleroma.social:pleroma/pleromalain
2019-03-08Merge branch 'hotfix-0.9.99'lain
2019-03-08Bump version to 0.9.99.lain
2019-03-08Add changelog.lain
2019-03-08Update frontendlain
2019-03-01Merge branch 'cherry-pick-877-to-master' into 'master'rinpatch
2019-03-01activitypub: fix date header formatWilliam Pitcock
2019-02-22Bump version.v0.9.9lain
2019-02-21activitypub: sign http date headerWilliam Pitcock
2019-02-21mix: add timex dependencyWilliam Pitcock
2019-02-21tests: fix formattingWilliam Pitcock
2019-02-21fix fetching AP objects with application/jsonWilliam Pitcock
2019-02-21tests: add test for fetching AP objects with application/json.William Pitcock
2019-02-19add nginx rewrite rule for mediaproxyiodine
2019-02-19Remove slicing.lain
2019-02-19update frontendlain
2019-02-11Revert "Do object insertion through Cachex"lain
2019-02-10Do object insertion through Cachexlain
2019-02-09Disable rich media by default.lain
2019-02-08Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'lambda
2019-02-08Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'lambda
2019-02-08Merge branch 'oauth2_strengthening' into 'develop'lambda
2019-02-07OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security bre...Ivan Tashkinov
2019-02-07mark streaming feature for ios apps in readmehakabahitoyo
2019-02-07Merge branch 'remove-pawoo-apps-from-readme' into 'develop'kaniini
2019-02-07Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'kaniini
2019-02-07Mark streaming feature for Apps in README.mdhakabahitoyo
2019-02-07Update README.mdHakaba Hitoyo
2019-02-06Merge branch 'rename-followings' into 'develop'kaniini
2019-02-06hide_followings was renamed to hide_followers in the FE, but never synced up ...Mark Felder
2019-02-06Merge branch 'bugfix/rich-media-card' into 'develop'Haelwenn
2019-02-06tests: add a rich media card that contains all relevant fieldsWilliam Pitcock
2019-02-06Merge branch 'add-admin-and-moderator-fields' into 'develop'kaniini
2019-02-06test: add some regression tests for the rich media card renderingWilliam Pitcock
2019-02-06mastodon api: rich media: don't clobber %URI struct with a stringWilliam Pitcock
2019-02-06Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'Haelwenn
2019-02-06adds a couple of explicit examples for ExSysloggerMichael Loftis
2019-02-06Merge branch 'fix/activitypub-user-view-badmap' into 'develop'rinpatch
2019-02-06Fix if clause in activity_pub user_viewhref
2019-02-06rids the duplicate timestamp from default ExSyslogger configMichael Loftis
2019-02-06Split hide_networ only for local usersMaxim Filippov
2019-02-06Merge branch '2019-02-06-update-frontend' into 'develop'lambda
2019-02-06update frontendlain
2019-02-06Allow to configure visibility for admin and moderator badgeseugenijm
2019-02-06Add is_admin and is_moderator boolean fields to the user vieweugenijm
2019-02-05Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'rinpatch
2019-02-05rich media: parser: reject any data which cannot be explicitly encoded into JSONWilliam Pitcock
2019-02-05Merge branch 'fix-dm-index' into 'develop'kaniini
2019-02-05Merge branch 'feature/ap-c2s-whoami' into 'develop'kaniini