2342 Commits (a135f3bd986b456caa7b4c9e6e6ca2da3289277c)

Author SHA1 Message Date
Thibaut Girka 5ce73f89f1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka d86033c352 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh c130aebba8 i18n: Add Japanese translations for new landing page (#10254)
6 years ago
Eugen Rochko 56822606f4 Redesign landing page (#10232)
6 years ago
Thibaut Girka bed7758022 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Sascha 291fbe21c2 config: add DB_SSLMODE for managed/remote PG (#10210)
6 years ago
Thibaut Girka 3ebbc1f017 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 1441046fdf Fix poll validation issues (#10186)
6 years ago
Thibaut Girka 9cb4a4c14e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach 1ca322f241 Minor update for Slovak tr (#10181)
6 years ago
Aditoo17 2182495cc7 I18n: Update Czech pluralization (#10182)
6 years ago
Eugen Rochko 9e24d7dfa9 Weblate translations (2019-03-05) (#10180)
6 years ago
Thibaut Girka c0b876f726 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG d19c56b615 Add non-JS fallback for polls on public pages (#10155)
6 years ago
Eugen Rochko 4a3acdc916 Add polls (#10111)
6 years ago
Thibaut Girka 91934eeb74 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 892327c686 Give the `replies` collection an identifier and enable pagination (#10128)
6 years ago
Thibaut Girka 76949bc007 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 693f2353bc Add type, limit, offset, min_id, max_id, account_id to search API (#10091)
6 years ago
Aditoo17 6b1d7a36be I18n: Add language options for Kazakh and Lithuanian (#10104)
6 years ago
Eugen Rochko c6adec0c13 Weblate translations (2019-02-23) (#10103)
6 years ago
Thibaut Girka 5758ec9aeb Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 9b7de13928 Add domain search/filter to the "Federation" (/admin/instances) page (#10071)
6 years ago
Thibaut Girka c8086b6efb Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 9bf5658885 Add tight rate-limit for API deletions (#10042)
6 years ago
Aditoo17 f24e258692 I18n: Update Czech pluralization and fix some language names (#10015)
6 years ago
Thibaut Girka de60ff3809 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko d25756990a Add available locales for lv, ms, sq (#10008)
6 years ago
Eugen Rochko 87a5991846 Weblate translations (2019-02-11) (#10007)
6 years ago
Thibaut Girka 1c37ad108c Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh 5e94fb5386 i18n: add Japanese translations (#10000)
6 years ago
Eugen Rochko 5adc3f5676 Fix URL linkifier grabbing full-width spaces and quotations (#9997)
6 years ago
rinsuki ae8392a11d Enable "displaying application used to post" setting by default (#9994)
6 years ago
mayaeh f308fb56ab Rename from instance to server. (#9938)
6 years ago
marcin mikołajczak 72f55c7cdf i18n: Update Polish translation 🇵 (#9974)
6 years ago
Eugen Rochko d2d4d38f22 Add featured hashtags to profiles (#9755)
6 years ago
Eugen Rochko 1f303e5591 Add option to overwrite imported data (#9962)
6 years ago
Jeong Arm 174fcfe6d6 Re-enable ignored translations that is needed (#7842)
6 years ago
ThibG dfb101cd45 Make displaying application used to toot opt-in (#9897)
6 years ago
Thibaut Girka aaf98669a5 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach 42bd0e3a51 More corrections for the Slovak translation (#9959)
6 years ago
Eugen Rochko 9cef8f1eb7 Fix link color in high-contrast theme, add underlines (#9949)
6 years ago
Marek Ľach 294a1a17d7 Update the Slovak translation (#9958)
6 years ago
Marek Ľach 435f44a8cc Distinguish error messaging for mystyped URLs and deleted accounts (#9957)
6 years ago
marcin mikołajczak c062f6033c i18n: Update Polish translation 🇵🇱 (#9945)
6 years ago
Thibaut Girka bb035bb0ab Make storing and displaying application used to toot opt-in
6 years ago
Thibaut Girka 827933cd09 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f444306764 Remove unused locale string (#9873)
6 years ago
mayaeh da1a2d19af i18n: Update Japanese translations (#9871)
6 years ago
Eugen Rochko 39fa85a023 Weblate translations (2019-01-19) (#9867)
6 years ago
Thibaut Girka b49d415f37 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Alexander Mankuta bfb0027044 Use the bundled Capistrano version (#9855)
6 years ago
Eugen Rochko 86087f7461 Add information about how to opt-in to the directory on the directory (#9834)
6 years ago
Eugen Rochko 14d49e814a Add timeouts for S3 (#9842)
6 years ago
Eugen Rochko 4abfcbd614 Weblate translations (2019-01-17) (#9844)
6 years ago
Aditoo17 4b9297ad46 I18n: Update Czech translation (#9814)
6 years ago
Thibaut Girka a06d3a6082 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Moritz Heiber f2cefd9d73 Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)
6 years ago
Renato "Lond" Cerqueira 7acc905604 Weblate translations (2019-01-15) (#9813)
6 years ago
Thibaut Girka a78447a6a4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marcin Mikołajczak 056e45a293 i18n: Update Polish translation (#9674)
6 years ago
Eugen Rochko 0cba7e7ebb Change "federation" admin UI link to point to "limited" domains (#9762)
6 years ago
Eugen Rochko c53b7fd78b Weblate translations (2019-01-08) (#9758)
6 years ago
Eugen Rochko f2ec1803cb Redesign admin instances area (#9645)
6 years ago
Eugen Rochko defe248b1c Change remote interaction dialog to use specific actions (#9743)
6 years ago
Eugen Rochko 3dc1452d35 Add missing locale strings (#9723)
6 years ago
Nolan Lawson 4fa76b21b6 Enable immutable caching for S3 objects (#9722)
6 years ago
Eugen Rochko ae1aaa3b8a Add scheduled statuses (#9706)
6 years ago
ThibG 631a91cbc0 Add quick links to the admin interface in the WebUI (#8545)
6 years ago
Eugen Rochko 1bd7044dbc Add mod and moderator to list of default reserved usernames (#9713)
6 years ago
Thibaut Girka 44f2224606 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 9244a06846 Add CSV export for lists and domain blocks (#9677)
6 years ago
Yamagishi Kazutoshi 101a46ac24 Update dependencies for Node.js (2018-12-31) (#9669)
6 years ago
Eugen Rochko 8958e58bd4 Improve admin UI for account view (#9643)
6 years ago
Aditoo17 08a7712dd3 I18n: Update Czech translation (#9644)
6 years ago
chr v1.x b659f51c43 Add local followers page to admin account UI (#9610)
6 years ago
Renato "Lond" Cerqueira a234fde3a4 Weblate translations (2018-12-27) (#9642)
6 years ago
Eugen Rochko bbf9f4f93b Add REST API for creating an account (#9572)
6 years ago
Thibaut Girka 48e6b2360d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko eb2994d454 Remove links to bridge.joinmastodon.org (non-functional) (#9608)
6 years ago
Eugen Rochko 2e0d617b8b Add moderation warnings (#9519)
6 years ago
Eugen Rochko ab443aaba8 Skip mailer job retries when a record no longer exists (#9590)
6 years ago
Thibaut Girka cabf2772ea Add a per-user setting to hide followers count
6 years ago
Thibaut Girka 20418dc7a7 Add admin setting to disable followers count
6 years ago
Renato "Lond" Cerqueira e60b59e5ca Weblate translations (2018-12-19) (#9578)
6 years ago
Thibaut Girka d53f315824 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh 26f2c1240e Update Japanese translations. (#9574)
6 years ago
Thibaut Girka 720cb01715 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 32bd452b56 Remove "most popular" tab from profile directory, add responsive design (#9539)
6 years ago
Eugen Rochko 5397866326 Remove PostgreSQL statement timeout (#9537)
6 years ago
Thibaut Girka 04204427d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Aditoo17 f14d8630b2 I18n: Correct pluralization of Czech (#9527)
6 years ago
Rey Tucker 56890834ab Remove form_action from CSP
6 years ago
Renato "Lond" Cerqueira d6d223c2a2 Weblate translations (2018-12-13) (#9513)
6 years ago
Eugen Rochko 7e4ce56476 Fix bootsnap cache directory being declared relatively (#9511)
6 years ago
Marcin Mikołajczak f10f88a29a i18n: Update Polish translation (#9509)
6 years ago
ThibG 5548049e71 Add admin ability to remove an user's header image (#9495)
6 years ago
ThibG 0686523e18 Add instance-wide setting to disable profile directory (#9497)
6 years ago
Yamagishi Kazutoshi e534f72da5 [i18n] Update Occitan (#9491)
6 years ago
ThibG fe40452a36 Use same CORS policy for /@:username and /users/:username (#9485)
6 years ago
Thibaut Girka b62953b3d2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 097d866028 Add setting to not aggregate reblogs (#9248)
6 years ago
Marcin Mikołajczak 4379a39c05 i18n: Update Polish translation (#9459)
6 years ago
Eugen Rochko fd8ca11f19 Add profile directory (#9427)
6 years ago
Eugen Rochko 01861b4f8e Add database statement timeout of 60s (#9382)
6 years ago
Thibaut Girka e5aadde0d5 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 4813053e97 Preload common JSON-LD contexts (#9412)
6 years ago
Thibaut Girka d67776ac83 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Quentí d69ee38a7b [i18n] update and corrections for Occitan locale (#9404)
6 years ago
Thibaut Girka 77b9249250 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marcin Mikołajczak cb7ecf5df8 Do not leak existence of e-mail addresses during login attempt, part 2 (#9376)
6 years ago
Marcin Mikołajczak 72ee0afe5f security/l10n [fr] do not leak registered e-mail addresses (#9375)
6 years ago
Thibaut Girka 35b6fb4e62 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 7aed0070d4 Remove unused translations (#9372)
6 years ago
Thibaut Girka 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Renato "Lond" Cerqueira 13f080b204 Weblate translations (2018-11-27) (#9367)
6 years ago
Eugen Rochko 305556274a Redesign admin accounts index (#9340)
6 years ago
Thibaut Girka b7ef203fd6 Tighten CSP a bit
6 years ago
Thibaut Girka bf26c23205 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a3f443b9c3 Improve ActiveRecord connection in on_worker_boot (#9238)
6 years ago
Thibaut Girka e18018e930 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
James Kiesel d2a9ea58da Allow joining several hashtags in a single column (#8904)
6 years ago
Thibaut Girka 33ad16faa7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Quentí 407cab9844 [i18n] Update for Occitan (#9169)
6 years ago
Thibaut Girka fd18ed4cea Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Quentí a43fdd72ba [i18n] Update for Occitan (#9157)
6 years ago
Thibaut Girka 13ea29754d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Julian 41661248b0 Improved grammar in German translation (#9092)
6 years ago
Renato "Lond" Cerqueira e362029b5d Weblate translations (2018-10-26) (#9113)
6 years ago
Thibaut Girka c954f89bdd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 057c91a4e2 Update i18n-tasks and change CircleCI command (#9104)
6 years ago
Thibaut Girka c32a5f86b6 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 3a115d3f49 Remove character counter from edit profile (#9100)
6 years ago
Marcin Mikołajczak 223af22b9c i18n: Update Polish translation (#9070)
6 years ago
Ben Lubar e2b221d9f1 Allow cross-origin requests to /.well-known/* URLs. (#9083)
6 years ago
Eugen Rochko e4892dca28 Add consistent interpolations check to CircleCI (#9072)
6 years ago
Eugen Rochko 7be9dfa8c6 Fix missing plural keys (#9084)
6 years ago
Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 40d23fc4d1 Add option to block reports from domain (#8830)
6 years ago
Eugen Rochko 9ccae7feff Add "disable" button to report screen (#9024)
6 years ago
Eugen Rochko e3b2234382 Add unread indicator to conversations (#9009)
6 years ago
Gomasy 46e3c63bb9 Add destroy_custom_emoji translation (#8997)
6 years ago
Quint Guvernator b815c8bcfc Fix some bad localization strings (#8994)
6 years ago
Julian 24b69ec045 one user i18n (#8992)
6 years ago
Thibaut Girka 8a87a1cda4 Fix deleting individual notifications from glitch-soc's web interface
6 years ago
jooops 8b1e1ea6ac fix invites in italian language (#8982)
6 years ago
mayaeh 6ea1a7f874 Fix description about custom mascot. (#8974)
6 years ago
Eugen Rochko c04048aae8 Weblate translations (2018-10-12) (#8972)
6 years ago
ThibG f8e9555e73 Add manifest_src to CSP, add blob to connect_src (#8967)
6 years ago
Eugen Rochko 3ede0e8b95 Fix missing protocol in dns-prefetch, improve code style (#8963)
6 years ago
Eugen Rochko 0dbb3a8786 Fix CSP headers blocking media and development environment (#8962)
6 years ago
ThibG 51c53e709f Set Content-Security-Policy rules through RoR's config (#8957)
6 years ago
Thibaut Girka 8cb843039c Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ad0f37e924 Track historical space stats in PgHero to determine PostgreSQL growth (#8906)
6 years ago
Thibaut Girka f09150f2a9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Sascha b7a337f63c add ffmpeg initializer (#8855)
6 years ago
mayaeh bcb43baf50 Add Japanese translations. (#8927)
6 years ago
Thibaut Girka 74e411f4e8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ashleyhull-versent 00d31a292c rubocop issues - Cleaning up (#8912)
6 years ago
ashleyhull-versent ea57aca5e1 Replace SVG asset with Custom mascot (#8766)
6 years ago
Eugen Rochko c9b5168ebd Add conversations API (#8832)
6 years ago
Thibaut Girka bdbbbb1bdb Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 95d977e51e Add POST /api/v1/notifications/:id/dismiss (#8905)
6 years ago
Marcin Mikołajczak 07d123fd3c i18n: Update Polish translation (#8901)
6 years ago
bsky 5569769737 Improve production build config (#8899)
6 years ago
Eugen Rochko 7635a136c9 Change documentation URL (#8898)
6 years ago
Thibaut Girka f627ea99e4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
aus-social c883b1ffc9 lint pass 2 (#8878)
6 years ago
Eugen Rochko 48c2ab8cf5 Limit the number of people that can be followed from one account (#8807)
6 years ago
aus-social a53bcb6213 Lint pass (#8876)
6 years ago
Andreas Sander e29f71e4ea German translation issue on landingpage CTA (#8865)
6 years ago
Thibaut Girka dbc2386ed3 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
abcang 1f7c5b79c9 Fix requirie bootsnap (#8836)
6 years ago
Thibaut Girka f5eaefc485 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 78558e5e1c Fix that Rails.cache information could not be sent via StatsD (#8831)
6 years ago
Eugen Rochko 0c47219e3a Support /.well-known/change-password (#8828)
6 years ago
Eugen Rochko 09016dbda4 Adjust bootsnap configuration for newer version (#8826)
6 years ago
Eugen Rochko 5ddcdf3753 Support min_id-based pagination in REST API (#8736)
6 years ago
Eugen Rochko ad0670fe87 Revert Font Awesome 5 upgrade (#8810)
6 years ago
Yamagishi Kazutoshi 991c4596b0 Fix broken report detail (regression from #8569) (#8795)
6 years ago
mayaeh 84bcf89764 Update the icon name changed by the Font Awesome 5. (#8776)
6 years ago
ふぁぼ原 bb8afc4608 Add a new preference to always hide all media (#8569)
6 years ago
Yamagishi Kazutoshi 150c9d1bb9 Weblate translations (2018-09-24) (#8768)
6 years ago
Eugen Rochko 497092aee0 Add nginx and systemd templates (#8770)
6 years ago
Matt Sweetman 674865731a Add user preference to always expand toots marked with content warnings (#8762)
6 years ago
ThibG 65801e94bf Fix Spanish locale broken due to translated variable name (#8754)
6 years ago
Thibaut Girka 032c98d372 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 604b17bc09 Fix Spanish locale broken due to translated variable name (#8737)
6 years ago
Thibaut Girka ae5c237607 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi f7cb4b93ac Weblate translations (2018-09-19) (#8731)
6 years ago
Marcin Mikołajczak 07cab6dab3 i18n: Update Polish translation (#8727)
6 years ago
Eugen Rochko d3105031f8 Redesign forms, verify link ownership with rel="me" (#8703)
6 years ago
mayaeh 102710034a Add japanese translations for the group reports and more. (#8696)
6 years ago
Yamagishi Kazutoshi 23ab704b2b Upgrade Babel to version 7.0.0 (#5925)
6 years ago
Yamagishi Kazutoshi 6faf7fd79d Weblate translations (2018-09-13) (#8692)
6 years ago
luzpaz 1bce70d3c7 Misc. typos (#8694)
6 years ago
Thibaut Girka ae2ffc7af1 Fix building assets in test environment
6 years ago
ThibG 28abd3f699 Fix building assets in test environment (#8691)
6 years ago
Eugen Rochko 50978383f9 Group reports by target account (#8674)
6 years ago
Thibaut Girka 4dd208f482 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Evgeny Petrov 87f294a33c RU: Translation fixes (#8652)
6 years ago
Sorin Davidoi 0b1c90bf88 feat(cookies): Use the same-site attribute to lax (#8626)
6 years ago
Aditoo17 97be484888 Add Czech language option and locale data (#8594)
6 years ago
Rey Tucker 121747b190 Add manifest_src to CSP
6 years ago
Thibaut Girka 63fe7a2d7a Allow to show a specific status in the admin interface
6 years ago
Thibaut Girka 7134c1f522 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko b7ec70d486 Redirect from old authorize_follow path (#8584)
6 years ago
Eugen Rochko 9768e9f6ab Enable ro and ta locales in Rails (#8583)
6 years ago
Eugen Rochko 64f01b2e7d Weblate translations (2018-09-02) (#8582)
6 years ago
Marcin Mikołajczak fb9fc05f0c i18n: Update Polish translation (#8581)
6 years ago
Eugen Rochko 9f4618d7a6 Weblate translations (2018-09-02) (#8577)
6 years ago
ThibG 56caf50db7 Update docker config and move some workers to different queues (#8345)
6 years ago
Evgeny Petrov 6997fe6d8a [RU] Added translation for the following sections: (#8570)
6 years ago
Eugen Rochko b59191cf68 Weblate translations (2018-09-01) (#8561)
6 years ago
Eugen Rochko 601a0dc6cc Add preference for report notification e-mails, skip for duplicates (#8559)
6 years ago
Yamagishi Kazutoshi 8a0670a54e Integrating `:one` and `:other` in ar.yml (#8555)
6 years ago
Thibaut Girka daa6110ce7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 699ab3075b Save button for relays translatable (#8539)
6 years ago
Yamagishi Kazutoshi 724a6fa7e4 Normalize Welsh (#8538)
6 years ago
Eugen Rochko 2eac55cb3a Add Welsh language option (#8536)
6 years ago
Eugen Rochko 7d467f38d3 Weblate translations (2018-08-31) (#8535)
6 years ago
Renato "Lond" Cerqueira c7423078ce Add animate custom emoji param to embed pages (#8507)
6 years ago
Thibaut Girka 0a841048fa Fix CSP with S3/SWIFT hosts
6 years ago
Thibaut Girka faeb568601 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 2f78bd1b42 Adjust CSP to fix image resizing
6 years ago
Eugen Rochko f507c9713f Display pending message on admin relays UI (#8494)
6 years ago
Thibaut Girka 4f4908311d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Renato "Lond" Cerqueira c13f14b627 Weblate translations (2018-08-27) (#8483)
6 years ago
M Somerville 9fe24fbf4b Better singulars of account followers/toots. (#8471)
6 years ago
Thibaut Girka ae4240d236 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2b2045834e Revert "Default puma to running on localhost only." (#8444)
6 years ago
Eugen Rochko 660475198b Add theme identifier to body classes for easier custom CSS styling (#8439)
6 years ago
M Somerville 01896d770d Default puma to running on localhost only. (#8429)
6 years ago
Yamagishi Kazutoshi db91d0dcc7 Weblate translations (2018-08-25) (#8420)
6 years ago
M Somerville 4b27569841 Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)
6 years ago
MIYAGI Hikaru 0985b647ee Revice Japanese translation of `deleted_status` (#8419)
6 years ago
Thibaut Girka 69212ed0ad Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 94b7dddeac Add admin custom CSS setting (#8399)
6 years ago
Thibaut Girka 36a96b33d9 Only apply CSP in production mode
6 years ago
Thibaut Girka 91c50b0d4b Tighten CSP while allowing CDN hosts
6 years ago
Sylvhem 3e3de891ac Major update for the French translation (#8348)
6 years ago
Marcin Mikołajczak 946301ea3b i18n: fix Polish translation (#8380)
6 years ago
Marcin Mikołajczak fd822430fe i18n: Update Polish translation (#8378)
6 years ago
Thibaut Girka 86d2a9d480 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 563a09d81a Move CSP headers to the appropriate Rails configuration
6 years ago
M Somerville e42c06ec01 Allow use of plurals on about page stats. (#8363)
6 years ago
Eugen Rochko 801b0f583f Add confirmation step to account suspensions (#8353)
6 years ago
Yamagishi Kazutoshi 3195c46402 Weblate translations (2018-08-22) (#8346)
6 years ago
Thibaut Girka 98dccee657 Merge branch 'master' into glitch-soc/master
6 years ago
ThibG 97f2dc6761 Revert to using Paperclip's filesystem storage, and fix dangling records in remove_remote (#8339)
6 years ago
ThibG 09fb9fb07e Add API endpoint to list featured accounts (fixes #8315) (#8317)
6 years ago
Oskari Noppa d7486781ab Fix a variable for a Finnish translation (#8299)
6 years ago
Marcin Mikołajczak e6879b490f i18n: Update Polish translation (#8290)
6 years ago
Thibaut Girka c043697caa Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 85990d2886 Link to mobile apps page (#8278)
6 years ago
Eugen Rochko 834df855e2 Add admin function to deactivate all invites (#8279)
6 years ago
Thibaut Girka 767cc06fe2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 5c32fbce98 Add "sign in to participate" message to public toot page (#8200)
6 years ago
Eugen Rochko 273e8f0474 Add remote interaction dialog for toots (#8202)
6 years ago
Dachi Natsvlishvili e568124315 Add Georgian language translation (#8250)
6 years ago
Thibaut Girka 334f478db1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG c97c032ae6 Prevent actions log from crashing when displaying deleted status (fixes #8133) (#8219)
6 years ago
ThibG 8cc34321d5 Do not error out when performing admin actions on no statuses (#8220)
6 years ago
Immae cbaabe0215 Add ldap search filter (#8151)
6 years ago
Eugen Rochko 5e1e9753c3 Add post-deployment migration system (#8182)
6 years ago
Evgeny Petrov 86183968b4 Added endorse strings, fixed footer 'developers' string (#8183)
6 years ago
Yamagishi Kazutoshi 31507b5cdb Weblate translations (2018-08-12) (#8171)
6 years ago
Eugen Rochko 98184a889e Add post-deployment migration system (#8182)
6 years ago
Evgeny Petrov 5dbc798bb4 Added endorse strings, fixed footer 'developers' string (#8183)
6 years ago
Yamagishi Kazutoshi 5d8b8f22f9 Weblate translations (2018-08-12) (#8171)
6 years ago
Thibaut Girka 03ac196126 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi a74f0d2dd9 Weblate translations (2018-08-11) (#8167)
6 years ago
Marcin Mikołajczak fd8ca84077 i18n: Update Polish translation (#8155)
6 years ago
Evgeny Petrov 399a008cfb [RU] Updated translation (#8164)
6 years ago
Thibaut Girka 5ed6f6db1d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 3fd47f9bc0 Introduce OAuth scopes for bookmarks
6 years ago
Eugen Rochko 9e8366d4cb Update /terms and /about/more to use public layout (#8142)
6 years ago
Eugen Rochko 6e3cb11f3c Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Evgeny Petrov f1fe022a13 [RU] Translation update: (#8147)
6 years ago
Mozinet 092ad32063 Update fr.yml for 3 spelling mistakes and a typo (#8135)
6 years ago
Marcin Mikołajczak b5d5fc9855 i18n: Make Polish translation more gender neutral + update (#8119)
6 years ago
Thibaut Girka 30c9fef4d4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 52b61a8b71 Delete leftovers from keyword_mutes
6 years ago
Thibaut Girka 1159490f00 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 934d50daf0 Add separate setting for sidebar text (site_short_description) (#8107)
6 years ago
Thibaut Girka f866d00fa2 Merge commit 'dad7cd6d77f1bb090a7a64df405a920a1a1b2d83' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 9d3bb125b7 Weblate translations (2018-07-30) (#8096)
6 years ago
Eugen Rochko f53755aaad Fix size/dimension values in avatar/header hint localizations (#8088)
6 years ago
Thibaut Girka e09ade34cd Reduce assets precompilation time by about 20%
6 years ago
Eugen Rochko 13df3889f0 Redesign public profiles and toots (#8068)
6 years ago
Marcin Mikołajczak dad7cd6d77 i18n: Update Polish translation (#8084)
6 years ago
Thibaut Girka 3a4a87d9c0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
abcang b46416fe47 Add secure option to additional cookie (#8069)
6 years ago
Yamagishi Kazutoshi 2629ffb68a Weblate translations (2018-07-25) (#8065)
6 years ago
Thibaut Girka e81eb34566 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 8aa855c0f7 Weblate translations (2018-07-18) (#8047)
6 years ago
Thibaut Girka 62b47edf17 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
abcang dd5b6bf3bb Update supported Node.js version (#8041)
6 years ago
Eugen Rochko 8ccb57f8a6 Add missing translation for admin dashboard trends section (#8040)
6 years ago
Thibaut Girka 4ec907e413 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marcin Mikołajczak d1d46f914b i18n: Update Polish translation (#8032)
6 years ago
Eugen Rochko d0b14eaee2 Add admin dashboard (#8029)
6 years ago
Jeong Arm 988bf7d538 Add missing Korean translations (#8017)
6 years ago
Yamagishi Kazutoshi 2275752fca Upgrade webpack to version v4.x (#6655)
6 years ago
Eugen Rochko 80dab2e678 Weblate translations (2018-07-14) (#8016)
6 years ago
Eugen Rochko 171c20ce72 Add federation relay support (#7998)
6 years ago
Thibaut Girka 7be52a7c16 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh 3dc6c216ce Fix whole-word selection and i18n: Add Japanese translation for Whole-word (#8004)
6 years ago
Thibaut Girka ca97b0341b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Jeong Arm 624c7cb9b1 Add missing Korean translation (#7993)
6 years ago
Eugen Rochko df34e4efff Weblate translations (2018-07-11) (#7992)
6 years ago
Thibaut Girka 262f7d147d Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka cf8121376b Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
Eugen Rochko a7039e4fd3 Add API method to remove a suggestion (#7978)
6 years ago
ThibG 722d1ca015 Fix french translation of “Keyword or phrase” (#7980)
6 years ago
Marcin Mikołajczak 249d438bc0 i18n: Update Polish translation (#7968)
6 years ago
Eugen Rochko 5bec5c3e6e Add admin setting to enable OG previews for sensitive media (#7962)
6 years ago
Eugen Rochko 34fdf77f48 Add more granular OAuth scopes (#7929)
6 years ago
Renato "Lond" Cerqueira 607654572a Weblate translations (2018-07-05) (#7950)
6 years ago
Eugen Rochko aa4e75166b Re-add follow recommendations API (#7918)
6 years ago
Eugen Rochko 23624f709a Improve embeds (#7919)
6 years ago
Marcin Mikołajczak 4833d285a7 i18n: Update Polish translation (#7915)
6 years ago
MIYAGI Hikaru ac56fa3c22 Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE` (#7901)
6 years ago
Eugen Rochko d878e3e945 Keyword/phrase filtering (#7905)
6 years ago
Yamagishi Kazutoshi 08c9914bc5 Weblate translations (2018-06-25) (#7890)
6 years ago
SerCom_KC 76e3c6299b i18n: (zh-CN) #7823, #7828 (#7887)
6 years ago
Thibaut Girka 8bd7b9b586 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Isao Sugimoto 153c3e23d1 fix filter languages label on settings (ja) (#7848)
7 years ago
Eugen Rochko 71713fabde Weblate translations (2018-06-19) (#7847)
7 years ago
Yamagishi Kazutoshi 0c870f747b Weblate translations (2018-06-18) (#7839)
7 years ago
Quentí 107b450cc7 [i18n] Update Occitan for #7823 and #7828 (#7830)
7 years ago
Eugen Rochko f91fa10804 Allow selecting default posting language instead of auto-detect (#7828)
7 years ago
Eugen Rochko 499a9f5f11 Change language opt-out to language opt-in (#7823)
7 years ago
Yamagishi Kazutoshi cd79647197 Weblate translations (2018-06-16) (#7815)
7 years ago
Jeong Arm c5edc53b2e Add missing Korean translations (#7819)
7 years ago
SerCom_KC 355f55772d Update Chinese (Simplified) Translations (#7816)
7 years ago
Thibaut Girka 3d6c594903 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko f8bc071e03 Add dat, dweb, ipfs, ipns, ssb, gopher protocols to URL extractor (#7810)
7 years ago
Eugen Rochko 9ed3212e35 Remove rack-timeout (#7809)
7 years ago
Eugen Rochko 907694df6a Add autofollow option to invites (#7805)
7 years ago
David Yip 4692eed7bd Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
David Yip f9c8642a11 Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
Jenkins 695674b2fa Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 51c639980c Weblate translations (2018-06-10) (#7779)
7 years ago
Renato "Lond" Cerqueira 2e4a1d3109 Rename emoji sheet to avoid caching issue (#7777)
7 years ago
SerCom_KC 77c94ffe82 Update Chinese (Simplified) translations (#7769)
7 years ago
Yamagishi Kazutoshi 3e2eddaba7 Weblate translations (2018-06-08) (#7759)
7 years ago
David Yip c2f7676dfc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Marcin Mikołajczak a5e289e273 🌍🇵🇱 (#7753)
7 years ago
Renato "Lond" Cerqueira 19b653991d Weblate translations 20180605 (#7743)
7 years ago
David Yip a38c4c45da Add apply-to-mentions option to keyword mute UI. #454.
7 years ago
Eugen Rochko d993629ca7 "Show" instead of "return to" after (remote)-following (#7718)
7 years ago
David Yip 9e830f7f37 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 650e3e346b Remove trending hashtags (#7711)
7 years ago
David Yip 471b62a6a4 prefs: Note that favourite confirmation applies to Glitch flavour only (#491)
7 years ago
David Yip 827d1ea864 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi ca2a6b2071 Weblate translations (2018-06-02) (#7705)
7 years ago
Yamagishi Kazutoshi 4c11c429ce Weblate translations (2018-05-31) (#7681)
7 years ago
Thibaut Girka c822ecfa01 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Yamagishi Kazutoshi 7e042c97d1 Use URL polyfill (#7664)
7 years ago
Eugen Rochko 744d47dee2 Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)
7 years ago
Akihiko Odaki 0cb1524dc1 Cache attachments on external host with service worker (#7493)
7 years ago
Eugen Rochko 8a3b9d26fb Track trending tags (#7638)
7 years ago
Thibaut Girka 3dc4f8e2ca Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Yamagishi Kazutoshi fa87093ff2 Weblate translations (2018-05-26) (#7624)
7 years ago
Eugen Rochko b416ba6692 Disable AMS logging (#7623)
7 years ago
Thibaut Girka 4cb367e6d4 Merge branch 'master' into glitch-soc/merge-master
7 years ago
Lynx Kotoura 499af41a9d More polished light theme (#7620)
7 years ago
Jeroen daff01a5a5 Added the law requirements for the EU/EEA (#7605)
7 years ago
Thibaut Girka 28ccf0a464 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko ab94772b5c Remove pointer to light theme until it is more polished (#7594)
7 years ago
SerCom_KC 82da8b7ec6 [WIP] i18n: Update Simplified Chinese translations (#7576)
7 years ago
Evgeny Petrov 96040c54f5 [RU] Added mastodon-light string (#7583)
7 years ago
Marcin Mikołajczak 9b1b968262 🌍: 🇵🇱⬆️ (#7580)
7 years ago
Thibaut Girka 72c454e2b3 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
SerCom_KC 8a8a47892a i18n: Update Simplified Chinese translations (#7565)
7 years ago
Sylvhem eeb6fd44e1 Add a light theme (#7027)
7 years ago
Quentí 1de642e921 [i18n] Update for Occitan (#7558)
7 years ago
Evgeny Petrov d3c01f86ba [RU] Updated strings for 2.4.0 (#7555)
7 years ago
Marcin Mikołajczak b4458906ba 🌍: 🇵🇱⬆️ (#7554)
7 years ago
Thibaut Girka c384e0f3de Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Yamagishi Kazutoshi 20550e2641 Weblate translations (2018-05-20) (#7552)
7 years ago
Eugen Rochko 7eaa12c83a Ensure push subscription is immediately removed when application is revoked (#7548)
7 years ago
Peter bc20c2cd3a Add :few keys for sk lang plurals (#7551)
7 years ago
Eugen Rochko 70e678da43 Improve payload format of Web Push API now that it's open (#7521)
7 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
7 years ago
Jenkins 4a3872d26e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
MIYAGI Hikaru 7dbf83d6b8 User agent for WebFinger (#7531)
7 years ago
Thibaut Girka 7d5dbed502 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Evgeny Petrov e503a61a5a Russian language for 2.4.0 (#7512)
7 years ago
Quentí b64100c049 [l10n] Occitan update (#7505)
7 years ago
nightpool ebce199209 Update bot preference text (#7507)
7 years ago
Marcin Mikołajczak 73f4c61bbd 🌍: 🇵🇱⬆️ (#7494)
7 years ago
Renato "Lond" Cerqueira 933f6e2ad4 Weblate translations 20180515 (#7496)
7 years ago
Thibaut Girka efd2441d1f Merge branch 'master' into glitch-soc/merge
7 years ago
Akihiko Odaki 0205536ee7 Limit environment variables to expose to webpack (#7480)
7 years ago
Yamagishi Kazutoshi 4d5bec8a75 Add Slovene language (#7475)
7 years ago
Eugen Rochko 7463d87ec3 Add GET /api/v1/push/subscription REST API (#7471)
7 years ago
ThibG 4072475241 Improvements to toots display in admin view (#7452)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko e86a4fe36b Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Yamagishi Kazutoshi a6bdefe811 Weblate translations (2018-05-10) (#7438)
7 years ago
Thibaut Girka 5b46a6002f Ignore tootsuite-specific theme-related translation strings
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Marcin Mikołajczak cbb7f33083 🌍: 🇵🇱⬆️ (#7427)
7 years ago
Eugen Rochko 7ff3c849d1 Bot nameplates (#7391)
7 years ago
Hugo Gameiro 27cfb13b83 Improve OpenStack v3 compatibility (#7392)
7 years ago
Eugen Rochko 93553c17c8 Add Corsican localization (#7390)
7 years ago
Yamagishi Kazutoshi a14525d3df Weblate translations (2018-05-06) (#7381)
7 years ago
Shuhei Kitagawa 8c8a850f8a Add resend confirmation for admin (#7378)
7 years ago
Eugen Rochko a1398887ae Add hint about 7 day cooldown for archive takeout (#7375)
7 years ago
Eugen Rochko 14393f29ef Add contact e-mail hint to 2FA login form (#7376)
7 years ago
Eugen Rochko 0dcca6b6e8 Improve admin UI for accounts (#7360)
7 years ago
Reto Kromer d806eb8e59 uniform email rather than e-mail (#7373)
7 years ago
David Yip ea46024add Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko d9eda62221 Show remote reports in admin UI as coming from domain rather than user (#7347)
7 years ago
David Yip 976347fa78 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip 587c2da0cf Remove unused translations.
7 years ago
Shuhei Kitagawa 4a422a7eaa Fix 2fa description in Japanese (#7349)
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki 854d974499 Add a missing question mark in rack_attack.rb (#7338)
7 years ago
Akihiko Odaki 5cddff0795 Throttle media post (#7337)
7 years ago
Yamagishi Kazutoshi 5bd8cda844 Add el and te (#7332)
7 years ago
Renato "Lond" Cerqueira b84b11c41a Weblate translations 20180503 (#7325)
7 years ago
Eugen Rochko ca1c696dbd Slightly reduce RAM usage (#7301)
7 years ago
Yamagishi Kazutoshi f88306e4a0 [i18n] Occitan update (#7294)
7 years ago
Marcin Mikołajczak 707213b91a 🌍: 🇵🇱⬆️ (#7275)
7 years ago
Eugen Rochko 0370c0f4d6 Add support for separate Redis for cache (#7272)
7 years ago
Yamagishi Kazutoshi 31af463590 Add Basque language support (#7267)
7 years ago
Renato "Lond" Cerqueira 2457b9efa0 Weblate translations 20180426 (#7266)
7 years ago
Stefan Midjich e0f6cb24db Better phrasing in swedish translation (#7263)
7 years ago
MIYAGI Hikaru 28808f638e HTTP proxy support for outgoing request, manage access to hidden service (#7134)
7 years ago
Stefan Midjich 76f1be66ee more sane phrasing in 🇸🇪 translation (#7256)
7 years ago
Renato "Lond" Cerqueira ad6a669494 Weblate translations (2018-04-24) (#7252)
7 years ago
Emelia Smith 49d9ea6998 Implement the ability for instances to define a list of disallowed hashtags (#7176)
7 years ago
Marcin Mikołajczak 52d4002f70 🌍: Make 🇵🇱 translation more consistent (#7239)
7 years ago
Yamagishi Kazutoshi e83e74f36d Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
jumoru 915ec9c988 Fix: Use "exportierten" instead of "exportieren" in translation (#7186)
7 years ago
Matthias Beyer b56a55352a Fix: Use "welches" instead of "dass" in translation (#7185)
7 years ago
Lynx Kotoura 670b5bcc6a Separate high contrast theme (#7213)
7 years ago
Eugen Rochko 354a6e4026 Improve report layout (#7188)
7 years ago
David Yip bae5435010 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Marcin Mikołajczak 7bca0f1cda i18n: Update Polish translation (#7181)
7 years ago
Kaito Sinclaire 447741e456 Direct messages column (#4514)
7 years ago
luzi82 9b80aede7a zh-HK translation (#7177)
7 years ago
Emelia Smith 0f9c6407e9 Feature: add count of account notes to reports (#7130)
7 years ago
Yamagishi Kazutoshi da5142618f Weblate translations (2018-04-15) (#7141)
7 years ago
Marcin Mikołajczak 1921384e08 i18n: Update Polish translation (#7131)
7 years ago
David Yip 9697c6d9f0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 466442b764 Add bio fields (#6645)
7 years ago
Jenkins a1894cbc13 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip 26f770cf72 Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip 605016368d Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip fd98bfd108 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
mayaeh a35aeefe0a i18n: Add Japanese translations for privacy policy and more (#7049)
7 years ago
Yamagishi Kazutoshi 9761b940ac Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip ac1ac20ee9 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Alexander 8a9da4c414 update gem, test pam authentication (#7028)
7 years ago
Thibaut Girka 12f8473561 Add backend support for bookmarks
7 years ago
Jenkins e4e0aa5d21 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 5a166a19a7 Feature: Improve reports ui (#7032)
7 years ago
Eugen Rochko dbf7f62cea Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)
7 years ago
Emelia Smith 765bfd0cf5 Feature: Allow staff to change user emails (#7074)
7 years ago
Eugen Rochko 8af5b4ed4b Log rate limit hits (#7096)
7 years ago
Marcin Mikołajczak 33671bcc50 i18n: Update Polish translation (#7085)
7 years ago
David Yip 337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG a91acd2010 Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
Eugen Rochko a814aa8e4d Add a circuit breaker for ActivityPub deliveries (#7053)
7 years ago
Hisham Muhammad 835a974a2a i18n: improve "Welcome" translation in Portuguese (#7068)
7 years ago
Eugen Rochko e54b79a777 Adjust privacy policy (#6666)
7 years ago
David Yip a60a600a10 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Marcin Mikołajczak db2e7649ed i18n: Update Polish translation (#7037)
7 years ago
Eugen Rochko 7f1e924fa9 Add contact account to landing page ("Administered by") (#6984)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 9b449c6001 Fix french wording of reblogged toots in public views, matching the wording of reblogged_by (#7029)
7 years ago
mayaeh b505eec7e5 i18n: Add Japanese translations for #7000 (#7022)
7 years ago
Emelia Smith 5373b138e8 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith 0408944627 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
Yamagishi Kazutoshi 21fa7b6520 Weblate translations (2018-04-02) (#7007)
7 years ago
Evgeny Petrov 2964c7a7b8 Russian language updated (#7005)
7 years ago
luzi82 89d3bc36a3 i18n: update zh-HK translation (#7004)
7 years ago
David Yip 21394c5462 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
luzi82 3233c46796 improve zh-HK localization by referring zh-TW and zh-CN (#6988)
7 years ago
David Yip 2567d0a704 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki e829c21cc6 Cache media (#6902)
7 years ago
Jenkins ae55717f50 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak 29dfe740f6 i18n: Update Polish translation (#6903)
7 years ago
Yamagishi Kazutoshi 6daa722e87 Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)
7 years ago
Akihiko Odaki 9125608145 Note if the user is already following the target when authorizing follow (#6325)
7 years ago
Jeroen 0bedd0bb45 Invites: Add '1 week' as expire option (#6872)
7 years ago
Yamagishi Kazutoshi ed074766aa Weblate translations (2018-03-23) (#6874)
7 years ago
Jenkins 60eafb173f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quentí a8c2ce486f [i18n] Occitan update (#6869)
7 years ago
Jenkins b1453c0dbf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 59b3b38b0e Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)
7 years ago
Akihiko Odaki a4d7afa3d9 Fix i18n fallback configuration conflicts with environment configurations (#6843)
7 years ago
Jenkins eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander af08f6042d rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833)
7 years ago
Alexander 4fc9827b69 bugfixes and gem update (#6831)
7 years ago
Renato "Lond" Cerqueira 9bdedcfa48 Weblate translations 20180319 (#6827)
7 years ago
David Yip b0993a5fdf Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko b95c3ef3ee Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)
7 years ago
Eugen Rochko d35272245e Revert "Upgrade Paperclip to version 6.0.0" (#6807)
7 years ago
Yamagishi Kazutoshi cd6dee83a1 Upgrade Paperclip to version 6.0.0 (#6754)
7 years ago
Jenkins dd0dafed03 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira b83c1d7c5d Weblate translations (2018-03-13) (#6777)
7 years ago
David Yip 9ca0336c15 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 8d6d74b319 Weblate translations (2018-03-11) (#6742)
7 years ago
Jenkins af2b57a054 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi aff19f5f10 Change avatar size on form hints (#6707)
7 years ago
Renato "Lond" Cerqueira 48b2a6f08d Weblate translations (2018-03-09) (#6708)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f67fe3ebe8 Improve styling of closed registrations message, rename button (#6695)
7 years ago
Yamagishi Kazutoshi b2b7333b26 Weblate translations (2018-03-08) (#6690)
7 years ago
Effy Elden 4a8046df66 Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)
7 years ago
Sylvhem 18d4e03e6b Add headings to the security settings page (#6661)
7 years ago
Renato "Lond" Cerqueira 1f328e22a0 Weblate translations (05-03-2018) (#6640)
7 years ago
Marcin Mikołajczak 6fee779fa6 i18n: Update Polish translation (#6632)
7 years ago
Akihiko Odaki 649565e005 Provide default OTP_SECRET value for development environment (#6617)
7 years ago
Akihiko Odaki 008bc9f47d Set the default locale in config (#6580)
7 years ago
Eugen Rochko b1f8dfd3cf Federate pinned statuses over ActivityPub (#6610)
7 years ago
Jeong Arm 58d54489c6 Translate Korean (#6608)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 1fad0489eb Change "or" translatable (#6597)
7 years ago
Alexander 988f6505e4 fix logic for pam_controlled_service (#6599)
7 years ago
Yamagishi Kazutoshi 38f0d2f88b Weblate translations (2018-03-02) (#6588)
7 years ago
mayaeh 6b751679b5 i18n: Update Japanese translations (#6581)
7 years ago
Marcin Mikołajczak a6d10b05f6 i18n: Update Polish translation (#6578)
7 years ago
Eugen Rochko 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
beatrix caa0e2e2f8 remove Uglifier call from production.rb (#6568)
7 years ago
imncls 76aef54e8e i18n normalize data
7 years ago
Ian McCowan 88461c1abe Fix prev/next links on public profile page (#6497)
7 years ago
imncls 76e0b69e02 Add missing Japanese translate
7 years ago
Akihiko Odaki a5a434a8f6 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
mayaeh 8995e9238a i18n: Update Japanese translations (#6550)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec d1806f5dc4 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Marcin Mikołajczak 21da2f420e i18n: Update Polish translation (#6539)
7 years ago
Ghislain Loaec deea524052 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Eugen Rochko ad1f541bd7 Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Eugen Rochko c34ff9fb82 Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Eugen Rochko 2815ef6d7f Fix #6509: Use pull queue for chewy jobs (#6513)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki ca6c8b92d9 Isolate each specs for cache store (#6450)
7 years ago
David Yip 596deb050b Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Simó Albert i Beltran 056f153077 Fix Spanish translation of remote_follow acct (#6475)
7 years ago
Simó Albert i Beltran 23089a38ee Fix Catalan translation of remote_follow acct (#6476)
7 years ago
Eugen Rochko 9b7490cede Save video metadata and improve video OpenGraph tags (#6481)
7 years ago