about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-21Fix #2195 - Set locale to error pages (#2255)Takayoshi Nishida
* Fix #2195 - Set locale to error pages * Fix #2195 - Cut duplicate process into one method
2017-04-21Use local fonts and stop scrollable elements from repainting (#2266)Ram Lmn
2017-04-21User settings mutation (#2270)Matt Jankowski
* Add user spec for settings, highlight global default mutation issue * Fix mutation issue caused by settings/preferences spec
2017-04-21Add crossorigin="anonymous" to about (#2272)Yamagishi Kazutoshi
2017-04-21Add Mastodon version to user agent (#2253)ik-fib
2017-04-21Ruby time format fixed (#2259)jeroenpraat
2017-04-21Upgrade jQuery to v2.x (#2246)Yamagishi Kazutoshi
Fix #2199 and minifying assets file. jQuery v1.x is supports legacy browsers. But, Mastodon does not support legacy browsers. I think jQuery v1.x is unnecessary.
2017-04-21Fix a bug where the hashtag could not be specified with the streaming API ↵178inaba
(#2258)
2017-04-21Open authorized application in a new window (#2250)Jérémy Benoist
Like it's already done when you click on an application from a toot, it's opening in a new window. https://github.com/tootsuite/mastodon/blob/0254ee9795822ec75ff64ace6ec2b91573bc9a52/app/views/stream_entries/_detailed_status.html.haml#L41
2017-04-21Use new ESLint filename (.json) (#2248)Mingye Wang
* Use new ESLint filename (.json) Codeclimate's ESLint 3 is complaining about the old filename. Let me try changing it. * point eslint to new rc (squash this)
2017-04-21Adds version to about/more and API (#2181)Ash Furrow
* Adds version. * Cleans up code. * Removes standalone endpoint and adds version to instance endpoint. * Addresses feedback from #2181.
2017-04-21Croatian language updates & fixes (#2203)May Kittens Devour Your Soul
* Update hr.jsx * Update and rename simple.form.hr.yml to simple_form.hr.yml fixed file name * Update hr.yml * Update hr.yml
2017-04-21Adjustment of oc.jsx (#2214)Quent-in
2017-04-21Enables the Polish translation. (#2235)Ash Furrow
2017-04-21Updated Dutch strings and added Dutch onboarding modal strings (#2243)jeroenpraat
* A bit of more explanation * Update nl.yml * That's more elegant * More consistent and adding missing translation * Update * Update * Added Dutch onboarding modal strings
2017-04-21zh*: minor jsx whitespace fix (#2231)Mingye Wang
2017-04-21Fix Chinese (China) translation availability (#2230)Yeechan Lu
2017-04-21Initial overhaul at zh-CN YML translations (#2242)Mingye Wang
This commit provides a heavy proofreading of zh-CN translations, and mainly draws from the zh-HK source when a translation is found too incoherent. Translating directly from en is used when zh-HK translation is not available. This commit also completes the tweet-toot (choo-choo, actually) for zh-cn introduced in #2044. Some minor copyediting, as well as additional en translations, has been fed back into zh-hk text.
2017-04-21Clean up settings/preferences controller (#2237)Matt Jankowski
* Add missing fields group on preferences page * Clean up settings/preferences controller * Extract a UserSettingsDecorator
2017-04-20Fix Textarea height should be reset upon sending toot #2189 (#2236)Andrey Blinov
2017-04-20Repair most egregious mistakes in onboarding modal (#1964)Shel R
* Repair most egregious mistakes The deployed changes broke the pedagogy and curriculum built into the design of the onboarding modals, which had been reviewed and approved by various other contributors. While the changed layouts of the pages make some of the original decisions impossible to re-implement without substantial work, these changes should at least make the modals not outright terrible. The empty confusing description of Mastodon was replaced with an actual basic explanation of federation. The language was modified to be friendly and conversational again. Grammatical errors were fixed. The explanations of local and federated timelines were re-ordered to be in the direct that the menus go, top to bottom, and the sentence was re-added which explains that they are what "public timelines" refers to (since this phrasing is used elsewhere in the UI) and suggests the user use them to discover who to follow. A figure of the profile picture that lives above the compose box was padded to page two to serve as a landmark for less technically literate users to easily find the compose box and understand that the next page is moving upwards, so that they can find the search bar. Ideally, the elephant artwork should be either removed or replaced with something less depressing. Room should be made to point users at the notifications column's settings icon because "how do I turn off the notification noise" is one of the most asked questions of new users and those icons are not easily noticeable. This last part may be made obsolete if the settings UI is later re-worked. * Change copy This commit addresses copy change suggestions made in the PR discussion * Add periods to ends of sentences missing periods * Made "Home" "Federated" "Local" and "Notifications" lowercase * Separate explanation of "connecting" and the word "instance" into two sentences, to make the sentence less dense.
2017-04-20French translation cleanup (#2223)Alda Marteau-Hardi
* Alphabetically order translation keys * Fix some missing gender neutral translations in french * Add a comment to remind contributors to order translations by key
2017-04-20Admin settings controller refactor, add specs, cleanup (#2225)Matt Jankowski
* Add render_views for admin/settings spec * Add coverage for admin/settings#update * Add coverage for admin/settings typecasting open_registrations setting * Simplify how admin/settings finds the value for updating * Rely on activerecord to not update a value that hasnt changed * Add coverage for non-existent setting * Use a constant for boolean settings
2017-04-20it may be mentions_status_id_index is duplicated of ↵Keiji, Yoshimi
index_mentions_on_status_id index. (#2224)
2017-04-20 Make Docker image buildable on ARM (#2065)Christoph Witzany
* after yarn upgrade * after manually removing node-gyp as top level dependency
2017-04-20Fix PropTypes warning in OnboardingModal (#2191)Yamagishi Kazutoshi
2017-04-20Use default locale for html lang in layouts (#2212)Matt Jankowski
2017-04-20Link to profile/feed/salmon from admin/accounts show page (#2186)Matt Jankowski
2017-04-20Removes timestamp from URLs. (#2185)Ash Furrow
2017-04-20Fix #2120 - Use Status#as_tag_timeline on public hashtag page (#2182)Eugen
* Fix #2120 - Use Status#as_tag_timeline on public hashtag page * Update tags_controller.rb
2017-04-20Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the ↵Miguel Jacq
envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180)
2017-04-19Add static gif for upload testing (#2168)Marcin Cieślak
2017-04-19Fix #2108 - Fix gif uploads (#2171)Eugen
* Fix #2108 - Fix gif uploads Add specs for media attachment gifv conversion * Add ffmpeg to travis * Make travis install ffmpeg, not libav * Switch travis to trusty
2017-04-19Updated note about 'none' SMTP authentication method in ↵evilny0
.env.production.sample (#2167)
2017-04-19Add some Spanish translatoins (#2170)Darshak Parikh
2017-04-19Extract error messages to locale file (#2162)alpaca-tc
2017-04-19Dutch language strings: a few important fixes (#2163)jeroenpraat
2017-04-19Fixed hungarian translation (#2158)György Nádudvari
2017-04-19Fix css for toot button when uploading images (#2161)Tomohiro Suwa
2017-04-19fix broken style when follower has long description (#2159)fsubal
2017-04-19Fix double-escaping of display names in <title> (#2155)Eugen
2017-04-19Fix possibility of unrightful webfinger redirect (#2147)Eugen
* Fix possibility of unrightful webfinger redirect * Add more tests for FollowRemoteAccountService
2017-04-19Remove unused view files in accounts/ (#2153)Matt Jankowski
2017-04-19Add meta tags for OGP to following & follow page (#2052)Yamagishi Kazutoshi
* Add meta tags for OGP to following & follow page * simplify render helper * Follow up #2133 * og:type is only accounts/show * revert accounts/{following,followers}
2017-04-19fix Japanese search result translation (#2149)matsurai25
add 'result' mean, '件' only mean count unit.
2017-04-19Completed Italian translation (#2151)Matteo Aquila
* Added it.jsx * Update index.jsx * Update mastodon.jsx
2017-04-19fix search text 'zero' (#2150)matsurai25
2017-04-19Automatically change the size of textarea (#2128)geta6
2017-04-19Simplify render in controllers (#2144)Matt Jankowski
2017-04-19Attachment list for uncached attachments (#2110)Eugen
* For undownloaded attachments, set type :unknown, display them as a list in the web UI * Fix case when attachment type is set explicitly