about summary refs log tree commit diff
path: root/config
AgeCommit message (Expand)Author
2018-04-14Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-14Add bio fields (#6645)Eugen Rochko
2018-04-14Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-14Merge remote-tracking branch 'glitchsoc/master' into gs-masterDavid Yip
2018-04-13Merge pull request #419 from ThibG/glitch-soc/features/bookmarksDavid Yip
2018-04-13Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-13i18n: Add Japanese translations for privacy policy and more (#7049)mayaeh
2018-04-12Upgrade Rails to version 5.2.0 (#5898)Yamagishi Kazutoshi
2018-04-12Merge remote-tracking branch 'tootsuite/master'David Yip
2018-04-11update gem, test pam authentication (#7028)Alexander
2018-04-11Add backend support for bookmarksThibaut Girka
2018-04-11Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-10Feature: Improve reports ui (#7032)Emelia Smith
2018-04-10Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)Eugen Rochko
2018-04-10Feature: Allow staff to change user emails (#7074)Emelia Smith
2018-04-10Log rate limit hits (#7096)Eugen Rochko
2018-04-09i18n: Update Polish translation (#7085)Marcin Mikołajczak
2018-04-08Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-08Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)ThibG
2018-04-07Add a circuit breaker for ActivityPub deliveries (#7053)Eugen Rochko
2018-04-07i18n: improve "Welcome" translation in Portuguese (#7068)Hisham Muhammad
2018-04-04Adjust privacy policy (#6666)Eugen Rochko
2018-04-04Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-04i18n: Update Polish translation (#7037)Marcin Mikołajczak
2018-04-04Add contact account to landing page ("Administered by") (#6984)Eugen Rochko
2018-04-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-03Fix french wording of reblogged toots in public views, matching the wording o...ThibG
2018-04-03i18n: Add Japanese translations for #7000 (#7022)mayaeh
2018-04-02Feature: Report improvements (#6967) (#7000)Emelia Smith
2018-04-02Implement the ability for an Administrator or Moderator to remove an account ...Emelia Smith
2018-04-02Weblate translations (2018-04-02) (#7007)Yamagishi Kazutoshi
2018-04-02Russian language updated (#7005)Evgeny Petrov
2018-04-02i18n: update zh-HK translation (#7004)luzi82
2018-04-01Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-01improve zh-HK localization by referring zh-TW and zh-CN (#6988)luzi82
2018-03-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-03-27Cache media (#6902)Akihiko Odaki
2018-03-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-25i18n: Update Polish translation (#6903)Marcin Mikołajczak
2018-03-24Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)Yamagishi Kazutoshi
2018-03-24Note if the user is already following the target when authorizing follow (#6325)Akihiko Odaki
2018-03-24Invites: Add '1 week' as expire option (#6872)Jeroen
2018-03-24Weblate translations (2018-03-23) (#6874)Yamagishi Kazutoshi
2018-03-23Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-23[i18n] Occitan update (#6869)Quentí
2018-03-20Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-20Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)Eugen Rochko
2018-03-20Fix i18n fallback configuration conflicts with environment configurations (#6...Akihiko Odaki
2018-03-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-19rename pam email environment variable to something more understandable and de...Alexander