Commit graph

3028 commits

Author SHA1 Message Date
Yamagishi Kazutoshi
09f5091102 Show error message to suspended user () 2017-05-24 16:39:09 +02:00
abcang
4c889085d2 Add test when hashtag and URL are concatenated () 2017-05-24 15:36:10 +02:00
Yamagishi Kazutoshi
d54273621b Skip formatting for cashtag in status text ()
Resolve 
2017-05-24 14:32:53 +02:00
Eugen Rochko
b5322046d2 Fix DM being highlighted when it's inside a favourite notification () 2017-05-24 04:22:46 +02:00
Nolan Lawson
bde004c68c Use node instead of babel-node for streaming () 2017-05-24 00:45:05 +02:00
Akihiko Odaki
6af012aae4 Cover HomeController more () 2017-05-23 23:37:24 +02:00
unarist
9642bdbe0a Fix following/followers API to return correct link headers ()
Link headers in following/followers API should include follow_id as max_id/since_id.

However, these API use current_user's account_id instead of follow_id from .
This causes irrelevant result on loading more users.
2017-05-23 23:26:23 +02:00
Eugen Rochko
b886ecea5c Fix Devise destroy method being available to delete user record ()
(You may think that we need account deletions, but this way would've just orphaned the db records)
2017-05-23 21:32:42 +02:00
beatrix
a977728990 don't notify me when my toot is faved by someone i muted () 2017-05-23 20:05:52 +02:00
alpaca-tc
46ca699d72 Toggle sensitive from admin page () 2017-05-23 19:45:43 +02:00
Matt Jankowski
fecc2c2f47 Refactor of API timeline actions ()
- Increase coverage to exercise all parts of each action
- Move into namespace to share common code
- Misc refactor of each action for smaller methods, simpler code
2017-05-23 18:11:39 +02:00
Daniel Hunsaker
4cb458ea09 Add Support for Nanobox ()
* Nanobox Support

- Added support for running Mastodon using Nanobox, both for local development, and for deployment to production
- Dev mode tested and is working properly
- Deployment is undergoing test as of this writing. If it works, this line will be amended to state success; if not, one or more subsequent commits will provide fixes.

* [nanobox] Resolve Deploy Issues

Everything seems to work except routing to the streaming API. Will investigate with the Nanobox staff and make fix commits if needed.

Changes made:
- Also need `NODE_ENV` in production
- Node runs on `:4000`
- Use `envsubst` to commit `.env.production` values, since `dotEnv` packages don't always support referencing other variables
- Can't precompile assets after `transform` hook, but do this locally so it only has to be done once.
- Rails won't create `production.log` on its own, so we do this ourselves.
- Some `start` commands run from `/data/` for some reason, so use absolute paths in command arguments

* [nanobox] Update Ruby version

* [nanobox] Fix db.rake Ruby code style issues

* [nanobox] Minor Fixes

Some minor adjustments to improve functionality:

- Fixed routing to `web.stream` instances
- Adjust `.env.nanobox` to properly generate a default `SMTP_FROM_ADDRESS` via `envsubst`
- Update Nginx configs to properly support the needed HTTP version and headers for proper functionality (the streaming API doesn't work without some of these settings in place)

* [nanobox] Move usage info to docs repo

* [nanobox] Updates for 1.2.x

- Need to leave out `pkg-config` since Nanobox deploys without Ruby's headers - create a gem group to exclude the gem during Nanobox installs, but allow it to remain part of the default set otherwise
- Update cron jobs to cover new/updated Rake tasks
- Update `.env.nanobox` to include latest defaults and additions

* [nanobox] Fix for nokogumbo, added in 1.3.x

Apparently, nokogumbo (pulled in by sanitize, added with `OEmbed Support for PreviewCard` () - 4a7dc4f) tries to install before nokogiri, despite needing nokogiri available to build properly. Instruct it to use the same settings as nokogiri does when building nokogiri directly, instead of via bundler.

* [nanobox] Set NODE_ENV during asset compile

The switch to WebPack will rely on the local value of the NODE_ENV evar, so set it to production during asset compilation.

* [nanobox] Rebase on master; update Nginx configs

- `pkg-config` Gem no longer causes issues in Nanobox, so revert the Gemfile change which allowed excluding it
- Update Nginx configuration files with latest recommendations from production documentation
- Rebase on master to Get This Merged™

Everything should be golden!
2017-05-23 16:54:44 +02:00
Akihiko Odaki
855082f935 Cover StatusesController more () 2017-05-23 16:34:28 +02:00
Akihiko Odaki
d670290506 Cover StreamEntriesController more and remove redundant instructions ()
* Cover StreamEntriesController more

* Remove redundant instructions in StreamEntriesController
2017-05-23 15:04:23 +02:00
Akihiko Odaki
1cf385646a Spec AuthorizeFollowsController assigns @account ()
@account is used by the view.
2017-05-23 13:12:45 +02:00
Akihiko Odaki
4f023cb001 Introduce recent to Follow ()
Introduce recent to Follow, as Account and other models have.
This change also adds specs for the scope and the dependents.
2017-05-23 13:12:19 +02:00
Yamagishi Kazutoshi
5bb10252fa Focus the submit button ()
Focus the submit button when confirmation modal is opened.

Also, changed cancellation link to button.
This makes the meaning clearer.
2017-05-23 13:10:41 +02:00
Audun Larsen
5c7e4ba765 Updates Norwegian translation () 2017-05-23 13:09:53 +02:00
Ira
f103e5fc65 i18n: Latest Hebew strings translated () 2017-05-23 13:08:16 +02:00
Yamagishi Kazutoshi
0b3fa49001 Refactoring. Removed useless import. ()
original: https://github.com/tootsuite/mastodon/pull/2618
2017-05-23 13:08:01 +02:00
Akihiko Odaki
9cc7a3c209 Cover AccountsController more in spec ()
* Introduce recent scope to Status and StreamEntry

Introduce recent scope to Status and StreamEntry as Account has.

* Cover AccountsController more in AccountsController
2017-05-23 02:53:01 +02:00
Eugen Rochko
04304e6538 Fix more locale regressions from () 2017-05-23 02:50:04 +02:00
Matt Jankowski
8dd89e9132 Use local default for postgres host in node streaming service ()
This location varies across postgres installations, and it seems like the pg
package knows how to guess correctly on each system.
2017-05-22 20:27:24 -04:00
Matt Jankowski
4f2a0f546d Coverage for api/web/settings controller () 2017-05-22 23:12:28 +02:00
Matt Jankowski
8c11626321 Add coverage for ReportFilter and AccountFilter () 2017-05-22 15:50:58 -04:00
Eugen Rochko
664eef3527 Bump version 2017-05-22 21:38:19 +02:00
Matt Jankowski
0eb8b00cc9 Specs for cleanup workers ()
* Add spec files for feed and media cleanup workers

* Add coverage for feed and media cleanup schedulers

* Clean up feed and media cleanup workers
2017-05-22 19:36:21 +02:00
Eugen Rochko
cc91569a92 Similarly to , put creation of remote statuses in a transaction, ()
so that public timeline/caching would not encounter incomplete data
2017-05-22 19:35:48 +02:00
Akihiko Odaki
c0aba00ae1 Cover ApplicationController more in spec () 2017-05-22 17:58:57 +02:00
Akihiko Odaki
387e8449a8 Cover AccountUnfollowController more in spec () 2017-05-22 17:58:49 +02:00
Tomonori Murakami
323eeb096c Fix locale bug when change it on preferences () () 2017-05-22 17:58:41 +02:00
Akihiko Odaki
4f061bc92c Cover AccountFollowController more in spec () 2017-05-22 16:29:48 +02:00
Akihiko Odaki
680f357380 Cover AboutController more in spec () 2017-05-22 16:27:19 +02:00
Eugen Rochko
a2f664f763 Fix locale regression from () 2017-05-22 16:26:54 +02:00
Ratmir Karabut
bb40976006 Update Russian translation ()
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error

* Update Russian translation

* Fix formatting error

* Update Russian translation

* Update Russian translation

* Update ru.jsx

* Fix syntax error

* Remove two_factor_auth.warning (appears obsolete)

* Add missing strings in ru.yml

A lot of new strings translated, especially for the newly added admin section

* Fix translation consistency

* Update Russian translation

* Update Russian translation (pluralizations)

* Update Russian translation

* Update Russian translation
2017-05-22 16:03:50 +02:00
Nolan Lawson
e228bdd3b6 Add webpack-bundle-analyzer for production builds () 2017-05-22 15:42:11 +02:00
Immae
ae917bfb23 Allow alternate domains for mastodon handlers () 2017-05-22 15:40:04 +02:00
Nolan Lawson
2d7aacf747 Only load Intl data for current language ()
* Only load Intl data for current language

* Extract common chunk only from application.js and public.js

* Generate locale packs, avoid caching on window object
2017-05-22 15:06:06 +02:00
Yamagishi Kazutoshi
410a684c3b Change "Account.any?" to "Account.exists?" () 2017-05-22 15:02:30 +02:00
m4sk1n
d316260e92 Updated Polish translation ()
* i18n: updated Polish translation

Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>

* i18n: completed Polish translation

Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>

* i18n: corrected Polish translation

Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>

* i18n: Updated Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* Update simple_form.pl.yml

* Update simple_form.pl.yml
2017-05-22 15:01:53 +02:00
unarist
21d9bb041e Keep children of the column-collapsable until the transition is completed () 2017-05-22 15:01:27 +02:00
Clworld
2214d1ecd7 Set config.cache_store in environments file. ()
* Set config.cache_store in application.rb

* Set config.cache_store in environments.

* fix code format.
2017-05-22 15:01:02 +02:00
unarist
0581edb572 Fix "Edit profile" on the account action bar () 2017-05-22 14:57:50 +02:00
Akihiko Odaki
cbd9804857 single_user_mode? always returns boolean ()
This change also adds a specification for the method.
2017-05-22 06:00:06 +02:00
Yamagishi Kazutoshi
901a36039e Add translations for counter of profile ()
ref 
2017-05-22 04:45:55 +02:00
Masoud Abkenar
9ce65dd7dc Persian translation update ()
* Persian translation update

* Persian translation update: new files

* Persian translation update

* activerecord.fa.yml language code

* Persian translation update

* fix indent
2017-05-22 00:20:13 +02:00
Eugen Rochko
9f05b5a078 Fix forgotten to include language attribute in statuses JSON () 2017-05-21 21:38:09 +02:00
happycoloredbanana
cb68926ebf Allow access token in URI () 2017-05-21 21:13:11 +02:00
ster
0dfe09d630 Update Ukrainian translation () 2017-05-21 18:52:50 +02:00
Akihiko Odaki
90c8175cb0 Fix mutes_controller error and incorrect statuses_controller report ()
This commit fixes a regression in commit
9d32e7f6d5.
2017-05-21 13:32:13 +02:00