Merge branch 'develop' into 'remove-twitter-api'
[akkoma] / priv / static / static / config.json
2020-05-16 lainMerge branch 'develop' into 'remove-twitter-api'
2020-05-15 lainMerge branch 'chore/update-fe-settings-and-docs' into...
2020-05-13 Mark FelderSync FE static/config.json
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-30 kPheroxMerge remote-tracking branch 'upstream/develop' into...
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-27 kaniiniMerge branch 'update/docs-jp' into 'develop'
2019-09-16 Maxim FilippovMerge branch 'develop' into feature/return-total-for...
2019-09-14 rinpatchMerge branch 'fix/truncate-remote-user-fields' into...
2019-09-13 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-09 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-09-07 Maksim PechnikovMerge branch 'develop' into support/tests
2019-09-06 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-06 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-09-06 rinpatchMerge branch 'so-long-twitterapi' into 'develop'
2019-09-06 rinpatchMerge branch 'update-frontend-e75ac9dd' into 'develop'
2019-09-06 rinpatchUpdate frontend bundle to e75ac9dd
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-21 kaniiniMerge branch 'oauth_secure_redirect' into 'develop'
2019-06-20 rinpatchMerge branch 'feature/release-update-script' into ...
2019-06-19 rinpatchMerge branch 'begone-the-dot-hack' into 'develop'
2019-06-19 lainMerge branch 'fix/rich-media-hashtags-again' into ...
2019-06-19 lainMerge branch 'update-frontend-c4fcdc71' into 'develop'
2019-06-18 rinpatchUpdate bundled pleroma-fe to c4fcdc71
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-07 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification...
2019-04-30 Roman ChvanikovMerge develop
2019-04-27 kaniiniMerge branch 'feature/bbcode' into 'develop'
2019-04-27 kaniiniMerge branch 'update/pleroma-fe-20190426' into 'develop'
2019-04-27 William Pitcockupdate pleroma frontend
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-03-04 Karen KonouMerge branch 'bugfix/delete-activity-audience' of git...
2019-02-22 kaniiniMerge branch 'fix/twittercards' into 'develop'
2019-02-21 lambdaMerge branch 'bugfix/httpsig-sign-date' into 'develop'
2019-02-21 lambdaMerge branch 'bugfix/as2-accept-json' into 'develop'
2019-02-21 lambdaMerge branch '2019-02-21-update-frontend' into 'develop'
2019-02-21 lainupdate frontend
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-08 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-08 rinpatchMerge branch 'develop' into feature/keyword-policy
2019-02-06 HaelwennMerge branch 'bugfix/rich-media-card' into 'develop'
2019-02-06 kaniiniMerge branch 'add-admin-and-moderator-fields' into...
2019-02-06 rinpatchMerge branch 'fix/activitypub-user-view-badmap' into...
2019-02-06 lambdaMerge branch '2019-02-06-update-frontend' into 'develop'
2019-02-06 lainupdate frontend
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop'
2019-02-01 hrefMerge branch '534_federation_targets_reachability'...
2019-01-31 HaelwennMerge branch 'docs/pleroma-api-invite-token' into ...
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-31 HaelwennMerge branch 'features/glitch-soc-frontend' into 'develop'
2019-01-31 Egor KislitsynMerge remote-tracking branch 'MAIN/develop' into featur...
2019-01-30 lambdaMerge branch 'multiple-hackney-pools' into 'develop'
2019-01-30 lambdaMerge branch '2019-1-30-update-frontend' into 'develop'
2019-01-30 lainupdate frontend
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop'
2019-01-25 kaniiniMerge branch 'develop' into 'oembed_provider'
2019-01-25 kaniiniMerge branch 'classic-flakeids' into 'develop'
2019-01-25 kaniiniMerge branch 'update/pleroma-fe-20190125' into 'develop'
2019-01-25 William Pitcockupdate pleroma frontend
2019-01-13 rinpatchResolve merge conflict
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-19 raenoMerge branch 'develop' into oembed_provider
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
next