aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-13Merge branch 'hotfix-0.9.999'v0.9.999lain
2019-03-13Update version.lain
2019-03-13Update frontendlain
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
Cherry pick !877 to master See merge request pleroma/pleroma!880
2019-03-01activitypub: fix date header formatWilliam Pitcock
HTTP date header specification says that days must always be two-digit. Accordingly, change the format string used to ensure days are always represented as two-digit (e.g. 01).
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
This reverts commit 8a270b438c993288853bad94be1daf39f7675e5c.
2019-02-10Do object insertion through Cachexlain
So we don't flood our postgres logs with errors. Should also make things slightly faster.
2019-02-09Disable rich media by default.lain
2019-02-08Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'lambda
Split hide_network only for local users See merge request pleroma/pleroma!781
2019-02-08Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'lambda
Mark streaming feature for iOS apps in readme See merge request pleroma/pleroma!790
2019-02-08Merge branch 'oauth2_strengthening' into 'develop'lambda
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix See merge request pleroma/pleroma!793
2019-02-07OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security ↵Ivan Tashkinov
breach fix. (`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris, and if that happened before /web/login is accessed for the first time then Pleroma used this externally created record with arbitrary redirect_uris and client_secret known by creator).
2019-02-07mark streaming feature for ios apps in readmehakabahitoyo
2019-02-07Merge branch 'remove-pawoo-apps-from-readme' into 'develop'kaniini
Remove Pawoo apps from README.md See merge request pleroma/pleroma!788
2019-02-07Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'kaniini
Mark streaming feature for Apps in README.md See merge request pleroma/pleroma!789
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
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE See merge request pleroma/pleroma!787
2019-02-06hide_followings was renamed to hide_followers in the FE, but never synced up ↵Mark Felder
in the BE This was a dirty regex replace which worked on my server
2019-02-06Merge branch 'bugfix/rich-media-card' into 'develop'Haelwenn
rich media cards: bugfixes and regression tests See merge request pleroma/pleroma!785
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
Add admin and moderator badges to user view and make their visibility configurable See merge request pleroma/pleroma!767
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
Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format. See merge request pleroma/pleroma!784
2019-02-06adds a couple of explicit examples for ExSysloggerMichael Loftis
2019-02-06Merge branch 'fix/activitypub-user-view-badmap' into 'develop'rinpatch
Fix if clause in activity_pub user_view See merge request pleroma/pleroma!783
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
update frontend See merge request pleroma/pleroma!780
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
rich media: parser: reject any data which cannot be explicitly encoded into JSON Closes #596 See merge request pleroma/pleroma!779