Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / config / dev.exs
2019-04-08 lambdaMerge branch 'improve_upgrade_user_from_ap_id' into...
2019-04-08 lambdaMerge branch 'twitter_oauth' into 'develop'
2019-04-08 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-04 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-02 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-01 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-03-18 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-11 Ivan TashkinovSign in via Twitter (WIP).
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop'
2019-02-17 lambdaMerge branch 'develop' into 'docs/add-clients-to-ex_doc'
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-14 kaniiniMerge branch 'fix/credo-issues-test' into 'develop'
2019-02-13 Karen KonouMerge branch 'develop' into hellthread-filter-fix
2019-02-12 kaniiniMerge branch 'feature/csp_mastofe-dev' into 'develop'
2019-02-12 Haelwenn (lanodan... config/dev.exs: Don’t put secure cookies on dev
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-18 rinpatchMerge branch 'develop' into fix/formatter-ignore-html...
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-18 raenoMerge branch 'develop' into oembed_provider
2018-12-17 lambdaMerge branch 'captcha' into 'develop'
2018-12-17 lambdaMerge branch 'test-mix-tasks' into 'develop'
2018-12-17 lambdaMerge branch 'testfix/webfinger-jrd' into 'develop'
2018-12-16 HaelwennMerge branch 'develop' into 'develop'
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop'
2018-12-16 ealMerge branch 'fix/dev-exs-enable-unsecure-cookies-by...
2018-12-16 Rin ToshakaEnable unsecure cookies by default in dev.exs
2018-12-14 raenoMerge branch 'develop' into oembed_provider
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-14 hrefMerge branch '114_user_registration_emails' into 'develop'
2018-12-14 Ivan Tashkinov[#114] Addressed MR comments. Removed functionality...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-03 lambdaMerge branch 'fix-media-proxy-defaults' into 'develop'
2018-12-02 rinpatchMerge branch 'develop' into fix/theora-detection-read...
2018-12-01 kaniiniMerge branch 'validate-user-info' into 'develop'
2018-12-01 lambdaMerge branch 'fix/config-replace-try-catch-with-file...
2018-12-01 rinpatchreplace try/catch with File.Exists? in dev.exs
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2018-03-08 lambdaMerge branch 'feature/activitypub' into 'develop'
2018-03-08 lainMerge branch 'develop' into feature/activitypub
2018-02-24 lainLonger header lenght.
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-23 Lain IwakuraAdd configuration generation tool, update readme.
2017-09-15 Roger BraunAdd instance config options.
2017-03-29 Roger BraunBasic file uploading via TwAPI.
2017-03-17 Roger BraunPhoenix skeleton