Merge branch 'fix_486' into 'develop'
[akkoma] / priv / static / static / config.json
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-02 rinpatchMerge branch 'fix/reserve-media-username' into 'develop'
2019-01-01 kaniiniMerge branch 'pool-usage' into 'develop'
2019-01-01 rinpatchMerge branch 'configurable-federator' into 'develop'
2019-01-01 lambdaMerge branch '2019-1-1-update-frontend' into 'develop'
2019-01-01 lainupdate frontend
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-30 Rin ToshakaResolve merge conflict
2018-12-29 HaelwennMerge branch 'fix_485' into 'develop'
2018-12-29 lambdaMerge branch '2018-12-29-update-frontend' into 'develop'
2018-12-29 lainupdate frontend
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-23 lambdaMerge branch 'hotfix/activity-without-content' into...
2018-12-20 lambdaMerge branch 'ci-test-fix' into 'develop'
2018-12-20 kaniiniMerge branch '114_email_confirmation' into 'develop'
2018-12-20 kaniiniMerge branch 'documentation/copy-pleroma-api' 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 lambdaMerge branch 'new-routes-integration' into 'develop'
2018-12-18 lainupdate frontend
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-10 lambdaMerge branch '2018-12-10-update-frontend' into 'develop'
2018-12-10 lainupdate frontend
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-09 Maxim FilippovUse "~" as a route namespace symbol on FE
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-05 lainMerge remote-tracking branch 'origin' into follower...
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-03 lambdaMerge branch 'fix/parse-user-bio' into 'develop'
2018-12-03 lambdaMerge branch 'fix-media-proxy-defaults' into 'develop'
2018-12-03 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-12-03 hakabahitoyoupdate-pleroma-frontend
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-14 lambdaMerge branch 'fix-media-proxy-filename' into 'develop'
2018-11-14 kaniiniMerge branch 'update/pleroma-fe-20181114' into 'develop'
2018-11-14 William Pitcockupdate pleroma frontend
2018-10-25 kaniiniMerge branch 'finmoji-optional' into 'develop'
2018-10-25 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-10-23 scarlettupdate pleroma-fe
2018-09-09 kaniiniMerge branch 'bugfix/test-circular-reference' into...
2018-09-09 kaniiniMerge branch 'update/pleroma-fe-20180909' into 'develop'
2018-09-09 William Pitcockupdate pleroma frontend
2018-09-07 kaniiniMerge branch 'add-secure-and-samesite-cookie-flags...
2018-09-07 kaniiniMerge branch 'improve-server-config-examples' into...
2018-09-03 kaniiniMerge branch 'feature/mastodon_api_2.4.x' into 'develop'
2018-09-02 kaniiniMerge branch 'hotfix_broken_likes' into 'develop'
2018-08-31 kaniiniMerge branch 'update/pleroma-fe-20180831' into 'develop'
2018-08-31 William Pitcockupdate pleroma frontend
2018-08-27 William PitcockRevert "enable scope options and such"
2018-08-27 William Pitcockenable scope options and such
2018-08-27 lambdaMerge branch 'bugfix/announce-timeline-flooding' into...
2018-08-26 kaniiniMerge branch 'feature/emoji-in-local-users' into 'develop'
2018-08-26 kaniiniMerge branch 'develop' into 'feature/relay'
2018-08-20 ealMerge branch 'fix/redirect-on-user-fetch' into 'develop'
2018-08-20 kaniiniMerge branch 'update/pleroma-fe-20180820' into 'develop'
2018-08-20 William Pitcockupdate pleroma frontend
2018-08-16 kaniiniMerge branch 'fix/put-repeats-at-activitypub-outbox...
2018-08-12 lambdaMerge branch 'feature/invites' into 'develop'
2018-06-16 squidboiMerge branch 'develop' into feature/configurable-blocks
2018-06-16 lambdaMerge branch 'feature/configure-mrf-rejectnonpublic...
2018-06-14 lambdaMerge branch 'feature/twitterapi-unrepeat' into 'develop'
2018-06-12 lainupdate frontend
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-22 csaurusMerge branch 'develop' into feature/mstdn-direct-api
2018-05-20 lambdaMerge branch 'feature/account-deletion' into 'develop'
2018-05-19 lambdaMerge branch 'feature/remote-user-deactivation' into...
2018-05-16 lainupdate frontend
2018-05-13 lambdaMerge branch 'feature/unrepeats' into 'develop'
2018-05-13 lainMerge branch 'develop' into kaniini/pleroma-bugfix...
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-29 lainupdate frontend
2018-04-28 lambdaMerge branch 'fix/blocked-user-boosts' into 'develop'
2018-04-28 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2018-04-27 lambdaMerge branch 'bugfix/mrf-simple-media-stripping' into...
2018-04-26 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-26 lainResurrect instance specific panel.
2018-04-23 lainupdate frontend
2018-04-21 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-21 lambdaMerge branch '146-enable-custom-panel-by-default-and...
2018-04-20 Kawenenable instance panel by default, added some content
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-31 lainupdate frontend
2018-02-12 lainMerge branch 'develop' into feature/activitypub
2018-02-12 lainMerge branch 'hakabahitoyo/pleroma-feature/atom-feed...
2018-02-11 lainupdate frontend
2018-02-11 lainupdate frontend
2018-02-11 lambdaMerge branch 'feature/instance-specific-panel' into...
2018-02-11 Hakaba HitoyoMerge remote-tracking branch 'hakabahitoyo/feature...
2018-02-11 Roger BraunMerge branch 'develop' into feature/activitypub
2018-02-09 Roger Braunupdate frontend
2018-02-08 lambdaMerge branch 'fix/config-disable-chat' into 'develop'
2018-02-07 Roger Braunupdate frontend
2018-02-03 Hakaba Hitoyoadd backend default for instance specific panel
2018-01-30 Roger BraunMerge branch 'hakabahitoyo/pleroma-feature/atom-feed...
2018-01-30 lambdaMerge branch 'pr-upstream-http-proxy' into 'develop'
2018-01-30 lambdaMerge branch 'feature/caddyfile' into 'develop'
next