Merge branch 'develop' into refactor/notification_settings
[akkoma] / priv / static / static / config.json
2020-07-13 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-07-13 feldMerge branch 'fix/mediaproxy-cache-settings-types'...
2020-07-10 Mark FelderMerge branch 'develop' into issue/1790-updated-oban
2020-07-10 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-09 Mark FelderMerge branch 'develop' into fix/csp-for-captcha
2020-07-09 lainMerge branch '1723-token-fixes' into 'develop'
2020-07-09 lainMerge branch 'bugfix/status-deletion' into 'develop'
2020-07-08 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-08 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-08 lainMerge branch '1895-hashtag-timeline-restrict-unauthenti...
2020-07-08 HaelwennMerge branch '1918-avatar-background-header-reset-2...
2020-07-08 HaelwennMerge branch 'fix/twitter-rich-media-preview' into...
2020-07-07 lainMerge branch 'remove-twitter-api' into 'develop'
2020-07-06 lainUpdate frontend
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-21 lainMerge branch 'features/emoji_stealer' into 'develop'
2020-05-21 lainMerge branch 'issue/749' into 'develop'
2020-05-20 lainMerge branch 'feature/1734-user-deletion' into 'develop'
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-18 Roman ChvanikovMerge branch 'develop' into feature/admin-api-status...
2020-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-17 lainMerge branch 'feature/remove-settings-that-shouldnt...
2020-05-17 lainMerge branch 'pleroma-fe-2020-05-13-with-relationships...
2020-05-17 lainMerge branch 'restricted-relations-embedding' into...
2020-05-16 lainMerge branch 'features/mastoapi_v2_media' into 'develop'
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'
next