1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-02 21:23:18 +00:00
Commit graph

3031 commits

Author SHA1 Message Date
Daigo 3 Dango f5c3d20e9c Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs ()
This change adds mp4 support confirmed on Heroku-16 stack.
2017-05-24 17:57:33 +02:00
Yamagishi Kazutoshi 1ec7c87001 Remove unnecessary constructors () 2017-05-24 17:55:16 +02:00
Sorin Davidoi 8e4d1cba00 Lazy load toots using IntersectionObserver ()
* refactor(components/status_list): Lazy load using IntersectionObserver

* refactor(components/status_list): Avoid setState bottleneck

* refactor(components/status_list): Update state correctly

* fix(components/status): Render if isIntersecting is undefined

* refactor(components/status): Recycle timeout

* refactor(components/status): Reduce animation duration

* refactor(components/status): Use requestIdleCallback

* chore: Split polyfill bundles

* refactor(components/status_list): Increase rootMargin to 300%

* fix(components/status): Check if onRef is not defined

* chore: Add note about polyfill bundle splitting

* fix(components/status): Reduce animation duration to 0.3 seconds
2017-05-24 17:55:00 +02:00
Yamagishi Kazutoshi 676ba50601 Show error message to suspended user () 2017-05-24 16:39:09 +02:00
abcang bbc3db8b20 Add test when hashtag and URL are concatenated () 2017-05-24 15:36:10 +02:00
Yamagishi Kazutoshi f937cad68f Skip formatting for cashtag in status text ()
Resolve 
2017-05-24 14:32:53 +02:00
Eugen Rochko be83d450eb Fix DM being highlighted when it's inside a favourite notification () 2017-05-24 04:22:46 +02:00
Nolan Lawson 1fd18a61bd Use node instead of babel-node for streaming () 2017-05-24 00:45:05 +02:00
Akihiko Odaki 5d9f479538 Cover HomeController more () 2017-05-23 23:37:24 +02:00
unarist 3ce9ca4c99 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 2ca1f0737a 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 19ecde8fe7 don't notify me when my toot is faved by someone i muted () 2017-05-23 20:05:52 +02:00
alpaca-tc 7ee5fc5d68 Toggle sensitive from admin page () 2017-05-23 19:45:43 +02:00
Matt Jankowski 4289ed1d13 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 256e3adc1d 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` () - 88725d6) 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 152b4d54e8 Cover StatusesController more () 2017-05-23 16:34:28 +02:00
Akihiko Odaki ea2ef16ea4 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 1d3e0a5060 Spec AuthorizeFollowsController assigns @account ()
@account is used by the view.
2017-05-23 13:12:45 +02:00
Akihiko Odaki bf575a1f5e 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 860ffc0560 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 7eb4abe20a Updates Norwegian translation () 2017-05-23 13:09:53 +02:00
Ira 1baa75f79f i18n: Latest Hebew strings translated () 2017-05-23 13:08:16 +02:00
Yamagishi Kazutoshi 1d436a4322 Refactoring. Removed useless import. ()
original: https://github.com/tootsuite/mastodon/pull/2618
2017-05-23 13:08:01 +02:00
Akihiko Odaki 8fd174298d 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 9afd7dadbf Fix more locale regressions from () 2017-05-23 02:50:04 +02:00
Matt Jankowski 8e84177305 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 a28ce13b3e Coverage for api/web/settings controller () 2017-05-22 23:12:28 +02:00
Matt Jankowski e1b42e9aa0 Add coverage for ReportFilter and AccountFilter () 2017-05-22 15:50:58 -04:00
Eugen Rochko b51398d0dd Bump version 2017-05-22 21:38:19 +02:00
Matt Jankowski ec34ec63b1 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 4a4733b397 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 bda7391221 Cover ApplicationController more in spec () 2017-05-22 17:58:57 +02:00
Akihiko Odaki b9e8ffbd12 Cover AccountUnfollowController more in spec () 2017-05-22 17:58:49 +02:00
Tomonori Murakami 7966d3a872 Fix locale bug when change it on preferences () () 2017-05-22 17:58:41 +02:00
Akihiko Odaki 422e4d897b Cover AccountFollowController more in spec () 2017-05-22 16:29:48 +02:00
Akihiko Odaki cb2707776f Cover AboutController more in spec () 2017-05-22 16:27:19 +02:00
Eugen Rochko 48e7a22e34 Fix locale regression from () 2017-05-22 16:26:54 +02:00
Ratmir Karabut 2bb5486357 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 60e2b951de Add webpack-bundle-analyzer for production builds () 2017-05-22 15:42:11 +02:00
Immae a94c152fd3 Allow alternate domains for mastodon handlers () 2017-05-22 15:40:04 +02:00
Nolan Lawson 9d04de1c8d 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 73e4468ff3 Change "Account.any?" to "Account.exists?" () 2017-05-22 15:02:30 +02:00
m4sk1n fbbd80b40b 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 361a606edb Keep children of the column-collapsable until the transition is completed () 2017-05-22 15:01:27 +02:00
Clworld df92f010ad 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 07af8c05fd Fix "Edit profile" on the account action bar () 2017-05-22 14:57:50 +02:00
Akihiko Odaki aa662cecad 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 84608c3ff8 Add translations for counter of profile ()
ref 
2017-05-22 04:45:55 +02:00
Masoud Abkenar b69365e397 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 a478af92c3 Fix forgotten to include language attribute in statuses JSON () 2017-05-21 21:38:09 +02:00