Merge remote-tracking branch 'upstream/develop' into feature/move-activity
[akkoma] / lib / pleroma / config /
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-22 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-20 lainMerge branch 'feature/custom-fields' into 'develop'
2019-08-19 lainMerge branch 'develop' into 'fix/reverse-proxy-body...
2019-08-16 lainMerge branch 'pleroma-conversations' into 'develop'
2019-08-14 Maxim FilippovMerge branch 'develop' into 'fix/admin-api-user-deletion'
2019-08-14 rinpatchMerge branch 'misc-otp-issues' into 'develop'
2019-08-14 stwfuse default child_specs
2019-07-20 rinpatchResolve merge conflicts
2019-07-18 Maxim FilippovMerge branch 'develop' into feature/admin-api-user...
2019-07-16 Roman ChvanikovMerge develop
2019-07-16 rinpatchMerge branch 'bugfix/poll-id-as-string' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-15 kaniiniMerge branch 'sha512-crypt' into 'develop'
2019-07-15 Sachin JoshiMerge branch 'develop' into match-file-name
2019-07-15 kaniiniMerge branch 'update-tzdata' into 'develop'
2019-07-15 kaniiniMerge branch 'admin-configure-atom-keys' into 'develop'
2019-07-15 Alex Satom keys with leading :
2019-07-12 Roman Chvanikovmerge develop
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-10 kaniiniMerge branch 'release/listener' into 'develop'
2019-07-10 kaniiniMerge branch 'fix/license-attribution' into 'develop'
2019-07-10 feldAdd license/copyright to all project files
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-28 lainMerge branch 'release-docs' into 'develop'
2019-06-26 rinpatchMerge branch 'update-mastofe/glitch-soc-2019-06-26...
2019-06-23 kaniiniMerge branch 'bind-to-localhost' into 'develop'
2019-06-23 kaniiniMerge branch 'rich_media_titles_two' into 'develop'
2019-06-23 kaniiniMerge branch 'admin-config' into 'develop'
2019-06-23 Alex Ssupport for config groups
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-16 HaelwennMerge branch 'fix/sanitize-report-content' into 'develop'
2019-06-16 rinpatchMerge branch 'fix/991-version-generation' into 'develop'
2019-06-16 lainMerge branch 'fix-for-new-isntances' into 'develop'
2019-06-16 Alexander Strizhakovfix for new instances
2019-06-15 lainMerge branch 'bugfix/980-polls-double-vote' into 'develop'
2019-06-15 kaniiniMerge branch '963_oob_oauth_redirect_fix' into 'develop'
2019-06-14 rinpatchMerge branch 'feature/add-background-image-to-mastoapi...
2019-06-14 kaniiniMerge branch 'feature/905-dynamic-configuration-in...
2019-06-14 Alexander Strizhakovit is changed in compile time
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-29 Roman ChvanikovMerge develop
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-16 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-15 kaniiniMerge branch 'fix/public-option-not-working' into ...
2019-05-15 lambdaMerge branch 'chore/extricate-http-signatures' into...
2019-05-15 lambdaMerge branch 'cleanup' into 'develop'
2019-05-15 rinpatchMerge branch 'legacy-fe-config' into 'develop'
2019-05-15 Sachin Joshiremove deprecated PleromaFE configuration
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I...
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop'
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop'
2019-03-13 Haelwenn (lanodan... [Credo] Remove parentesis on argument-less functions
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-08 rinpatchMerge branch 'develop' into feature/keyword-policy
2019-02-06 rinpatchMerge branch 'fix/activitypub-user-view-badmap' into...
2019-02-05 kaniiniMerge branch 'fix-dm-index' into 'develop'
2019-02-05 kaniiniMerge branch 'feature/split-hide-network-v2' into ...
2019-02-04 HaelwennMerge branch 'feature/mrf-tag' into 'develop'
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-04 rinpatchMerge branch 'hotfix/hellthread-deprecation-warning...
2019-02-04 Karen Konoufix hellthread threshold deprecation warning
2019-02-04 kaniiniMerge branch 'mime-riff' into 'develop'
2019-02-04 rinpatchMerge branch 'fix/rich-media-relative-path' into 'develop'
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-04 rinpatchMerge branch 'feature/hellthread-filter-improvements...
2019-02-03 Karen Konouimplemented tweaks
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop'
2019-02-01 hrefMerge branch '534_federation_targets_reachability'...
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-29 kaniiniMerge branch 'bugfix/fix-rejects' into 'develop'
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-28 lainPut deprecation warnings undre Pleroma.Config.