about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2017-04-15Rename admin/accounts_helper to admin/filter_helper (#1816)Matt Jankowski
- Add some spec coverage for both methods - Add explicit constant call-outs for where the params are from
2017-04-15jslint: fix jslint warnings (#1704)Koala Yeung
* jslint: remove trailing space * jslint: fix no-nested-ternary issue Follow the jslint [no-nested-ternary](http://eslint.org/docs/rules/no-nested-ternary) rule. Rewritten ternary with if-then.
2017-04-15Update Traditional Chinese, HK (zh-HK) translation (#1759)Koala Yeung
* Fix missing string in javascript locale (zh-HK) * Change javascript locale (zh-HK) * Fix some other strings that were still English. * Improve `search.status_by`. * Fix `notification.follow`. ("開始開始你") * Changes according to user feedback. * "Back": "較前顯示" -> "返回" * "Home": "家" -> "主頁" * Update ruby locale (zh-HK) * Fix missing translation * Normalize yml * Update translation strings
2017-04-15Update nl.jxs (#1766)Fjoerfoks
Some rewording and switching to infinitive localization.
2017-04-15Update Russian translation (#1733)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
2017-04-15Use site title on tags#show page (#1802)Matt Jankowski
2017-04-15More Norwegian translations (#1805)Thor Harald Johansen
* Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation. * Yet more improvements to the Norwegian translation. * More Norwegian translations. Better terminology.
2017-04-15Send initial state in a <script type="application/json"> tag (#1806)Joachim Viide
2017-04-15[css] reduce spacing between text elements on about pages (#1510)Alex Dunn
2017-04-15Allow running mastodon on a different domain as the one used for identifying ↵ThibG
users (#1267) * Allow running mastodon on a different domain as the one used for identifying users * Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing * Compare to web_domain instead of local_domain when dealing with feeds/API * Correctly identify mentions to local accounts Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.
2017-04-15Add list of muted user to UI and Getting Started (#1799)Patrick Figel
Add the same UI that already exists for blocked users for muted ones and add it to the "Getting Started" menu.
2017-04-15Improve i18n chooser (#1804)Matt Jankowski
* Add locale spec with failing locale plus region check * Use a more accurate locale when supplied by browser headers Previously we were using a matching option which would use the first locale available which matched the locale portion, even if a region was specified. This changes to first try to find an exact match, and then fall back to the region, and then fall back to the default. * Clean up default_locale method
2017-04-14Add title attribute to URLs in statuses (#1755)Luc Didry
Since URLs in statuses are truncated, it would be pleasant to see the full URL when hovering the URL (like on twitter, yes).
2017-04-14Fix invalid byte sequence issue in nl.jsx (#1751)Matt Jankowski
2017-04-14Change usage of gsub to delete, as per Code Climate/Rubocop recommendation ↵Effy Elden
(#1753)
2017-04-14Remove .keep in models (#1748)西小倉宏信
2017-04-14Use landmark regions on columns (#1732)JP DeVries
Closes mastodon#1720
2017-04-14Admin reports controller improvements (#1714)Matt Jankowski
* Simplify admin/reports controller filtering for index * Rename parameter to resolved * Fix issue where reports view could not access filter_link_to * Add coverage for admin/reports controller * DRY up resolution of related reports for target account * Clean up admin/reports routes * Add Report#statuses method * DRY up current account action taken params * Rubocop styles
2017-04-14Implementing Subresource Integrity (#1729)maxypy
* Add sprockets-rails to Gemfile * Add sprockets-rails to Gemfile.lock * Update show.html.haml * Update index.html.haml * Update admin.html.haml * Update auth.html.haml * Update embedded.html.haml * Update public.html.haml
2017-04-13Merge branch 'master' of git://github.com/matteoaquila/mastodon into ↵Eugen Rochko
matteoaquila-master
2017-04-13Fix drag & drop overlay not appearing on firefox (#1721)Eugen
2017-04-13Translate admin (#1702)Thomas Citharel
* Translate the domain_block panel Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate PubSubHubbub section Signed-off-by: Thomas Citharel <tcit@tcit.fr> * translate account section and correct typos * move reports translation & translate sidebar Signed-off-by: Thomas Citharel <tcit@tcit.fr> * normalize l18n
2017-04-13terms: remove redundant words (#1578)Alyssa Ross
"at least X" and "X or older" have identical meanings. Using both together feels a little jarring.
2017-04-13quick typo fix in en.jsx: Rejec -> Reject (#1701)R Tucker
2017-04-13Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699)Eugen
Fix username styling regression introduced in #1063 Fix report screen background regression introduced in #1415
2017-04-13Fix #1609, fix #1628 - Revert #1397 (#1700)Eugen
When transmitting data in a HTML-encoded element like <content type="html" />, relying on newlines being preserved is not wise, since HTML by itself does not care for newlines - it cares for <p> and <br> Additional fix: reset NSFW toggle after sending toot
2017-04-13translation: Fix comment out issue in en.jsx (#1698)INAGAKI Hiroshi
2017-04-13Fix minor jslint issue (#1697)Koala Yeung
* Undefined propType in react component `ColumnSettings`. Add proper PropTypes definition.
2017-04-13Add overlay style to buttons, continue video after expanding itEugen Rochko
2017-04-13Update settings_helper.rbMatteo Aquila
2017-04-13Merge branch 'videolightbox' of git://github.com/blackle/mastodon into ↵Eugen Rochko
blackle-videolightbox
2017-04-13Convert emoji shortnames when sending status (#1666)Rachel H
2017-04-13Add Dutch translation (nl) (#1682)Koala Yeung
* Dutch language files for Ruby code * Created RoR translation ymls: * config/locales/devise.nl.yml * config/locales/doorkeeper.nl.yml * config/locales/nl.yml * config/locales/simple_form.nl.yml * Modified RoR config and helper * app/helpers/settings_helper.rb * config/application.rb * Dutch language javascript locale * Created javascript locale files: * app/assets/javascripts/components/locales/index.jsx * app/assets/javascripts/components/locales/nl.jsx * Reference the newly created locale files: * app/assets/javascripts/components/containers/mastodon.jsx * Fix syntax error in locale file (nl) * Fix missing translate in js locale (nl) * Convert all ruby Dutch locale (nl) file to utf8 Fix yml conversion issues. * Fix duplicated key in devise.nl.yml * Fix indentation error in doorkeeper.nl.yml
2017-04-13Fix issue where 'sensitive content click to show' item takes up whole screen ↵Isabelle Knott
on public view (#1692)
2017-04-13Organize coverage dirs (#1695)Matt Jankowski
* Add `Presenters` group to SimpleCov configuration * Move validators to app/validators, add to simplecov config
2017-04-13Merge branch 'master' into masterEugen
2017-04-13Do not show media attachment as og:image if it was marked as NSFW (#1693)Isabelle Knott
2017-04-13Fix language export variables (#1689)Matt Jankowski
* Fix naming of JS locale constants * Improve the translation instructions re: const names
2017-04-13Update settings_helper.rbMatteo Aquila
2017-04-13Update settings_helper.rbMatteo Aquila
2017-04-13Allow video to be expanded into lightboxblackle
2017-04-13[l10n] ja: update missing Japanese translations (#1687)YOSHIOKA Eiichiro
2017-04-13[l10n] ja: update missing Japanese translations (#1684)Musee U
2017-04-13fix Portuguese translation (#1661)Hugo Gameiro
* update portuguese translation added the missing fields and improved the translation * pt translations fix * improve last translation commit * fix damn quotes
2017-04-13Update Japanese translation files (#1640)新都心(Neet Shin)
* [l10n] ja: Improve Japanese Translations * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com> * Update ja.jsx * Update doorkeeper.ja.yml * Update ja.yml * Update ja.jsx * Update ja.jsx
2017-04-13Update Russian translation (#1570)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
2017-04-13Fix #624 - Add localization for Bulgarian (#645)Svetlozar Todorov
* Add translation files and declarations for Bulgarian * Add a bunch of translations to bg.jsx * Add rest of translations to bg.jsx * Add devise translations * Fix devise translations
2017-04-13Use input type `number` for Two-factor code (#1683)Daijiro Wachi
2017-04-13Clean up well-known routes/controllers (#1649)Matt Jankowski
* Add request spec for host meta route returning xml * Add routing spec for xrd routes * Update well-known routes * Move webfinger and host-meta actions to their own controllers
2017-04-13Admin accounts controller cleanup (#1664)Matt Jankowski
* Remove unused account_params method in admin/accounts controller * Introduce AccountFilter to find accounts * Use AccountFilter in admin/accounts controller * Use more restful routes admin silence and suspension area * Add admin/silences and admin/suspensions controllers
generated by cgit-pink (git 2.37.1) at 2024-11-28 12:15:22 +0000