about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-07-07i18n: improve consistency (pl) (#4104)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-07Gracefully stop streaming server (#4103)Nolan Lawson
2017-07-07i18n: @18d3fa9 (pl) (#4101)m4sk1n
2017-07-07Restore streaming API output format (#4100)Eugen Rochko
* Restore streaming API output format Regression from #4090 * Remove whitespace
2017-07-07Fix notifications including wrong status in JSON (#4097)Eugen Rochko
2017-07-07Update webpack-dev-server to v2.5.1 (#4094)Yamagishi Kazutoshi
2017-07-07Add recursive object support to API response (#4095)Yamagishi Kazutoshi
2017-07-07Fix feed author not being enforced in ProcessFeedService (#4092)Eugen Rochko
Ensure the only allowed author of top-level entries in feed is the person the feed belongs to (a verified user). Ensure delete events only apply if the deleted item belonged to that user.
2017-07-07Refactor JSON templates to be generated with ActiveModelSerializers instead ↵Eugen Rochko
of Rabl (#4090)
2017-07-07Togglable filter links (#4021)のら
* Togglable filter links * Rename is_selected to selected?
2017-07-07[nanobox] Add Automated Backups (#4023)Daniel Hunsaker
This PR adds automatic backups to Nanobox instances. The database, Redis, and user files are backed up every day at 03:00 (server time) to the data warehouse component which comes with every Nanobox app. Old backups are automatically cleared out, but the number of backups that are left untouched can be configured by setting the `BACKUP_COUNT` environment variable to any integer value greater than 0 (the default is 1). Also updated `.env.nanobox` to reflect the current `.env.production.sample`.
2017-07-07Set default From address in config (#3756)Akihiko Odaki (@fn_aki@pawoo.net)
The old implementation sets default From address in mailers. It sets the address from SMTP_FROM_ADDRESS, or notifications@localhost. The behavior is occasionally undesired results. In production environment, notifications@localhost is likely to be incorrect. In testing environment, the email address should not be varied by a environment variable. After appling this change, In production environment, it will throw an exception when launching Mastodon. In testing environment, the address will be fixed with notifications@localhost.
2017-07-06Add a setting allowing the use of system's default font in Web UI (#4033)Damien Erambert
* add a system_font_ui setting on the server * Plug the system_font_ui on the front-end * add EN/FR locales for the new setting * put Roboto after all other fonts * remove trailing whitespace so CodeClimate is happy * fix user_spec.rb * correctly write user_spect this time * slightly better way of adding the classes * add comments to the system-font stack for clarification * use .system-font for the class instead * don't use multiple lines for comments * remove trailing whitespace * use the classnames module for consistency * use `mastodon-font-sans-serif` instead of Roboto directly
2017-07-06Improve Activity stream spoiler (#4088)abcang
2017-07-06Parse links in status content on update as well as mount (#4042)STJrInuyasha
* Update links in status content on update as well as mount Fixes occasional bugs with mentions and hashtags not being set to open in a new column like they should, and instead opening in a new page * use classList instead of raw className
2017-07-06Unobserve status on unmount (#4013)unarist
This fixes a warning on status unmounting (e.g. deletion). This also resets IntersectionObserverWrapper on disconnect to avoid `unobserve()` calls which has bug in Edge.
2017-07-06Remove ugly blue highlight on Android browsers (#4031)Mantas
2017-07-06l10n Occitan locale (#4089)Quent-in
* Small adjustments About the report part. * Update time format
2017-07-06Fix embedded SVG fill attribute (#4086)Shin Kojima
* Fix embedded SVG fill attribute SCSS darken/lighten functions may not return a color value, but a color name like "white". See following example: https://www.sassmeister.com/gist/c41da93b87d536890ddf30a1f42e7816 This patch will normalize $color argument to FFFFFF style. I also changed the function name from "url-friendly-colour" to "hex-color", Because... 1. The name "url-friendly" is not meaningful enough to describe what it does. 2. It is familier to me using "color" rather than "colour" kojima:kojiMac mastodon[master]$ git grep -l colour app/javascript/styles/boost.scss spec/fixtures/files/attachment.jpg kojima:kojiMac mastodon[master]$ git grep -l color .rspec .scss-lint.yml Gemfile.lock app/javascript/mastodon/features/status/components/action_bar.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/admin.scss app/javascript/styles/basics.scss app/javascript/styles/boost.scss app/javascript/styles/compact_header.scss app/javascript/styles/components.scss app/javascript/styles/containers.scss app/javascript/styles/footer.scss app/javascript/styles/forms.scss app/javascript/styles/landing_strip.scss app/javascript/styles/reset.scss app/javascript/styles/stream_entries.scss app/javascript/styles/tables.scss app/javascript/styles/variables.scss app/views/admin/subscriptions/_subscription.html.haml app/views/layouts/application.html.haml app/views/layouts/error.html.haml app/views/manifests/show.json.rabl bin/webpack-dev-server config/initializers/httplog.rb public/500.html public/emoji/1f1e6-1f1e8.svg public/emoji/1f1ec-1f1f8.svg public/emoji/1f1f3-1f1ee.svg public/emoji/1f1fb-1f1ec.svg spec/fixtures/requests/idn.txt yarn.lock * Add semicolon
2017-07-06i18n: minor changes in Polish translation (#4087)m4sk1n
* i18n: minor changes in Polish translation * Update pl.json
2017-07-05Explicitly require MIME::Types (#4083)Akihiko Odaki (@fn_aki@pawoo.net)
2017-07-05Fix Nokogiri::HTML at FetchLinkCardService (#4072)abcang
2017-07-05Show LoadMore button on Notifications even if all items are filtered (#4077)unarist
2017-07-05Format datetime of subscriptions on admin UI (#4078)Yamagishi Kazutoshi
2017-07-04i18n: Updated Polish translation (#4068)m4sk1n
* i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * fuggin nano
2017-07-04i18n: Update korean translation (#4066)Gyuhwan Park
* Added Korean Translation (based on japanese) * Update korean translation * Update korean translation: fix syntax error * Updated korean translation * Update korean translation * Update ko.json Translate non-translated parts * Update ko.yml Translated missed parts - and fixed some typos * Create simple_form.ko.yml * Updated korean translation * i18n: fix test fails * Updated korean translation
2017-07-04Fix Korean translation (#4065)Minori Hiraoka
* Added Korean Translation (based on japanese) * Update korean translation * Update korean translation: fix syntax error * Updated korean translation * Update korean translation * Update ko.json Translate non-translated parts * Update ko.yml Translated missed parts - and fixed some typos * Create simple_form.ko.yml * Update simple_form.ko.yml Translation error fix - password change form * Update simple_form.ko.yml * Update ko.json Missing translation
2017-07-04i18n: Add korean translation (#4064)Gyuhwan Park
* Added Korean Translation (based on japanese) * Update korean translation * Update korean translation: fix syntax error * Updated korean translation * Update korean translation * Update ko.json Translate non-translated parts * Update ko.yml Translated missed parts - and fixed some typos * Create simple_form.ko.yml * Updated korean translation * i18n: fix test fails
2017-07-04Change webpack-dev-server repository (#4061)Yamagishi Kazutoshi
2017-07-04Customizable privacy policy from admin interface (#4062)Yamagishi Kazutoshi
2017-07-03Remove sort in Feed (#4050)Akihiko Odaki (@fn_aki@pawoo.net)
In from_redis method, statuses retrieved from the database was mapped to the IDs retrieved from Redis. It was equivalent to order from high to low because those IDs are sorted in the same order. Statuses are ordered with the ID by default, so we do not have to reorder. Sorting statuses in the database is even faster since the IDs are indexed with B-tree.
2017-07-03Upgrade chai-enzyme, precss and uws (#4010)Yamagishi Kazutoshi
* Update chai-enzyme to v0.8.0 * Upgrade precss to v2.0.0 * Upgrade uws to v8.14.0
2017-07-03Add fa-fw class to user agent icon (#4047)Yamagishi Kazutoshi
2017-07-03Rescue exceptions caused by FetchLinkCardService (#4045)abcang
2017-07-03Update Japanese translation (#4051)のら
2017-07-03Faster emojify() by avoiding str.replace() entirely (#4049)Nolan Lawson
2017-07-03Update Russian translation (sessions) (#4041)Ratmir Karabut
* 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 * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions)
2017-07-02Update French locales (#4034)Damien Erambert
* add missing locales for French translation * accent "Media" in the front-end locales * images => médias * Change 'rapport' to 'signalement' in French locales to be more coherent * fix typo * remove duplicate EN locale * translate missing locales * update missing locale * fix typo * unify with "utilisateur⋅ice⋅s" * address PR comments
2017-07-02fix(components/columns_area): Increase delta for swipe detection (#4037)Sorin Davidoi
2017-07-01Update Japanese translation (Credentials -> Security) (#4025)unarist
2017-07-01Fix height issue in report modalEugen Rochko
2017-06-30Faster emojify() algorithm, avoid regex replace (#4019)Nolan Lawson
* Faster emojify() algorithm, avoid regex replace * add semicolon
2017-06-30Add controller spec for manifests controller (#4003)Matt Jankowski
2017-06-30Fix webpack-dev-server on Windows (#4000)Nolan Lawson
* Fix webpack-dev-server on Windows * Serve webpack from 0.0.0.0, access at 127.0.0.1
2017-06-30Version bumps for gems (#4002)Matt Jankowski
* Update aws-sdk to version 2.10.4 * Update bootsnap to version 1.1.1 * Update capistrano to version 3.8.2 * Update capybara to version 2.14.4 * Update cld3 to version 3.1.3 * Update http_accept_language to version 2.1.1 * Update sidekiq to version 5.0.3 * Update rspec-sidekiq to version 3.0.3 * Update sidekiq-scheduler to version 2.1.7 * Update oj to version 3.2.0 * Update openssl to version 2.0.4 * Update pg to version 0.21.0 * Update twitter-text to version 1.14.6 * Update unicode-display_width to version 1.3.0 * Update scss_lint to version 0.54.0 * Update hamlit to version 2.8.4 * Update erubi to version 1.6.1 * Update httplog to version 0.99.4 * Update aws-sdk to version 2.10.6
2017-06-30Fix that AdminMailer does not send (#4012)Yamagishi Kazutoshi
2017-06-30Remove babel-cli (#4011)Yamagishi Kazutoshi
2017-06-30Fix broken style in media gallery (regression from #3963) (#4014)Yamagishi Kazutoshi
2017-06-30Do not raise an error if PrecomputeFeed could not find any status (#4015)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-30Rescue Addressable::URI::InvalidURIError at Remotable (#4017)abcang