about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-08-01Merge upstream (#111)kibigo!
2017-07-31i18n: update Persian translation (#4470)Masoud Abkenar
* i18n: update Persian translation * i18n: fix quotes
2017-07-31Make salutation of email localizable (#4454)unarist
2017-07-30Multiple frontend support (#110)Gô Shoemake
* Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common
2017-07-30Update Japanese translations (#4453)unarist
2017-07-29Dutch: Small fix (#4441)Jeroen
2017-07-29i18n update of OC version (#4425)Quent-in
* Correction of misspellings * Improve the OC version * Improve of the OC version * Improvement of OC version
2017-07-28i18n: Update Polish translation (#4414)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-28Remove hash from chunk filename when dev env (#4411)Yamagishi Kazutoshi
2017-07-28feat(web_push_notifications): Group notifications (#4388)Sorin Davidoi
2017-07-28Fix #3189 - Share CSRF secret between main app and Sidekiq Web (#4383)Eugen Rochko
2017-07-28fix #4356 : place sw.js to assets/sw.js (#4357)Satoshi KOJIMA
2017-07-28Update Russian translation (#4407)Ratmir Karabut
* Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions) * Update Russian translation
2017-07-27Add default settings for user (#4393)Yamagishi Kazutoshi
2017-07-26s/PubSubHubbub/WebSub/g (#4372)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-25Merge git://github.com/tootsuite/mastodon into tootsuite-masterOndřej Hruška
2017-07-25Update Japanese translations for landing page (for Mobile). (#4362)Clworld
2017-07-25Update and (almost) completing Dutch strings for 1.5 (#4351)Jeroen
* Update and expanding Dutch strings for 1.5 Only privacy policy is not translated, but is included. Hopefully I have time to translate this another time (you can set your own privacy policy now anyway). * Missing file * A few changes cause of changes in another file * Fix * Update Dutch strings for 1.5 * nl * fix don't know how that ended up there * Update nl.yml
2017-07-25Update Capistrano lock version in config/deploy.rb (#4352)Petko Bordjukov
Deployment with Capistrano was failing due to a mismatch between the loaded version of Capistrano and the one specified in the deployment configuration. Bumping the version in config/deploy.rb fixes this issue.
2017-07-24i18n: @2374d63 (pl) (#4340)m4sk1n
* i18n: @2374d63 (pl) * i18n: fixed typo on Polish translation
2017-07-24Redesign /terms page (#4338)Eugen Rochko
* Redesign /terms page * Fix tests * Remove unused keys
2017-07-24Move clean up of unconfirmed users to sidekiq-scheduler (#4336)Eugen Rochko
* Move clean up of unconfirmed users to sidekiq-scheduler * mastodon:daily is now deprecated
2017-07-24Redesign extended information page (#4322)Eugen Rochko
* Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS
2017-07-24Run i18n-tasks normalize (#4335)Eugen Rochko
2017-07-24Allow domain blocks that only reject media without silencing or suspending ↵sdukhovni
(#4325) * Allow domain blocks to reject media without silencing or suspending * Fix typo * Hide 'Reject media' button when superfluous, instead of disabling it * Properly hide 'reject media' checkbox on page load if needed This may happen when resubmitting the domain block form after an error. * Don't ask whether undoing a media-only block should be retroactive * Rename :media_only block to :noop * Display :noop block as None in frontend, allow blocks that do nothing * Remove 'coding' line auto-added by emacs
2017-07-24Redirect user profile page to short URL when HTML format (#4328)Yamagishi Kazutoshi
2017-07-23i18n: Update Polish translation (#4327)m4sk1n
* i18n: Update Polish translation * i18n: Update Polish translation
2017-07-23Change about_mastodon to about_mastodon_html for all locales (#4326)Yamagishi Kazutoshi
2017-07-23Update Japanese translations for #4313 and #4315 (#4323)Yamagishi Kazutoshi
* Update Japanese translations for #4313 * Update Japanese translations for #4315
2017-07-23Improve noscript message and style (#4315)Eugen Rochko
2017-07-23i10n Update for Occitan (#4301)Quent-in
* Update to translate new strings * Update * Update * Indend added * Update oc.yml
2017-07-23Run yarn run manage:translations and i18n-tasks normalize (#4302)Eugen Rochko
2017-07-22Merge pull request #92 from tootsuite/masterOndřej Hruška
tiny upstream merge
2017-07-22Update French locales (settings, ToS, & co) (#4261)Damien Erambert
* add fr-FR locales to the landing page * moar french locales * terms of service/privacy policy * remove un-used locales in the client (yarn manage:translations) * update french locales in the client * remove duplicate locales in fr.yml * fix typos per PR comments in fr.yml * put back default messages * translate untranslated keys on the client * add "push" after notifications * correctly ident ToS in fr.yml
2017-07-22Mise à jour de la traduction de la page d’accueil (#4294)Sylvhem
* Mise à jour de la traduction de la page d’accueil Met à jour les traductions et ajoute les chaînes manquantes suite à la refonte de la page d’accueil. Update translations and add the strings introduced by the landing page's redesign. * Correction d’erreurs Corrige l’indentation de certaines clefs et supprime admin.settings.setting qui n’existe plus dans le projet original. Fix some indentations and delete admin.settings.setting, which have been removed upstream.
2017-07-22Merge that good fresh upstream shitbeatrix-bitrot
2017-07-22Fix sessions being replaced needlessly (#4292)Eugen Rochko
2017-07-21New notification cleaning mode (#89)Ondřej Hruška
This PR adds a new notification cleaning mode, super perfectly tuned for accessibility, and removes the previous notification cleaning functionality as it's now redundant. * w.i.p. notif clearing mode * Better CSS for selected notification and shorter text if Stretch is off * wip for rebase ~ * all working in notif clearing mode, except the actual removal * bulk delete route for piggo * cleaning + refactor. endpoint gives 422 for some reason * formatting * use the right route * fix broken destroy_multiple * load more notifs after succ cleaning * satisfy eslint * Removed CSS for the old notif delete button * Tabindex=0 is mandatory In order to make it possible to tab to this element you must have tab index = 0. Removing this violates WCAG and makes it impossible to use the interface without good eyesight and a mouse. So nobody with certain mobility impairments, vision impairments, or brain injuries would be able to use this feature if you don't have tabindex=0 * Corrected aria-label Previous label implied a different behavior from what actually happens * aria role localization & made the overlay behave like a checkbox * checkboxes css and better contrast * color tuning for the notif overlay * fanceh checkboxes etc and nice backgrounds * SHUT UP TRAVIS
2017-07-20disable about page timelinebeatrix
2017-07-20Add button to re-subscribe to all accounts from a domain (#4285)Eugen Rochko
2017-07-20Merge pull request #87 from tootsuite/masterbeatrix
merge upstream
2017-07-19i18n: @716f4cb (pl) (#4266)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-19fix missing closing <p> tag in ToS in en.yml (#4262)Damien Erambert
2017-07-19Fix missing closing <p> tag in ToS in .yml files (#4264)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-19Add feature to revoke sessions (#4259)Yamagishi Kazutoshi
2017-07-19Correct OStatus inflection (Ostatus -> OStatus) (#4255)Eugen Rochko
2017-07-18Fix for stylesheet splitkibigo!
2017-07-18Add sourceRoot/includePaths to loadersSurinna Curtis
Use the settings modal as an example/testcase
2017-07-18Update Japanese translation (chase #4249) (#4251)lindwurm
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-07-18i18n: Update Polish translation (#4252)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
generated by cgit-pink (git 2.37.1) at 2024-11-20 14:19:23 +0000