about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
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>
2017-07-18Merge changes from upstream with the CSS reload fixOndřej Hruška
2017-07-18Update Japanese translations for new landing page (#4159)lindwurm
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-07-18Add Japanese translation for #4199 (#4247)unarist
2017-07-18Add unfollow modal (optional) (#4246)Yamagishi Kazutoshi
* Add unfollow modal * unfollowing someone * remove unnecessary prop
2017-07-18Improve admin page (#4121)abcang
* Improve admin page * Fix test * Add spec * Improve select style
2017-07-17Updated from tootsuiteOndřej Hruška
2017-07-17i18n: update (pl) (#4233)m4sk1n
* i18n: update (pl) * Update pl.yml
2017-07-16Add SMTP_TLS variable for configuring TLS when server uses non-standard port ↵Eugen Rochko
(#4227)
2017-07-16Don't mention default post privacy on hints for locked accounts (#4222)unarist
"defaults post privacy to followers-only" only means... * default value of `visibility` param on post API * default value for web UI privacy setting (i.e. it will be overridden if they once updated) ...so, many users won't see an effect of it.
2017-07-16split added glitch locales from vanilla (#82)Ondřej Hruška
* Locale script now accepts overrides and new keys from glitch/locales * Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts
2017-07-15Merge upstream (#81)kibigo!
2017-07-15Improve ActivityPub representations (#3844)Eugen Rochko
* Improve webfinger templates and make tests more flexible * Clean up AS2 representation of actor * Refactor outbox * Create activities representation * Add representations of followers/following collections, do not redirect /users/:username route if format is empty * Remove unused translations * ActivityPub endpoint for single statuses, add ActivityPub::TagManager for better URL/URI generation * Add ActivityPub::TagManager#to * Represent all attachments as Document instead of Image/Video specifically (Because for remote ones we may not know for sure) Add mentions and hashtags representation to AP notes * Add AP-resolvable hashtag URIs * Use ActiveModelSerializers for ActivityPub * Clean up unused translations * Separate route for object and activity * Adjust cc/to matrices * Add to/cc to activities, ensure announce activity embeds target status and not the wrapper status, add "id" to all collections
2017-07-14Added buttons and menu items to dismiss individual notifications (#76)Ondřej Hruška
* Added DELETE verb for notifications * Added notification dismiss button to status dropdown * Added reveal-on-hover notif dismiss button, added FollowNotification component
2017-07-14Add option to opt out of search engines on public profile/status pages (#4199)Eugen Rochko
2017-07-14i18n: fediwers › fediwersum (pl) (#4198)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-14fr: replace "silencer" with "masquer" throughout (#4197)Albert ARIBAUD
* fr.json: replace "silencer" with "masquer" "Silencer" as a verb does not exist in French. A good and valid replacement is "masquer". * FR translation: use "masquer" for "silence"
2017-07-14Add Rake task for generate VAPID key (#4195)Yamagishi Kazutoshi
* Add Rake task for generate VAPID key * edit config/initializers/vapid.rb
2017-07-14Add Japanese translations for #3243 (#4192)Yamagishi Kazutoshi
2017-07-13Web Push Notifications (#3243)Sorin Davidoi
* feat: Register push subscription * feat: Notify when mentioned * feat: Boost, favourite, reply, follow, follow request * feat: Notification interaction * feat: Handle change of public key * feat: Unsubscribe if things go wrong * feat: Do not send normal notifications if push is enabled * feat: Focus client if open * refactor: Move push logic to WebPushSubscription * feat: Better title and body * feat: Localize messages * chore: Fix lint errors * feat: Settings * refactor: Lazy load * fix: Check if push settings exist * feat: Device-based preferences * refactor: Simplify logic * refactor: Pull request feedback * refactor: Pull request feedback * refactor: Create /api/web/push_subscriptions endpoint * feat: Spec PushSubscriptionController * refactor: WebPushSubscription => Web::PushSubscription * feat: Spec Web::PushSubscription * feat: Display first media attachment * feat: Support direction * fix: Stuff broken while rebasing * refactor: Integration with session activations * refactor: Cleanup * refactor: Simplify implementation * feat: Set VAPID keys via environment * chore: Comments * fix: Crash when no alerts * fix: Set VAPID keys in testing environment * fix: Follow link * feat: Notification actions * fix: Delete previous subscription * chore: Temporary logs * refactor: Move migration to a later date * fix: Fetch the correct session activation and misc bugs * refactor: Move migration to a later date * fix: Remove follow request (no notifications) * feat: Send administrator contact to push service * feat: Set time-to-live * fix: Do not show sensitive images * fix: Reducer crash in error handling * feat: Add badge * chore: Fix lint error * fix: Checkbox label overlap * fix: Check for payload support * fix: Rename action "type" (crash in latest Chrome) * feat: Action to expand notification * fix: Lint errors * fix: Unescape notification body * fix: Do not allow boosting if the status is hidden * feat: Add VAPID keys to the production sample environment * fix: Strip HTML tags from status * refactor: Better error messages * refactor: Handle browser not implementing the VAPID protocol (Samsung Internet) * fix: Error when target_status is nil * fix: Handle lack of image * fix: Delete reference to invalid subscriptions * feat: Better error handling * fix: Unescape HTML characters after tags are striped * refactor: Simpify code * fix: Modify to work with #4091 * Sort strings alphabetically * i18n: Updated Polish translation it annoys me that it's not fully localized :P * refactor: Use current_session in PushSubscriptionController * fix: Rebase mistake * fix: Set cacheName to mastodon * refactor: Pull request feedback * refactor: Remove logging statements * chore(yarn): Fix conflicts with master * chore(yarn): Copy latest from master * chore(yarn): Readd offline-plugin * refactor: Use save! and update! * refactor: Send notifications async * fix: Allow retry when push fails * fix: Save track for failed pushes * fix: Minify sw.js * fix: Remove account_id from fabricator
2017-07-12i18n: @e19eefe, @056b5ed + consistency improvement (pl) (#4171)m4sk1n
* i18n: @e19eefe (pl) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: @056b5ed (pl) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Improve consistency (pl) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-12Add Japanese translations for #4163 and #4129 (#4166)Yamagishi Kazutoshi
* Add Japanese translations for #4163 * Add Japanese translations for #4129 * top page -> front page
2017-07-12Fix broken terms for Japanese (#4170)Yamagishi Kazutoshi
2017-07-12Merge upstream!! #64 <3 <3kibigo!
2017-07-12Improve UI of admin site settings (#4163)Eugen Rochko