about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2018-09-05Fix videos being croppedThibaut Girka
2018-09-04Fix interactions between CW and sensitive flag when spoilersAlwaysOn is setThibaut Girka
2018-09-04Fix “sensitive” media warning and upload form colors in Mastodon-lightThibaut Girka
2018-09-04Outline white/grey/blue emojisThibaut Girka
2018-09-04Light theme overhaulThibaut Girka
2018-09-04[Glitch] Add white outline to black emojiThibaut Girka
Inspired from 0bfa0f237495249a322cd3a1100b394211755e8c
2018-09-04Fix emoji autosuggest when using a CDN for assetsThibaut Girka
2018-09-04Disable focus points for letterboxed mediaThibaut Girka
2018-09-04Fix full-width marginsThibaut Girka
2018-09-04Media gallery styling closer to upstream'sThibaut Girka
2018-09-04[Glitch] Do not override ctrl/cmd+click in media galleryThibaut Girka
2018-09-03Add admin links to status and account menus (fixes #673)Thibaut Girka
If the current logged-in user is an admin, add quick links to the admin interface in account and toot dropdown menu. Suggestion by @ashkitten
2018-09-03Allow to show a specific status in the admin interfaceThibaut Girka
2018-09-03Let the front-end know the current account is a moderatorThibaut Girka
2018-09-03[Glitch] Skip VS15 (Emoji textual presentation)Thibaut Girka
Port a060beee726de5295e1f608231975a90b7709a0a to glitch-soc
2018-09-03[Glitch] Add aria-label to floatingActionButtonThibaut Girka
Port 7c12c7b1246b991c68f4b51573538e02b3968beb to glitch-soc
2018-09-03[Glitch] Inactive header in main profile to match columnThibaut Girka
Port 1bfe735d574fdbb01b1aea07db6c69fb3a32b90f to glitch-soc
2018-09-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: README.md Discarded upstream changes to the README, kept our version.
2018-09-03Fixes columns scrolling to top when opening media modalThibaut Girka
Fixes #700
2018-09-02Enable ro and ta locales in Rails (#8583)Eugen Rochko
* Enable ro and ta locales in Rails * Add Tamil and Romanian to language dropdown
2018-09-02Weblate translations (2018-09-02) (#8582)Eugen Rochko
* Translated using Weblate (Serbian) Currently translated at 72.4% (499 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Serbian) Currently translated at 77.6% (535 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Corsican) Currently translated at 99.7% (687 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Dutch) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Korean) Currently translated at 100.0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Dutch) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Serbian) Currently translated at 72.3% (60 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (German) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Serbian) Currently translated at 92.8% (77 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ Језик писања? Нисам сигуран * Translated using Weblate (Corsican) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Serbian) Currently translated at 98.8% (330 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ * Translated using Weblate (Serbian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ Favourites је веома тешко превести у овом контексту, па сам измислио "омиљеновање", а за boosts - подршка се чини као добра ријеч за превод. * Translated using Weblate (Occitan) Currently translated at 100,0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 100,0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Serbian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ Favourites је веома тешко превести у овом контексту, па сам измислио "омиљеновање", а за boosts - подршка се чини као добра ријеч за превод. * Translated using Weblate (German) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 99.7% (687 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Serbian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ * Translated using Weblate (Serbian) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * i18n-tasks noramlize && yarn manage:translations
2018-09-02Fix nil error in admin_account_link_to helper (#8578)Eugen Rochko
Fix #8573
2018-09-02Weblate translations (2018-09-02) (#8577)Eugen Rochko
* Translated using Weblate (Polish) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Translated using Weblate (Korean) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Czech) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Added translation using Weblate (Tamil) * Translated using Weblate (Greek) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Corsican) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ * Translated using Weblate (Persian) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Romanian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * Added translation using Weblate (Romanian) * Added translation using Weblate (Romanian) * Added translation using Weblate (Romanian) * i18n-tasks normalize && yarn manage:translations * Fix ro YML files
2018-09-02Add aria-label to floatingActionButton (#8574)Frederic Hemberger
2018-09-02Add Corsican locale data (#8566)Alix R
2018-09-02[RU] Added translation for the following sections: (#8570)Evgeny Petrov
* Added translation for the following sections: • Empty followers, mutes, boosts etc. lists • Keyboard shortcuts • "About" • Plurals for statuses, users and subscribers counters • Relays, Custom CSS and suspensions settings. • Remote interactions • Other misc stuff * i18n-tasks normalize
2018-09-02Weblate translations (2018-09-01) (#8561)Eugen Rochko
* Translated using Weblate (German) Currently translated at 99.9% (687 of 688 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100,0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Japanese) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Dutch) Currently translated at 100,0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Greek) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Catalan) Currently translated at 100,0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 100,0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 98.1% (676 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (French) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Catalan) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 99.7% (687 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Welsh) Currently translated at 7.3% (6 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Slovak) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Welsh) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Welsh) Currently translated at 15.5% (107 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 1.6% (1 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/ * Translated using Weblate (Welsh) Currently translated at 15.8% (109 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (French) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Occitan) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Danish) Currently translated at 100,0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Occitan) Currently translated at 99.7% (333 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Slovak) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Czech) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Added translation using Weblate (Romanian) * Translated using Weblate (Romanian) Currently translated at 47.9% (160 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * i18n-tasks normalize && yarn manage:translations
2018-09-02Whitelist report notification param in Settings::NotificationsController (#8560)Eugen Rochko
Bug in #8559
2018-09-02Add preference for report notification e-mails, skip for duplicates (#8559)Eugen Rochko
If an unresolved report for the same target account already exists, no new notification is generated
2018-09-01Skip VS15 (Emoji textual presentation). (#8553)M Somerville
Mastodon converts all Emoji to images, whether they have a VS15 after them or not, but leaves the VS15 in the string, which is displayed as a black box in Safari.
2018-09-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-09-01Fix static URL when disable autoplay (#8548)Yamagishi Kazutoshi
2018-09-01Fix composer not displaying on chrome mobile (fixes #696)Thibaut Girka
2018-09-01Fix the display of missing lists (#8523)trwnh
* Fix the display of missing lists See #6786 -- this fixes part of the issue pertaining to lists that don't exist. I copied the Column being returned from the missing status logic, which works fine. Prior to this, the missing lists logic would generate a column with no back button and with a broken layout. This doesn't fix the broken display of missing accounts -- the column construction pertaining to that logic happens in multiple external functions. * import ColumnBackButton missed the import with the first commit
2018-08-31Do not show follow button on moved or memorial accounts (#8546)ThibG
This restores the logic from before the public profile redesign. Fixes #8503
2018-08-31Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml
2018-08-31Add option to not automatically unfold content warnings matching a regexpThibaut Girka
Fixes #678
2018-08-31Allow text inputs in local settings dialogThibaut Girka
2018-08-31Add a setting to automatically unfold all content warningsThibaut Girka
2018-08-31[Glitch] Show compose form on delete & redraft when in mobile layoutThibaut Girka
Port 025fbb8285cdedf495d9e4d015db611b0c622cbb to glitch-soc
2018-08-31Fix search results on compose boxThibaut Girka
2018-08-31Fix account header showing on search pageThibaut Girka
2018-08-31[Glitch] On the mobile UI, move the search column to the rightThibaut Girka
Port 20bb90ced60fdac4ca254b43dad5615b1549da26 to glitch-soc
2018-08-31[Glitch] Hide search from Compose on mobile devicesThibaut Girka
Port 0893b1669548858daee79ab1260fb98646a0b3fa to glitch-soc
2018-08-31[Glitch] Add search item to tab bar for mobile devicesThibaut Girka
Port c9cbb8de703e321c0d152813a2e22471ffe5eef7 to glitch-soc
2018-08-31[Glitch] Use withRouter for TabsBarThibaut Girka
Port 61e62757816cd8cfe38944d509f8ec13d7d86912 to glitch-soc
2018-08-31[Glitch] Move "compose" on mobile to floating action buttonThibaut Girka
Port e72db6d9dd53a9d44f641bdf6bce7e64548e7d94 to glitch-soc
2018-08-31[Glitch] When search enabled, display hint in search popoutThibaut Girka
Port 7901f9f63e156732ab10154c34f3c2d188471a9d to glitch-soc
2018-08-31Translate more messages to Traditional Chinese (#8543)caasi Huang
2018-08-31Self-notify on accepting follow requests (#8541)ThibG