Yamagishi Kazutoshi
8a597f0138
Cache assets in travis ( #3532 )
2017-06-03 15:13:12 +02:00
Nolan Lawson
3363f2f4d6
Fix isIntersecting in Chrome ( #3525 )
2017-06-03 14:43:10 +02:00
Mingye Wang
c7f2d6af55
zh-cn&tw.json: "extended info" -> "about this site" ( #3519 )
...
* zh-cn.json: "additional info" -> "more info"
This commit changes the "extended info" (about/more) text to something that translates to "more info", as "additional info" in zh can sound like appending things to the (ugh) navbar, I guess.
Or should I just change it to "about this site" (关于本站)?
* zh-cn.json: navbar.info -> "about this site"
* zh-臺灣.json: navbar.info -> "about this site"
2017-06-03 14:42:47 +02:00
Yamagishi Kazutoshi
e878ddb7c0
Fix spec for #2388 ( #3526 )
2017-06-03 14:40:55 +02:00
Yamagishi Kazutoshi
336f0b0823
Remove WarmCacheService ( #3527 )
...
WarmCacheService is no longer used (removed with 5442083b3c
2017-06-03 14:40:47 +02:00
Yamagishi Kazutoshi
3ea3f24a02
Change toggle state when click label ( #3530 )
2017-06-03 14:40:24 +02:00
ThibG
d567a382e3
Ensure well_known controllers use WEB_DOMAIN by including RoutingHelper ( #2388 )
...
This fixes #2375 .
2017-06-02 22:21:36 +02:00
Clworld
18fe77084f
bump rails version in Gemfile: '~> 5.0.0' -> '~> 5.1.0' ( #3523 )
2017-06-02 20:11:13 +02:00
Naoki Kosaka
dc253ea234
Ignore packs folder when COPY . /mastodon ( #3522 )
2017-06-02 18:09:28 +02:00
Sorin Davidoi
9304114b57
Ignore .idea folder ( #3516 )
...
Used by Intellij IDEA / WebStorm / RubyMine.
2017-06-02 16:19:11 +02:00
Matt Jankowski
1fd5251376
Add index to media_attachments.account_id ( #3510 )
2017-06-02 16:18:54 +02:00
Nolan Lawson
edddc7c791
Enable stats.json analysis with Webpack Visualizer ( #3509 )
2017-06-02 03:49:56 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)
10768aa204
Spec response for forgery ( #3248 )
...
Remove protect_from_forgery in ApiController, which is disabled by the
following skip_before_action, as well.
2017-06-01 20:56:55 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)
e98559c3ff
Resolve custom application stylesheet with Webpack ( #3373 )
...
This implementation is a bit smaller and still has the following benefits:
* No need of app/javascript/packs/custom.js
For custom stylesheet, it typically has only
"require('../styles/custom.scss')" and is redundant.
* No need to extract vendor stylesheet to another asset
Extracting vendor stylesheet could be forgotten by developers who do not
use custom stylesheet.
2017-06-01 20:56:32 +02:00
Matt Jankowski
2212dc4aaa
Update Rails to version 5.1.1 ( #3121 )
...
* Update rails to version 5.1.1
* Run `rails app:update`
* Remove the override of polymorphic activity relationship
* Silence warning about otp_secret attribute being unknown to rails
* We will only introduce form_with where we want to use remote data
2017-06-01 20:53:37 +02:00
Daniel Hunsaker
e1fdac3e9a
[nanobox] Add python for node-gyp ( #3491 )
...
Needed since merge of #3067 .
2017-06-01 17:33:57 +02:00
Yamagishi Kazutoshi
1162f61ca3
Remove unused loaders of webpack ( #3495 )
2017-06-01 17:27:35 +02:00
Yamagishi Kazutoshi
39ea5c0e2e
Improve tests for JavaScript ( #3496 )
...
- Upgrade dependencies
- chai (3.5.0 -> 4.0.1)
- chai-enzyme (0.6.1 -> 0.7.1)
- sinon (2.2.0 -> 2.3.2)
- Change extensions from .jsx to .js
- Don't assign `React` to `global`
- Check code format using ESLint
2017-06-01 17:27:15 +02:00
Yamagishi Kazutoshi
509b0cfafc
Add scenarios for log in ( #3497 )
2017-06-01 17:25:59 +02:00
Yamagishi Kazutoshi
fda5c699c2
Add ESLint rule (object-curly-spacing) ( #3498 )
2017-06-01 17:25:10 +02:00
Matt Jankowski
cb7ee4698f
Rubocop changes ( #3501 )
...
* Update renamed rubocop configuration options
* Remove duplicate rubocop configuration, sort options
2017-06-01 17:24:30 +02:00
Matt Jankowski
d010e270e6
Remove usernames and hashtags from language detection ( #3503 )
...
* Add failing specs for hashtag and username extraction in language detector
* Remove usernames and hashtags from text before language detection
* Handle multiple instances of special case, and reduce whitespace
2017-06-01 09:29:14 -04:00
Matt Jankowski
d1e08bd38c
Handle nil and blank cases in Account finders ( #3500 )
2017-06-01 08:20:36 -04:00
unarist
dbccdcc1b1
Focus the submit button on the boost modal ( #3494 )
...
Focus the submit button when boost modal is opened.
2017-06-01 04:20:10 +02:00
Matt Jankowski
5c63523972
Spec coverage and refactor for the api/v1/accounts controllers ( #3451 )
2017-05-31 21:36:24 +02:00
Matt Jankowski
de4681b2be
Move admin/pubsubhubbub controller to admin/subscriptions ( #3442 )
2017-05-31 20:39:35 +02:00
Matt Jankowski
a132332b86
Add Instance class to list admin records ( #3443 )
2017-05-31 20:38:44 +02:00
Matt Jankowski
b25e42a77f
Misc tidying and clean ups ( #3445 )
...
* Remove trailing whitespace in i18n mailers
* Use query methods instead of #present? on AR attributes
* Delegate Status#account_domain method
* Delegate Mention #account_username and #account_acct methods
2017-05-31 20:38:17 +02:00
Matt Jankowski
5236a62861
Improve spec coverage and clean up api/v1/blocks controller ( #3464 )
2017-05-31 20:34:51 +02:00
Matt Jankowski
0f155829b7
Improve spec coverage and clean up api/v1/follow_requests controller ( #3465 )
2017-05-31 20:32:11 +02:00
Matt Jankowski
84dda45df9
Improve spec coverage and clean up api/v1/domain_blocks controller ( #3466 )
2017-05-31 20:31:14 +02:00
Matt Jankowski
9c7505489f
Refactor api/v1/notifications controller ( #3470 )
2017-05-31 20:30:55 +02:00
Matt Jankowski
75cad1d9d6
Improve spec coverage and clean up api/v1/favourites controller ( #3472 )
2017-05-31 20:30:39 +02:00
Matt Jankowski
2cc3111a77
Expand spec coverage and refactor the Account.find_ methods ( #3485 )
...
* Move specs for account finder methods to concern spec
* Move account finder methods to concern
* Improve spec wording
* Use more explicit comparison to ensure correct return value
* Add coverage for .find_local! and .find_remote!
* Add some methods to the finder
* Use arel on matching_username method
* Avoid ternary in matching domain method
* Simplify finder methods
* Use an AccountFinder class to simplify lookup
2017-05-31 20:28:45 +02:00
Matt Jankowski
bf811e4d4a
Improve spec coverage and clean up api/v1/mutes controller ( #3481 )
2017-05-31 20:27:34 +02:00
Matt Jankowski
d6774d2ca3
Refactor and spec coverage for api/v1/timelines actions ( #3482 )
2017-05-31 20:27:17 +02:00
caasi Huang
bd669e3907
Update zh-TW.json ( #3480 )
...
* Update zh-TW.json
* Update `search_results.total`
2017-05-31 18:46:57 +02:00
Yamagishi Kazutoshi
1a4860a57a
Hold value of I18n.locale with ApplicationHelperSpec ( #3474 )
2017-05-31 17:09:28 +02:00
Yamagishi Kazutoshi
41fa53253c
Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) ( #3479 )
...
* Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail)
* use climate_control
2017-05-31 17:09:17 +02:00
Nolan Lawson
c00ead8a72
Remove react-imageloader ( #3423 )
...
* Remove react-imageloader
* add eslint-disable-line
* improve image loading experience
* remove unneeded import
* use PureComponent
* Use componentWillMount instead of constructor
2017-05-31 17:07:25 +02:00
unarist
e49dc6a06e
Fix load more on account timelines (regression from #3311 ) ( #3475 )
...
This prevents `next` state from being overridden on the loading *new* statuses.
2017-05-31 15:30:26 +02:00
Nolan Lawson
0e12a8dab9
Improve scheduling of requestIdleCallback tasks ( #3477 )
2017-05-31 15:11:33 +02:00
alpaca-tc
3652a39de0
Account.find_remote should be raise ActiveRecord::RecordNotFound ( #3476 )
2017-05-31 15:10:26 +02:00
Matt Jankowski
79335e46fd
Refactor api/v1/apps controller ( #3471 )
2017-05-30 21:16:28 -04:00
Matt Jankowski
7c6e02aaf3
Refactor api/v1/reports controller ( #3469 )
2017-05-30 21:13:31 -04:00
Matt Jankowski
7f55430652
Refactor api/v1/search controller ( #3468 )
2017-05-30 21:11:54 -04:00
Matt Jankowski
8235623362
Improve spec coverage and clean up api/v1/media controller ( #3467 )
2017-05-30 21:11:29 -04:00
Matt Jankowski
83435c49ea
Clean up api/subscriptions controller ( #3448 )
2017-05-31 02:15:09 +02:00
spla
93de41b39b
Catalan language updates ( #3454 )
...
* 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
* Catalan translation update
added activerecord.ca.yml
* Update activerecord.ca.yml
Done
* Updated activerecord.ca.yml
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
2017-05-31 02:14:52 +02:00
Yamagishi Kazutoshi
b1d4b74a44
Change PureComponent to ImmutablePureComponent ( #3460 )
...
* Change PureComponent to ImmutablePureComponent
Change PureComponent to ImmutablePureComponent in AttachmentList.
* rm React.
2017-05-31 02:14:26 +02:00
