1792 Commits (6dbb10c4b7b1bfbe740145d1b4ce6d3b6dff9af9)

Author SHA1 Message Date
ThibG b34d6238cb Add API endpoint to list featured accounts (fixes #8315) (#8317)
6 years ago
Oskari Noppa 1d1e0171ec Fix a variable for a Finnish translation (#8299)
6 years ago
Marcin Mikołajczak 62cd097414 i18n: Update Polish translation (#8290)
6 years ago
Thibaut Girka 88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 0fc0980de1
Link to mobile apps page (#8278)
6 years ago
Eugen Rochko 9dd5639f90
Add admin function to deactivate all invites (#8279)
6 years ago
Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 85bb32c410
Add "sign in to participate" message to public toot page (#8200)
6 years ago
Eugen Rochko 78fa926ed5
Add remote interaction dialog for toots (#8202)
6 years ago
Dachi Natsvlishvili bf1bde5d6a Add Georgian language translation (#8250)
6 years ago
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 106fa28a00 Prevent actions log from crashing when displaying deleted status (fixes #8133) (#8219)
6 years ago
ThibG c98681c358 Do not error out when performing admin actions on no statuses (#8220)
6 years ago
Immae b0f4fe456b Add ldap search filter (#8151)
6 years ago
Eugen Rochko fcb527cdd6 Add post-deployment migration system (#8182)
6 years ago
Evgeny Petrov 9e4ac1c12c Added endorse strings, fixed footer 'developers' string (#8183)
6 years ago
Yamagishi Kazutoshi 662a914f5e Weblate translations (2018-08-12) (#8171)
6 years ago
Eugen Rochko 018a9e4e7f
Add post-deployment migration system (#8182)
6 years ago
Evgeny Petrov b7091c6c0f Added endorse strings, fixed footer 'developers' string (#8183)
6 years ago
Yamagishi Kazutoshi 38e39c9366 Weblate translations (2018-08-12) (#8171)
6 years ago
Thibaut Girka 84a2587d44 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi e8b7f3f3e2
Weblate translations (2018-08-11) (#8167)
6 years ago
Marcin Mikołajczak 3d7979c2ca i18n: Update Polish translation (#8155)
6 years ago
Evgeny Petrov d2e0818d5a [RU] Updated translation (#8164)
6 years ago
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 90b492143d Introduce OAuth scopes for bookmarks
6 years ago
Eugen Rochko 0dcc1950d1
Update /terms and /about/more to use public layout (#8142)
6 years ago
Eugen Rochko f2404de871
Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Evgeny Petrov 80176a3814 [RU] Translation update: (#8147)
6 years ago
Mozinet 58cc673882 Update fr.yml for 3 spelling mistakes and a typo (#8135)
6 years ago
Marcin Mikołajczak 23b22d0dff i18n: Make Polish translation more gender neutral + update (#8119)
6 years ago
Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 71b318dedc Delete leftovers from keyword_mutes
6 years ago
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko cc56f2230a
Add separate setting for sidebar text (site_short_description) (#8107)
6 years ago
Thibaut Girka 5f1bdca4c8 Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 18831acc10 Weblate translations (2018-07-30) (#8096)
6 years ago
Eugen Rochko 0a3cc246ac Fix size/dimension values in avatar/header hint localizations (#8088)
6 years ago
Thibaut Girka 7317b7b231 Reduce assets precompilation time by about 20%
6 years ago
Eugen Rochko bb71538bb5
Redesign public profiles and toots (#8068)
6 years ago
Marcin Mikołajczak e23b26178a i18n: Update Polish translation (#8084)
6 years ago
Thibaut Girka 6141c2a035 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
abcang 69bf116345 Add secure option to additional cookie (#8069)
6 years ago
Yamagishi Kazutoshi b62ec00d87 Weblate translations (2018-07-25) (#8065)
6 years ago
Thibaut Girka b9d5d8982d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 7e638043b9
Weblate translations (2018-07-18) (#8047)
6 years ago
Thibaut Girka 7dbed4dab9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
abcang 3c3cf7e208 Update supported Node.js version (#8041)
6 years ago
Eugen Rochko 2bcdfcdee3 Add missing translation for admin dashboard trends section (#8040)
6 years ago
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marcin Mikołajczak daacf15d72 i18n: Update Polish translation (#8032)
6 years ago
Eugen Rochko 2354b10eb5
Add admin dashboard (#8029)
6 years ago
Jeong Arm 0f0576ea06 Add missing Korean translations (#8017)
6 years ago
Yamagishi Kazutoshi e9b322d0a6 Upgrade webpack to version v4.x (#6655)
6 years ago
Eugen Rochko 9b75dee316 Weblate translations (2018-07-14) (#8016)
6 years ago
Eugen Rochko e55dce3176
Add federation relay support (#7998)
6 years ago
Thibaut Girka ddfcedcfe4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh 401559c376 Fix whole-word selection and i18n: Add Japanese translation for Whole-word (#8004)
6 years ago
Thibaut Girka 6f0f583abe Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Jeong Arm d1a6b144ef Add missing Korean translation (#7993)
6 years ago
Eugen Rochko ffd444d221
Weblate translations (2018-07-11) (#7992)
6 years ago
Thibaut Girka 402da8065c Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
Eugen Rochko 6b9e03e002
Add API method to remove a suggestion (#7978)
6 years ago
ThibG ef2bcf51d7 Fix french translation of “Keyword or phrase” (#7980)
6 years ago
Marcin Mikołajczak c24d62220d i18n: Update Polish translation (#7968)
6 years ago
Eugen Rochko f89c595ea0
Add admin setting to enable OG previews for sensitive media (#7962)
6 years ago
Eugen Rochko 1f6ed4f86a
Add more granular OAuth scopes (#7929)
6 years ago
Renato "Lond" Cerqueira b2051a6256 Weblate translations (2018-07-05) (#7950)
6 years ago
Eugen Rochko da8fe8079e
Re-add follow recommendations API (#7918)
6 years ago
Eugen Rochko 2092d5c0ad
Improve embeds (#7919)
6 years ago
Marcin Mikołajczak dfd9cd463d i18n: Update Polish translation (#7915)
6 years ago
MIYAGI Hikaru ddd0bb69e1 Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE` (#7901)
6 years ago
Eugen Rochko cdb101340a
Keyword/phrase filtering (#7905)
6 years ago
Yamagishi Kazutoshi 349d0196b2 Weblate translations (2018-06-25) (#7890)
6 years ago
SerCom_KC 11a7f725da i18n: (zh-CN) #7823, #7828 (#7887)
6 years ago
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Isao Sugimoto 80bda9719d fix filter languages label on settings (ja) (#7848)
6 years ago
Eugen Rochko 2a1089839d
Weblate translations (2018-06-19) (#7847)
6 years ago
Yamagishi Kazutoshi 7e9e7c642d Weblate translations (2018-06-18) (#7839)
6 years ago
Quentí eb6573e926 [i18n] Update Occitan for #7823 and #7828 (#7830)
6 years ago
Eugen Rochko a58ec29631
Allow selecting default posting language instead of auto-detect (#7828)
6 years ago
Eugen Rochko 7eec279c7f
Change language opt-out to language opt-in (#7823)
6 years ago
Yamagishi Kazutoshi ea23ef8cb6 Weblate translations (2018-06-16) (#7815)
6 years ago
Jeong Arm 0f6622f7d1 Add missing Korean translations (#7819)
6 years ago
SerCom_KC b469a8d688 Update Chinese (Simplified) Translations (#7816)
6 years ago
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 0df91c7b1e
Add dat, dweb, ipfs, ipns, ssb, gopher protocols to URL extractor (#7810)
6 years ago
Eugen Rochko 53f0452b70
Remove rack-timeout (#7809)
6 years ago
Eugen Rochko ca85658975
Add autofollow option to invites (#7805)
6 years ago
David Yip 5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
6 years ago
David Yip e931cf656d
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
6 years ago
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Yamagishi Kazutoshi 01ee460ceb Weblate translations (2018-06-10) (#7779)
6 years ago
Renato "Lond" Cerqueira 268d90e810 Rename emoji sheet to avoid caching issue (#7777)
6 years ago
SerCom_KC fc132915ec Update Chinese (Simplified) translations (#7769)
6 years ago
Yamagishi Kazutoshi 6671297e7a Weblate translations (2018-06-08) (#7759)
6 years ago
David Yip 8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
6 years ago
Marcin Mikołajczak 2304d52599 🌍🇵🇱 (#7753)
6 years ago
Renato "Lond" Cerqueira d8b4f39007 Weblate translations 20180605 (#7743)
6 years ago
David Yip 97d2df77aa
Add apply-to-mentions option to keyword mute UI. #454.
6 years ago
Eugen Rochko 6b2f4f8c09
"Show" instead of "return to" after (remote)-following (#7718)
6 years ago
David Yip c55263027a
Merge remote-tracking branch 'origin/master' into gs-master
6 years ago
Eugen Rochko 0deb9fa6b9
Remove trending hashtags (#7711)
6 years ago
David Yip d757c8a644
prefs: Note that favourite confirmation applies to Glitch flavour only (#491)
6 years ago
David Yip 3550470c18
Merge remote-tracking branch 'origin/master' into gs-master
6 years ago
Yamagishi Kazutoshi 89c86ee521 Weblate translations (2018-06-02) (#7705)
6 years ago
Yamagishi Kazutoshi 648a22637c Weblate translations (2018-05-31) (#7681)
6 years ago
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 13b60e6a14 Use URL polyfill (#7664)
6 years ago
Eugen Rochko 8bb74e50be
Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)
6 years ago
Akihiko Odaki d95642f6d9 Cache attachments on external host with service worker (#7493)
6 years ago
Eugen Rochko 9bd23dc4e5
Track trending tags (#7638)
6 years ago
Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 62cb3b199f Weblate translations (2018-05-26) (#7624)
6 years ago
Eugen Rochko d87649db07
Disable AMS logging (#7623)
6 years ago
Thibaut Girka 11cc2e099a Merge branch 'master' into glitch-soc/merge-master
6 years ago
Lynx Kotoura 7ea91dcbb3 More polished light theme (#7620)
6 years ago
Jeroen 3f8f5642a1 Added the law requirements for the EU/EEA (#7605)
6 years ago
Thibaut Girka e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f8cf85db3b
Remove pointer to light theme until it is more polished (#7594)
6 years ago
SerCom_KC 4c9d5a500d [WIP] i18n: Update Simplified Chinese translations (#7576)
6 years ago
Evgeny Petrov a744042cf1 [RU] Added mastodon-light string (#7583)
6 years ago
Marcin Mikołajczak 810f92e697 🌍: 🇵🇱⬆️ (#7580)
6 years ago
Thibaut Girka a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
SerCom_KC 41b2cfe5b8 i18n: Update Simplified Chinese translations (#7565)
6 years ago
Sylvhem ea969000a5 Add a light theme (#7027)
6 years ago
Quentí 6eb2bc4348 [i18n] Update for Occitan (#7558)
6 years ago
Evgeny Petrov 0bdda362c9 [RU] Updated strings for 2.4.0 (#7555)
6 years ago
Marcin Mikołajczak 07672e0609 🌍: 🇵🇱⬆️ (#7554)
6 years ago
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 6aa5ea1b5d Weblate translations (2018-05-20) (#7552)
6 years ago
Eugen Rochko 8378b72eba
Ensure push subscription is immediately removed when application is revoked (#7548)
6 years ago
Peter 5910eb9b61 Add :few keys for sk lang plurals (#7551)
6 years ago
Eugen Rochko 4b94e9c65e
Improve payload format of Web Push API now that it's open (#7521)
6 years ago
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
6 years ago
Eugen Rochko 1e02dc8715
Add preference to hide following/followers lists (#7532)
6 years ago
Jenkins 4c0770d6c8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
MIYAGI Hikaru 919eef3098 User agent for WebFinger (#7531)
6 years ago
Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Evgeny Petrov 5e87c79d25 Russian language for 2.4.0 (#7512)
6 years ago
Quentí f60c1d3989 [l10n] Occitan update (#7505)
6 years ago
nightpool dbf65e1b76 Update bot preference text (#7507)
6 years ago
Marcin Mikołajczak ff84c18e3d 🌍: 🇵🇱⬆️ (#7494)
6 years ago
Renato "Lond" Cerqueira 1f74c1dbcb Weblate translations 20180515 (#7496)
6 years ago
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
6 years ago
Akihiko Odaki d8b3f5fb9a Limit environment variables to expose to webpack (#7480)
6 years ago
Yamagishi Kazutoshi 2226d987f9 Add Slovene language (#7475)
6 years ago
Eugen Rochko 97e43ec5f0
Add GET /api/v1/push/subscription REST API (#7471)
6 years ago
ThibG 0f2fbf7d05 Improvements to toots display in admin view (#7452)
6 years ago
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
6 years ago
Eugen Rochko b4fb766b23
Add REST API for Web Push Notifications subscriptions (#7445)
6 years ago
Yamagishi Kazutoshi 9a794067f7 Weblate translations (2018-05-10) (#7438)
6 years ago
Thibaut Girka a8be40933d Ignore tootsuite-specific theme-related translation strings
6 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
6 years ago
Marcin Mikołajczak dc010cc77a 🌍: 🇵🇱⬆️ (#7427)
6 years ago
Eugen Rochko 42cd363542
Bot nameplates (#7391)
6 years ago
Hugo Gameiro ea4e243303 Improve OpenStack v3 compatibility (#7392)
6 years ago
Eugen Rochko 95595ccd21
Add Corsican localization (#7390)
6 years ago
Yamagishi Kazutoshi e571de29bf
Weblate translations (2018-05-06) (#7381)
6 years ago
Shuhei Kitagawa bd10a7e480 Add resend confirmation for admin (#7378)
6 years ago
Eugen Rochko 39efc6d533
Add hint about 7 day cooldown for archive takeout (#7375)
6 years ago
Eugen Rochko b611dbac79
Add contact e-mail hint to 2FA login form (#7376)
6 years ago
Eugen Rochko c7d1a2e400
Improve admin UI for accounts (#7360)
6 years ago
Reto Kromer 80b23a6a85 uniform email rather than e-mail (#7373)
6 years ago
David Yip 77a92d3260
Merge remote-tracking branch 'origin/master' into merge-upstream
6 years ago
Eugen Rochko 251bbf9728
Show remote reports in admin UI as coming from domain rather than user (#7347)
6 years ago
David Yip da70208b45
Merge remote-tracking branch 'origin/master' into merge-upstream
6 years ago
David Yip 2d392fb3b8
Remove unused translations.
6 years ago
Shuhei Kitagawa c61ddd8249 Fix 2fa description in Japanese (#7349)
6 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
6 years ago
Akihiko Odaki a7e71bbd08 Add a missing question mark in rack_attack.rb (#7338)
6 years ago
Akihiko Odaki b1d4471e36 Throttle media post (#7337)
6 years ago
Yamagishi Kazutoshi 7495a3470e Add el and te (#7332)
6 years ago
Renato "Lond" Cerqueira dfa6bccb64 Weblate translations 20180503 (#7325)
6 years ago
Eugen Rochko cb5b5cb5f7
Slightly reduce RAM usage (#7301)
6 years ago
Yamagishi Kazutoshi 16468bdf1b [i18n] Occitan update (#7294)
6 years ago
Marcin Mikołajczak fc01ae31c6 🌍: 🇵🇱⬆️ (#7275)
7 years ago
Eugen Rochko 63553c6b5c
Add support for separate Redis for cache (#7272)
7 years ago
Yamagishi Kazutoshi 36b6631c12 Add Basque language support (#7267)
7 years ago
Renato "Lond" Cerqueira 3afdd6a17b Weblate translations 20180426 (#7266)
7 years ago
Stefan Midjich fa5b28df8a Better phrasing in swedish translation (#7263)
7 years ago
MIYAGI Hikaru f58dcbc981 HTTP proxy support for outgoing request, manage access to hidden service (#7134)
7 years ago
Stefan Midjich bfc41711dd more sane phrasing in 🇸🇪 translation (#7256)
7 years ago
Renato "Lond" Cerqueira 7681ad8044 Weblate translations (2018-04-24) (#7252)
7 years ago
Emelia Smith 60b871d56c Implement the ability for instances to define a list of disallowed hashtags (#7176)
7 years ago
Marcin Mikołajczak 3ccca6cece 🌍: Make 🇵🇱 translation more consistent (#7239)
7 years ago
Yamagishi Kazutoshi 9613a53cb3 Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
jumoru b305a23933 Fix: Use "exportierten" instead of "exportieren" in translation (#7186)
7 years ago
Matthias Beyer 3fa3161472 Fix: Use "welches" instead of "dass" in translation (#7185)
7 years ago
Lynx Kotoura a4a36d994b Separate high contrast theme (#7213)
7 years ago
Eugen Rochko a9c440637c
Improve report layout (#7188)
7 years ago
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Marcin Mikołajczak 1957209efd i18n: Update Polish translation (#7181)
7 years ago
Kaito Sinclaire 156b916caf Direct messages column (#4514)
7 years ago
luzi82 aedfea3554 zh-HK translation (#7177)
7 years ago
Emelia Smith 204d72fbe4 Feature: add count of account notes to reports (#7130)
7 years ago
Yamagishi Kazutoshi 7c43ed04fe Weblate translations (2018-04-15) (#7141)
7 years ago
Marcin Mikołajczak fed0b5ed04 i18n: Update Polish translation (#7131)
7 years ago
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 78ed4ab75f
Add bio fields (#6645)
7 years ago
Jenkins e3d0d72b29 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip d66192f21c
Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip b7804028c2
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
mayaeh 85ab30abf7 i18n: Add Japanese translations for privacy policy and more (#7049)
7 years ago
Yamagishi Kazutoshi 50529cbceb Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip a817f084ea
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Alexander 8e88a18316 update gem, test pam authentication (#7028)
7 years ago
Thibaut Girka 50eb8f1f61 Add backend support for bookmarks
7 years ago
Jenkins 33c2bbdda7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith d9b62e34da Feature: Improve reports ui (#7032)
7 years ago
Eugen Rochko 49bbef1202
Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)
7 years ago
Emelia Smith 219a4423d8 Feature: Allow staff to change user emails (#7074)
7 years ago
Eugen Rochko 80a944c882
Log rate limit hits (#7096)
7 years ago
Marcin Mikołajczak 07d90b0414 i18n: Update Polish translation (#7085)
7 years ago
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG 1364e9e4ae Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
Eugen Rochko d4de2239b0
Add a circuit breaker for ActivityPub deliveries (#7053)
7 years ago
Hisham Muhammad 4a9becfca2 i18n: improve "Welcome" translation in Portuguese (#7068)
7 years ago
Eugen Rochko f1867a7388
Adjust privacy policy (#6666)
7 years ago
David Yip 3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Marcin Mikołajczak 1c1042556d i18n: Update Polish translation (#7037)
7 years ago
Eugen Rochko 07176fed37
Add contact account to landing page ("Administered by") (#6984)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG d8d4217959 Fix french wording of reblogged toots in public views, matching the wording of reblogged_by (#7029)
7 years ago
mayaeh 1c293086a1 i18n: Add Japanese translations for #7000 (#7022)
7 years ago
Emelia Smith e85cffb236 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith e7a1716701 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
Yamagishi Kazutoshi 3f51c6efaa Weblate translations (2018-04-02) (#7007)
7 years ago
Evgeny Petrov b04f73ce66 Russian language updated (#7005)
7 years ago
luzi82 24611d8deb i18n: update zh-HK translation (#7004)
7 years ago
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
luzi82 993ce0e5a7 improve zh-HK localization by referring zh-TW and zh-CN (#6988)
7 years ago
David Yip d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki ca42f9b0eb Cache media (#6902)
7 years ago
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak 85a395fab6 i18n: Update Polish translation (#6903)
7 years ago
Yamagishi Kazutoshi 28384c1771 Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)
7 years ago
Akihiko Odaki fa310695fa Note if the user is already following the target when authorizing follow (#6325)
7 years ago
Jeroen 580835ab69 Invites: Add '1 week' as expire option (#6872)
7 years ago
Yamagishi Kazutoshi 65c10c0bc8 Weblate translations (2018-03-23) (#6874)
7 years ago
Jenkins 03b2f701e7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quentí ecdc5957a3 [i18n] Occitan update (#6869)
7 years ago
Jenkins e8aeec4fea Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ac49c7932d
Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)
7 years ago
Akihiko Odaki 61dcb686a8 Fix i18n fallback configuration conflicts with environment configurations (#6843)
7 years ago
Jenkins df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander 33ee347c99 rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833)
7 years ago
Alexander 0306e3e9be bugfixes and gem update (#6831)
7 years ago