2467 Commits (5abd5437665a9453feaf16c45960483add802378)

 

All Branches   

Search

Author	SHA1	Message	Date
Rachel H	5abd543766	Put space before image (#1735)	8 years ago
Yamagishi Kazutoshi	1948f9e767	Remove deprecated features at React v15.5 (#1905) ... * 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 59a77923b3	8 years ago
Eduardo Elias	27ea2a88c1	Language: Missing keys for pt and pt-BR (#2277)	8 years ago
Akihiko Odaki	16cd648181	Allow to listen Unix socket (#2085) ... * 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.	8 years ago
Yamagishi Kazutoshi	53b21ac1cd	Add Japanese translation for display name and bio counter (#2275) ... * Add Japanese translation for display name and bio counter * Remove dep key	8 years ago
Eduardo Elias	e4550811b2	Language: Update missing key for pt and pt-BR (#2276)	8 years ago
Eduardo Elias	704846a258	Fix: missing : for language (#2274)	8 years ago
Koala Yeung	935aecdc32	Add Indonesian (Bahasa Indonesia / id) translation (#2200) ... * 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)	8 years ago
Koala Yeung	1714f08d75	Add Ido (io) translation (#2202) ... * Add Ido (io) translation * Fix mastodon.jsx for io reference There is no react-intl support for io. Removed the references.	8 years ago
Matt Jankowski	452dc6b5fe	Use local_time gem for timezone replacement (#2174) ... 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.	8 years ago
Mingye Wang	5c9aa2b732	Fix mangling of ##tag matches (#2194) (#2247) ... This commit fixes hashtag_html so it correctly handles matches with multiple hash-signs. Bug located by @over9001, initial fix suggested by @nightpool.	8 years ago
Ash Furrow	78af88e1f4	Hides superluous details on small screens (#2175) ... * Hides superluous details on small screans. * Addressed feedback from #2175.	8 years ago
Sebastian Morr	74c474a652	Display remaining characters when editing display name and bio (#2219)	8 years ago
Takayoshi Nishida	5e33ad29d4	Fix #2195 - Set locale to error pages (#2255) ... * Fix #2195 - Set locale to error pages * Fix #2195 - Cut duplicate process into one method	8 years ago
Ram Lmn	27a99b19e8	Use local fonts and stop scrollable elements from repainting (#2266)	8 years ago
Matt Jankowski	ee0c897bba	User settings mutation (#2270) ... * Add user spec for settings, highlight global default mutation issue * Fix mutation issue caused by settings/preferences spec	8 years ago
Yamagishi Kazutoshi	ceecf96208	Add crossorigin="anonymous" to about (#2272)	8 years ago
ik-fib	47a3036ea6	Add Mastodon version to user agent (#2253)	8 years ago
jeroenpraat	d2dc31a74a	Ruby time format fixed (#2259)	8 years ago
Yamagishi Kazutoshi	60a9b938b4	Upgrade jQuery to v2.x (#2246) ... 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.	8 years ago
178inaba	dd517b9a55	Fix a bug where the hashtag could not be specified with the streaming API (#2258)	8 years ago
Jérémy Benoist	b3329c362e	Open authorized application in a new window (#2250) ... Like it's already done when you click on an application from a toot, it's opening in a new window. 0254ee9795/app/views/stream_entries/_detailed_status.html.haml (L41)	8 years ago
Mingye Wang	b00f4a0cf3	Use new ESLint filename (.json) (#2248) ... * 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)	8 years ago
Ash Furrow	a0ed88a99b	Adds version to about/more and API (#2181) ... * Adds version. * Cleans up code. * Removes standalone endpoint and adds version to instance endpoint. * Addresses feedback from #2181.	8 years ago
May Kittens Devour Your Soul	25d2853db2	Croatian language updates & fixes (#2203) ... * Update hr.jsx * Update and rename simple.form.hr.yml to simple_form.hr.yml fixed file name * Update hr.yml * Update hr.yml	8 years ago
Quent-in	1930051bde	Adjustment of oc.jsx (#2214)	8 years ago
Ash Furrow	6c34eafe02	Enables the Polish translation. (#2235)	8 years ago
jeroenpraat	bbff431e3a	Updated Dutch strings and added Dutch onboarding modal strings (#2243) ... * 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	8 years ago
Mingye Wang	3660a321f0	zh*: minor jsx whitespace fix (#2231)	8 years ago
Yeechan Lu	e06f307c2d	Fix Chinese (China) translation availability (#2230)	8 years ago
Mingye Wang	3b342be2f2	Initial overhaul at zh-CN YML translations (#2242) ... 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.	8 years ago
Matt Jankowski	2dda356e3f	Clean up settings/preferences controller (#2237) ... * Add missing fields group on preferences page * Clean up settings/preferences controller * Extract a UserSettingsDecorator	8 years ago
Andrey Blinov	972f6bc861	Fix Textarea height should be reset upon sending toot #2189 (#2236)	8 years ago
Shel R	d2514445e1	Repair most egregious mistakes in onboarding modal (#1964) ... * 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.	8 years ago
Alda Marteau-Hardi	daa46f14c4	French translation cleanup (#2223) ... * Alphabetically order translation keys * Fix some missing gender neutral translations in french * Add a comment to remind contributors to order translations by key	8 years ago
Matt Jankowski	1ada494bb2	Admin settings controller refactor, add specs, cleanup (#2225) ... * 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	8 years ago
Keiji, Yoshimi	4df26b2621	it may be mentions_status_id_index is duplicated of index_mentions_on_status_id index. (#2224)	8 years ago
Christoph Witzany	556f68ab15	Make Docker image buildable on ARM (#2065) ... * after yarn upgrade * after manually removing node-gyp as top level dependency	8 years ago
Yamagishi Kazutoshi	fdb2689a14	Fix PropTypes warning in OnboardingModal (#2191)	8 years ago
Matt Jankowski	598d3defd5	Use default locale for html lang in layouts (#2212)	8 years ago
Matt Jankowski	7f8044d913	Link to profile/feed/salmon from admin/accounts show page (#2186)	8 years ago
Ash Furrow	66b39ccaed	Removes timestamp from URLs. (#2185)	8 years ago
Eugen	cae2a26ee3	Fix #2120 - Use Status#as_tag_timeline on public hashtag page (#2182) ... * Fix #2120 - Use Status#as_tag_timeline on public hashtag page * Update tags_controller.rb	8 years ago
Miguel Jacq	b79ba3db8a	Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180)	8 years ago
Marcin Cieślak	59a77923b3	Add static gif for upload testing (#2168)	8 years ago
Eugen	2e4afccd9d	Fix #2108 - Fix gif uploads (#2171) ... * 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	8 years ago
evilny0	0876a06e45	Updated note about 'none' SMTP authentication method in .env.production.sample (#2167)	8 years ago
Darshak Parikh	43caf1fa5f	Add some Spanish translatoins (#2170)	8 years ago
alpaca-tc	2c0d756ad9	Extract error messages to locale file (#2162)	8 years ago
jeroenpraat	f06cba3f60	Dutch language strings: a few important fixes (#2163)	8 years ago