about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-22refactor-cores (#2308)masarakki
2017-04-22Fix Japanese translation of privacy disclaimer (#2315)unarist
2017-04-22Add author/actor URI to the list of webfinger aliases (#2319)ThibG
This fixes outbound salmon requests to remote GNU Social instances
2017-04-22strip leading & trailing spaces from remote follow acct (#997) (#2321)codl
2017-04-22[WIP] Html lang on statuses (#2297)Matt Jankowski
* Add html lang attributes around statuses * Remove urls from language detection
2017-04-222FA controller cleanup (#2296)Matt Jankowski
* Add spec coverage for settings/two_factor_auth area * extract setup method for qr code * Move otp required check to before action * Merge method only used once * Remove duplicate view * Consolidate creation of @codes for backup * Move settings/2fq#recovery_codes to settings/recovery_codes#create * Rename settings/two_factor_auth#disable to #destroy * Add coverage for the otp required path on 2fa#show * Clean up the recovery codes list styles * Move settings/two_factor_auth to settings/two_factor_authentication * Reorganize the settings two factor auth area Updated to use a flow like: - settings/two_factor_authentication goes to a #show view which has a button either enable or disable 2fa on the account - the disable button turns off the otp requirement for the user - the enable button cycles the user secret and redirects to a confirmation page - the confirmation page is a #new view which shows the QR code for user - that page posts to #create which verifies the code, and creates the recovery codes - that create action shares a view with a recovery codes controller which can be used separately to reset codes if needed
2017-04-22Allowed the emoji picker 'Search...' string to be localized (#2294)Ashley
2017-04-22Improve bio compatibility (#2278)Eugen
* Fix #1057 (close #1819) - Move HTML-formatted bio from <poco:note /> to <summary type="html" /> * Ensure <poco:note /> is plaintext for remote accounts, also, by stripping out HTML
2017-04-22Added API for single notification dismissal (#2251)Ashley
* Added API backend for notification dismissal * Added render statement * Changed statement
2017-04-22Do not set port for puma if it is bound to unix socket (#2289)Akihiko Odaki
Setting port after binding a unix socket puma listen to both of an unix socket and TCP/IP, which is not a desired behavior.
2017-04-22Add tests for StreamEntriesHelper#rtl? (#2286)Joël Quenneville
We used some random Arabic characters to test that the various RTL conditions got triggered.
2017-04-21Fix issue with line return in file (#1947)Naouak
Fix #1940
2017-04-21Put space before image (#1735)Rachel H
2017-04-21Remove deprecated features at React v15.5 (#1905)Yamagishi Kazutoshi
* Remove deprecated features at React v15.5 - [x] React.PropTypes - [x] react-addons-pure-render-mixin - [x] react-addons-test-utils * Uncommented out & Add browserify_rails options * re-add react-addons-shallow * Fix syntax error from resolve conflicts * follow up 59a77923b368d48c590cd9f4a0c6b73ce972d33f
2017-04-21Language: Missing keys for pt and pt-BR (#2277)Eduardo Elias
2017-04-21Allow to listen Unix socket (#2085)Akihiko Odaki
* Allow puma to listen Unix socket * streaming: Show the whole listening address instead of the port Port is not always appropriate (e.g. Unix socket) * streaming: Close server before exiting This change especially allows to remove Unix socket before exiting.
2017-04-21Add Japanese translation for display name and bio counter (#2275)Yamagishi Kazutoshi
* Add Japanese translation for display name and bio counter * Remove dep key
2017-04-21Language: Update missing key for pt and pt-BR (#2276)Eduardo Elias
2017-04-21Fix: missing : for language (#2274)Eduardo Elias
2017-04-21Add Indonesian (Bahasa Indonesia / id) translation (#2200)Koala Yeung
* add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * fix InvalidLocaleData on a string * fix InvalidLocaleData on a string * Fix language keys in Indonesian ruby locale (id) Use "id" instead of "en" as object keys. * Removed obsoleted translation (id)
2017-04-21Add Ido (io) translation (#2202)Koala Yeung
* Add Ido (io) translation * Fix mastodon.jsx for io reference There is no react-intl support for io. Removed the references.
2017-04-21Use local_time gem for timezone replacement (#2174)Matt Jankowski
For the 'time ago' value of stream entry simple statuses and the timestamp value of detailed statuses - output their UTC value and use the browser timezone to convert locally.
2017-04-21Fix mangling of ##tag matches (#2194) (#2247)Mingye Wang
This commit fixes hashtag_html so it correctly handles matches with multiple hash-signs. Bug located by @over9001, initial fix suggested by @nightpool.
2017-04-21Hides superluous details on small screens (#2175)Ash Furrow
* Hides superluous details on small screans. * Addressed feedback from #2175.
2017-04-21Display remaining characters when editing display name and bio (#2219)Sebastian Morr
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