aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-08-29installation/pleroma-apache.conf: Add TLS configuration and security headersshibayashi
2018-08-29installation/pleroma.vcl: Add HTTP security headersshibayashi
2018-08-29installation/caddyfile-pleroma.example: Add Content-Security-Policyshibayashi
2018-08-28installation/pleroma.nginx: Add Content-Security-PolicyHaelwenn (lanodan) Monnier
2018-08-28Merge branch 'feature/s3' into 'develop'kaniini
2018-08-28upload: formattingWilliam Pitcock
2018-08-28upload: add the S3 support itselfWilliam Pitcock
2018-08-28sample config: add S3 public endpoint optionWilliam Pitcock
2018-08-27upload: strip exif data before finalizing the file pathWilliam Pitcock
2018-08-27sample config: show how amazon s3 support is activated, including third-party...William Pitcock
2018-08-27mix: add ex_aws and ex_aws_s3 dependenciesWilliam Pitcock
2018-08-27Revert "enable scope options and such"William Pitcock
2018-08-27enable scope options and suchWilliam Pitcock
2018-08-27formattingWilliam Pitcock
2018-08-27user: fix up notification last calculation [NOT related to upstream]William Pitcock
2018-08-27Merge branch 'feature/relay' into 'develop'lambda
2018-08-27Merge branch 'bugfix/announce-timeline-flooding' into 'develop'lambda
2018-08-26Merge branch 'feature/emoji-in-local-users' into 'develop'kaniini
2018-08-26tests: fix formattingWilliam Pitcock
2018-08-26Merge branch 'bugfix/formatting' into 'develop'kaniini
2018-08-26fix formattingWilliam Pitcock
2018-08-26Merge branch 'tests/notification-smoketests' into 'develop'kaniini
2018-08-26tests: add notification smoketests (ref #265)William Pitcock
2018-08-26Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'kaniini
2018-08-26common api: handle replying to orphaned threadsWilliam Pitcock
2018-08-26Merge branch 'login-with-email' into 'develop'kaniini
2018-08-26Merge branch 'develop' into 'feature/relay'kaniini
2018-08-26Merge branch 'update-pleroma-frontend' into 'develop'kaniini
2018-08-26Merge branch 'improve-example-caddyfile' into 'develop'kaniini
2018-08-26Merge branch 'remove-unused-settings' into 'develop'kaniini
2018-08-26update pleroma frontendhakabahitoyo
2018-08-26remove unused settings from /api/statusnet/confighakabahitoyo
2018-08-26remove unused settingshakabahitoyo
2018-08-26Improve example Caddyfileshibayashi
2018-08-25When logging in, try treating the login as an emailEkaterina Vaartis
2018-08-25Merge branch 'feature/twitterapi-object-description' into 'develop'kaniini
2018-08-25twitter api: provide object descriptions as attachment description fieldWilliam Pitcock
2018-08-24Merge branch 'update/pleroma-fe-20180824' into 'develop'kaniini
2018-08-24update pleroma frontendWilliam Pitcock
2018-08-24Merge branch 'feature/tls-sni-support' into 'develop'kaniini
2018-08-24http: fix TLS server name indicationWilliam Pitcock
2018-08-24Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'kaniini
2018-08-24tests: formattingWilliam Pitcock
2018-08-24Merge branch 'config/fe-collapse-subject' into 'develop'kaniini
2018-08-24formatter: adjust regexp captures to match local users with single character ...William Pitcock
2018-08-24test: add testcase for formatter issue #163William Pitcock
2018-08-24fe config: add collapse_message_with_subject fe optionWilliam Pitcock
2018-08-24Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'd...kaniini
2018-08-24Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'kaniini
2018-08-24add collapseMessageWithSubject in confighakabahitoyo