summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-12-03Merge branch 'update-pleroma-frontend' into 'develop'kaniini
2018-12-03update-pleroma-frontendhakabahitoyo
2018-12-02Merge branch 'user_info_fixes_again' into 'develop'Haelwenn
2018-12-03Merge branch 'develop' into fix/theora-detection-read-bytesrinpatch
2018-12-03Change @read_bytes to 35rinpatch
2018-12-02F O R M A T I N GRin Toshaka
2018-12-02Move generate_invite to user.exRin Toshaka
2018-12-02Format filesMaxim Filippov
2018-12-02Refactor copypasta to a private function in instance.exRin Toshaka
2018-12-02Parse user's bio on registerMaxim Filippov
2018-12-02Lint fixRin Toshaka
2018-12-02Move gen.instance to instance.exRin Toshaka
2018-12-02TwitterAPI: Implement hide_network.lain
2018-12-02Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fi...Rin Toshaka
2018-12-02MastodonApi: Implement hide_network.lain
2018-12-02Hide network in ap.lain
2018-12-02Fix media proxy config defaultshref
2018-12-02Add uuid generation extension to sample_psql.eex.lain
2018-12-02Fix background updating / handling.lain
2018-12-02Lint fixRin Toshaka
2018-12-02Add admin option to pleroma.user new. Add user existence checking to toggle_a...Rin Toshaka
2018-12-01Merge branch 'validate-user-info' into 'develop'kaniini
2018-12-01Move set_admin task to lib/mix/tasks/pleroma/user.exrinpatch
2018-12-01Delete reactivate user taskrinpatch
2018-12-01Fix toggle_deactivated to reactivate a deactivated userrinpatch
2018-12-01Merge branch 'fix/config-replace-try-catch-with-file-exists' into 'develop'lambda
2018-12-01Attempt to resolve merge conflictrinpatch
2018-12-01replace try/catch with File.Exists? in dev.exsrinpatch
2018-12-01More fixes for Info schema.lain
2018-12-01TwitterAPI: Fix banner and background update.lain
2018-12-01Genereate uuids for existing info fields.lain
2018-12-01Fix masto api user updating.lain
2018-12-01Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-us...lain
2018-12-01Fix admin api.lain
2018-12-01Merge branch 'feature/anonymize-filenames' into 'develop'kaniini
2018-11-30Upload filter: anonymize filenamehref
2018-11-30Merge branch 'feature/reverse-proxy' into 'develop'kaniini
2018-11-30Reverse proxy: default max read duration at 30 secs.href
2018-11-30Merge branch 'config-delete' into 'develop'lambda
2018-11-30Merge branch 'supervisor-order' into 'develop'lambda
2018-11-30Fix supervisor orderhref
2018-11-30Pleroma.Config.delete/1href
2018-11-30MIME: video/audio ogg detectionhref
2018-11-30Config docshref
2018-11-30Upload: bring back base_urlhref
2018-11-30Fix deprecation warningshref
2018-11-30remove ealhref
2018-11-30Uploads fun, part. 2href
2018-11-30reverse_proxy: more headershref
2018-11-30Parse correctly content-type & do not forward content-lengthhref