2961 Commits (419226d1f6ceb59958b15a56c1109750b1cb9860)

 

All Branches   

Search

Author	SHA1	Message	Date
jeroenpraat	7c1f3f8163	Added a warning to look into the spam folder (#2921) ... Inspired by a user who received the email confirmation in Gmail's spam folder. This happened with Sparkpost correctly setup.	8 years ago
jeroenpraat	eab93992d1	One string NL update (#3090)	8 years ago
Eugen Rochko	0d59d7c680	Fix #2549 - Do not hardcode the exclamation in "toot!", wrap it in an extra locale key (#3089)	8 years ago
Eugen Rochko	1efda1c453	Fix #2572 - Resolve preview cards for remote statuses as well as local ones (#3088)	8 years ago
spla	a51c8074df	Add catalan language (#3084) ... * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225	8 years ago
unarist	3722f90865	Make .column-collapse animation simple (#3086) ... * Always set `overflow: auto` to allow scroll just after opening * Remove bounce animation which may cause unintended behavior due to max-height * Use CSS transition instead of react-motion * Some CSS refactoring including className changing	8 years ago
Hiroaki Ninomiya	9bddb946f0	feat(ja): add missing ja translation. (#3083) ... ref: https://github.com/tootsuite/mastodon/pull/2584	8 years ago
geta6	bbaac89eb0	Enable to handle app immediately after closing modal (#3082)	8 years ago
Shunsuke Michii	0dfffb6dcb	Make faster ProcessFeedService (#3080) ... * Add index accounts on uri. * Remove a blank line.	8 years ago
masarakki	1b0a5658f1	use-symbol-in-order (#3081)	8 years ago
alpaca-tc	682b68438e	Improve Account#triadic_closures (#3079)	8 years ago
alpaca-tc	09ec6e504b	Order by symbol value (#3077)	8 years ago
alpaca-tc	a2a2af244c	Optimize Status#permitted_for 24x (#3069) ... * Build query with arel node * Add spec for current Status#permitted_for implementation * Refactor status.rb * Order by visibility to optimize query	8 years ago
Hiroaki Ninomiya	cb50ecdb07	chore(landing_strip): hide signup path unless the instance allows registration. (#3055)	8 years ago
Hiroaki Ninomiya	1379124682	Improve ja translation (#3071) ... * chore(ja): replace with reasonable word. * chore(ja): add periods.	8 years ago
Matt Jankowski	0b34ade66b	Update devise to version 4.3.0 (#3074) ... Supports rails 5.1	8 years ago
Eugen Rochko	191696ab30	Fix #2646 - Do not override ctrl/cmd+click on Permalinks (#3073)	8 years ago
Eugen Rochko	af706583bd	Fix change of status callbacks not setting in_reply_to_account_id and (#3072) ... possibly others when expected. Add some tests for it	8 years ago
Akihiko Odaki	85c9496340	Introduce common JavaScript file (#2981) ... * Create common chunk rather than vendor chunk vendor chunk is a set of modules provided by external vendors, but now we can have a chunk as a set of modules shared by multiple entry points, which could be more efficent than having vendor chunk. * Start rails-ujs in common.js This is used by /settings/two_factor_authentication.	8 years ago
Kazuhiro NISHIYAMA	6ee3a10f17	Update Japanese tranlsation of conversations muting (#3070)	8 years ago
Eugen Rochko	d0dd9eb5b5	Feature conversations muting (#3017) ... * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation	8 years ago
Eugen Rochko	a588358f41	Fix style regressions (#3062) ... From #2327 - Elephant friend was overlapping with text, oversized in single column layout From #2021 - Centered layout goes against design principles, changes UX for everybody who's already used to the current one From #2271 - CPU/RAM overusage from keeping columns in DOM (fix #2648, possibly also #2101)	8 years ago
esetomo	0a110d07b6	Update capistrano lock version to 3.8.1 (#3056)	8 years ago
Matt Jankowski	5f727f9068	Update rails to version 5.0.3 (#3054) ... * Update rails to version 5.0.3 * Update aws-sdk to version 2.9.17 * Update capistrano to version 3.8.1 * Update climate_control to version 0.2.0 * Update debug_inspector to version 0.0.3 * Update et-orbi to version 1.0.4 * Update oj to version 3.0.7 * Update microformats2 to version 2.9.0 * Update lograge to version 0.5.1 * Clean up usage of Microformats2 object to remove deprecation warnings * Update microformats2 to version 3.0.1	8 years ago
Yamagishi Kazutoshi	72c8562cc9	Use babel-preset-env on Streaming Server (#2998) ... * Use babel-preset-env on Streaming Server Change the streaming server to use babel-preset-env as well as asset compilation. This shortens the load time at first boot. * remove babel-plugin-lodash	8 years ago
Yamagishi Kazutoshi	882e4f5322	Remove Babel plugin for ES Modules (#2975) ... * Remove Babel plugin for ES Modules Processing of ES Modules is executed by Webpack. Don't have to do it on Babel side. * Add plugin for test	8 years ago
Paul	bc1a91f4cd	Fix only typo (#3035)	8 years ago
Yamagishi Kazutoshi	aeb90b7c4a	Add browserslist config for autoprefixer (#3053) ... We will reduce the weight of the style sheet by specifying the target web browser of autoprefixer.	8 years ago
William Pitcock	fb87e847bc	Add heroku APT buildpack for scalingo. (#3051)	8 years ago
Eugen Rochko	657496b5a9	Do not cancel PuSH subscriptions after encountering "permanent" error… (#3046) ... * Do not cancel PuSH subscriptions after encountering "permanent" error response After talking with MMN about it, turns out some servers/php setups do return 4xx errors while rebooting, so this anti-feature that was meant to take load off of the hub is doing more harm than good in terms of breaking subscriptions * Update delivery_worker.rb	8 years ago
beatrix	fd03a3d957	tiny js fix for 'show more' button in chrome (#3045)	8 years ago
Stephen Burgess	4bd0488a77	feat(count): Just yml count syntax to provide different rule for 1 (#2685) ... Update all translation forms that use this "counter" element.	8 years ago
Ira	1b17da6ed9	i18n: Hebrew string updates (#3037)	8 years ago
Bastien	dc5b746f42	Small FR localisation enhancements (#3033) ... * Small localisation enhancement. Be consistent regarding "e-mail" vs "courriel": I suggest using "courriel" to refer to the electronic message and "e-mail" when used in "adresse e-mail". This reflects the usage I generally observe, but I may be wrong. * Localisation enhancements. Omit some commas: "..., ..., ou ..." should be "..., ... ou ..." since "ou" already articulates the sentence. Also replace "demande" by "requête" when it makes sense.	8 years ago
Shunsuke Michii	89210781cb	Fix og:url. (#3031)	8 years ago
alpaca-tc	e9810cbad6	Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)	8 years ago
Yamagishi Kazutoshi	1027556614	Fix broken storybook (#3030)	8 years ago
beatrix	3dcb5fa28f	Revert HTML CW changes (#3020) ... * selectively Revert "Fix regressions from #2683 (#2970)" This reverts commit 72698bc3b4. * Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)" This reverts commit e2491680e6.	8 years ago
Eugen Rochko	1d5dcfcd46	Make direct statuses stand out more (#3025) ... Resolves #2515	8 years ago
jeroenpraat	66ff9ed34e	Finalizing Dutch strings (#3028) ... for this file.	8 years ago
Daigo 3 Dango	66328adf83	Rebuild node-sass (#3002) ... Got an error in asset precompile on Heroku: Module build failed: Error: ENOENT: no such file or directory, scandir '/tmp/.../node_modules/node-sass/vendor' ref: https://github.com/rails/webpacker#troubleshooting	8 years ago
Wonderfall	b65950bb2e	fix #3008 : props was not defined (#3022)	8 years ago
Matt Jankowski	0d70fe2659	Spec coverage and refactor for pubsub/delivery worker (#3021) ... * Framework for delivery worker spec * Refactor of pubsub delivery worker	8 years ago
Shel Raphen	a1fc2cfa09	Fix color contrast some more in privacy warning (#3018) ... * Fix color contrast some more in privacy warning Latest master appears to have changed the <strong> to this unreadable grey color. If you want that to be white then it should be pure white. If someone would rather revert this to that strong dark blue color it was before that would be good too. * Make domain dark blue again * add missing ; woops	8 years ago
Koala Yeung	b535966ab5	Allow SCSS variables to be overridden (#2987) ... * Allow SCSS variables to be overridden with `app/javascript/pack/variables*.scss` * Allow these SCSS variables to be overriden: * `$base-shadow-color` * `$base-overlay-background` * `$base-border-color` * `$simple-background-color` * `$primary-text-color` * `$valid-value-color * `$error-value-color`	8 years ago
Matt Jankowski	02412429ab	Remove reference to non-existent table in schema rb (#3019)	8 years ago
Eugen Rochko	5abdc77c80	Add conversation model, <ostatus:conversation /> (#3016) ... * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Fix conversation migration * More spec coverage for status before_create * Prevent n+1 query when generating Atom with the new conversations * Improve code style * Remove redundant local variable	8 years ago
Eugen Rochko	b5a9c6b3d2	Prepend reblogs' wrapper content with "RT @original_author", (#3013) ... so that when a reblog parse fails on another instance, it doesn't look like a misattributed/stolen text	8 years ago
Shel Raphen	60f3230a05	Increase color contrast on privacy warning (#3015) ... The current text contrast on the privacy warning is a WCAG violation. I didn't notice this because my instance has a custom theme which is better. On default theme I am barely able to read the text with my impaired vision. This patch brings the contrast to Normal Text WCAG AA compliance, and Large Text WCAG AAA compliance.	8 years ago
Eugen Rochko	0cb4b9205c	Fix sidekiq "port" being wrong (#3014) ... Sidekiq doesn't need a port, however that env var is used for generating URLs in development, so when foreman sets it wrong, you get bad URLs from the streaming API during development	8 years ago