]>
cat aescling's git repositories - mastodon.git/log
Eugen [Thu, 20 Apr 2017 01:54:02 +0000 (03:54 +0200)]
Fix #2120 - Use Status#as_tag_timeline on public hashtag page (#2182)
* Fix #2120 - Use Status#as_tag_timeline on public hashtag page
* Update tags_controller.rb
Miguel Jacq [Thu, 20 Apr 2017 01:12:14 +0000 (11:12 +1000)]
Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180)
Marcin Cieślak [Wed, 19 Apr 2017 21:47:50 +0000 (23:47 +0200)]
Add static gif for upload testing (#2168)
Eugen [Wed, 19 Apr 2017 21:21:00 +0000 (23:21 +0200)]
Fix #2108 - Fix gif uploads (#2171)
* Fix #2108 - Fix gif uploads
Add specs for media attachment gifv conversion
* Add ffmpeg to travis
* Make travis install ffmpeg, not libav
* Switch travis to trusty
evilny0 [Wed, 19 Apr 2017 21:16:43 +0000 (23:16 +0200)]
Updated note about 'none' SMTP authentication method in .env.production.sample (#2167)
Darshak Parikh [Wed, 19 Apr 2017 20:19:41 +0000 (01:49 +0530)]
Add some Spanish translatoins (#2170)
alpaca-tc [Wed, 19 Apr 2017 20:19:32 +0000 (05:19 +0900)]
Extract error messages to locale file (#2162)
jeroenpraat [Wed, 19 Apr 2017 20:19:19 +0000 (22:19 +0200)]
Dutch language strings: a few important fixes (#2163)
György Nádudvari [Wed, 19 Apr 2017 17:21:44 +0000 (19:21 +0200)]
Fixed hungarian translation (#2158)
Tomohiro Suwa [Wed, 19 Apr 2017 17:21:23 +0000 (02:21 +0900)]
Fix css for toot button when uploading images (#2161)
fsubal [Wed, 19 Apr 2017 17:20:51 +0000 (02:20 +0900)]
fix broken style when follower has long description (#2159)
Eugen [Wed, 19 Apr 2017 15:46:24 +0000 (17:46 +0200)]
Fix double-escaping of display names in <title> (#2155)
Eugen [Wed, 19 Apr 2017 15:28:35 +0000 (17:28 +0200)]
Fix possibility of unrightful webfinger redirect (#2147)
* Fix possibility of unrightful webfinger redirect
* Add more tests for FollowRemoteAccountService
Matt Jankowski [Wed, 19 Apr 2017 15:19:23 +0000 (11:19 -0400)]
Remove unused view files in accounts/ (#2153)
Yamagishi Kazutoshi [Wed, 19 Apr 2017 15:17:32 +0000 (00:17 +0900)]
Add meta tags for OGP to following & follow page (#2052)
* Add meta tags for OGP to following & follow page
* simplify render helper
* Follow up #2133
* og:type is only accounts/show
* revert accounts/{following,followers}
matsurai25 [Wed, 19 Apr 2017 14:41:30 +0000 (23:41 +0900)]
fix Japanese search result translation (#2149)
add 'result' mean, '件' only mean count unit.
Matteo Aquila [Wed, 19 Apr 2017 14:40:45 +0000 (16:40 +0200)]
Completed Italian translation (#2151)
* Added it.jsx
* Update index.jsx
* Update mastodon.jsx
matsurai25 [Wed, 19 Apr 2017 14:40:24 +0000 (23:40 +0900)]
fix search text 'zero' (#2150)
geta6 [Wed, 19 Apr 2017 13:39:46 +0000 (22:39 +0900)]
Automatically change the size of textarea (#2128)
Matt Jankowski [Wed, 19 Apr 2017 13:37:42 +0000 (09:37 -0400)]
Simplify render in controllers (#2144)
Eugen [Wed, 19 Apr 2017 13:37:18 +0000 (15:37 +0200)]
Attachment list for uncached attachments (#2110)
* For undownloaded attachments, set type :unknown, display them as a list in the web UI
* Fix case when attachment type is set explicitly
alpaca-tc [Wed, 19 Apr 2017 12:58:27 +0000 (21:58 +0900)]
Replace User.count -> User.confirmed.count (#2127)
Yamagishi Kazutoshi [Wed, 19 Apr 2017 12:54:47 +0000 (21:54 +0900)]
Remove unnecessary word from Japanese locale (#2143)
abcang [Wed, 19 Apr 2017 12:52:18 +0000 (21:52 +0900)]
Fix html escape characters in the URL (#2138)
* fix character escaping in URL
* add tests
* put a comma after the last item
* add HTML escape test
857b [Wed, 19 Apr 2017 12:30:23 +0000 (14:30 +0200)]
enable to scroll the setting's page sidebar (#1347)
* enable to scroll the setting's page sidebar
add scroll:auto and use margin instead of padding for the bottom
* Update admin.scss
* Update admin.scss
* Update admin.scss
Joël Quenneville [Wed, 19 Apr 2017 12:29:23 +0000 (08:29 -0400)]
Install Yarn dependencies during setup (#1169)
Previously the `bin/setup` script only installed the Ruby dependencies
via Bundler. This is not sufficient to get the test suite to pass. We
also need the JavaScript dependencies.
This commit installs the JavaScript dependencies as part of the
`bin/setup` script via Yarn.
This allows for a successful
bin/setup && bundle exec rake
on a fresh clone of the repo.
Alex Dunn [Wed, 19 Apr 2017 12:28:23 +0000 (05:28 -0700)]
capistrano: link robots.txt (#1576)
Related to #1533.
Isabelle Knott [Wed, 19 Apr 2017 12:28:00 +0000 (08:28 -0400)]
Do not show link preview card if toot has a spoiler (#1617)
* Do not show link preview card if toot has a spoiler
* == to ===
Ash Furrow [Wed, 19 Apr 2017 12:21:14 +0000 (08:21 -0400)]
Moves from hamburger icon to asterisk. (#2116)
chrolis [Wed, 19 Apr 2017 12:21:00 +0000 (21:21 +0900)]
Improve visibility of mute, block, report menu in Japanese (#2131)
tmyt [Wed, 19 Apr 2017 12:20:36 +0000 (21:20 +0900)]
Make configuarable s3_permissions for paperclip (#2139)
Misty De Meo [Wed, 19 Apr 2017 12:20:04 +0000 (20:20 +0800)]
Update title text for "reply all" button (#2118)
Yamagishi Kazutoshi [Wed, 19 Apr 2017 12:18:50 +0000 (21:18 +0900)]
Change to switch signature version for Amazon S3 (#2124)
Matt Jankowski [Wed, 19 Apr 2017 11:52:37 +0000 (07:52 -0400)]
Restful refactor of accounts/ routes (#2133)
* Add routing specs for accounts followers and following actions
* Use more restful route naming for public account follow pages
Moves two actions:
- accounts#followers to accounts/follower_accounts#index
- accounts#following to accounts/following_accounts#index
Adds routing spec to ensure prior URLs are preserved.
Kota Ouchi [Wed, 19 Apr 2017 11:44:07 +0000 (20:44 +0900)]
Update ja.yml (follow for #2118) (#2137)
* Update ja.yml (follow for #2118)
* typo fix
Isao Sugimoto [Wed, 19 Apr 2017 01:55:19 +0000 (10:55 +0900)]
update simple_form.ja.yml (follow for #1991) (#2113)
Isao Sugimoto [Tue, 18 Apr 2017 22:52:30 +0000 (07:52 +0900)]
update ja.yml (follow for #2106) (#2109)
Michel [Tue, 18 Apr 2017 22:52:19 +0000 (00:52 +0200)]
Update fr.yml (#2107)
Just updated some values.
Best regards,
cyweo
Eugen [Tue, 18 Apr 2017 21:39:51 +0000 (23:39 +0200)]
Fix wording on admin instances view, fix typos in language detector spec (#2106)
Eugen [Tue, 18 Apr 2017 21:34:50 +0000 (23:34 +0200)]
Remove unused fonts (#2103)
Eugen [Tue, 18 Apr 2017 21:15:44 +0000 (23:15 +0200)]
Fix #1642, fix #1912 - Dictate content-type file extension (#2078)
* Fix #1642, fix #1912 - Previous change (#1718) did not modify how original file was saved on upload
* Fix for when file is missing
Eugen [Tue, 18 Apr 2017 20:30:17 +0000 (22:30 +0200)]
Add more tests for AtomSerializer (#2096)
Isao Sugimoto [Tue, 18 Apr 2017 20:29:39 +0000 (05:29 +0900)]
missing translate ja.yml (#2100)
Eugen [Tue, 18 Apr 2017 20:29:14 +0000 (22:29 +0200)]
Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (#2079)
* Add rate limits for logins and sign-ups by IP (5 in 5 minutes)
Should be enough for normal attempts
* Add rate limit for forgotten password form as well
Matt Jankowski [Tue, 18 Apr 2017 20:20:12 +0000 (16:20 -0400)]
Language detection refactor (#2099)
* Extract detect_language to separate class
* Use default locale, not just en
* Add spec to confirm that whatlanguage cant identify empty string
* Allow account locale to override default in language detector
* PostStatusService supplies an account to detect language
happycoloredbanana [Tue, 18 Apr 2017 19:58:57 +0000 (22:58 +0300)]
Remove API authentication for public statuses (after review) (#1919)
Mingye Wang [Tue, 18 Apr 2017 19:29:31 +0000 (15:29 -0400)]
Polish zh-cn js translation (#2090)
* Polish zh-cn js translation
* fixes for problems pointed out by gumblex in #2044
* more effectively differentiate between following/follower
* Fix missing period (zh-cn js)
Maybe squash this commit?
* Fix duplicate word (zh-cn js)
Matt Jankowski [Tue, 18 Apr 2017 19:09:07 +0000 (15:09 -0400)]
Instances list in admin (#2095)
* Add admin/instances index action
* Add link to instances admin page
* View lists instances
* Instances, grouped by domain, ordered by count
* Use Account.remote scope
* Extract method: Account.by_domain_accounts
Matt Jankowski [Tue, 18 Apr 2017 17:36:18 +0000 (13:36 -0400)]
Admin reports with accounts (#2092)
* Add a ReportFilter class
* Add reports and targeted_reports relationships to Account
* Use ReportFilter from admin/reports controller
* Link to admin/reports filtered views from admin account show view
* Add indexes to reports.account_id and reports.target_account_id
Tomohiro Suwa [Tue, 18 Apr 2017 17:35:55 +0000 (02:35 +0900)]
Disable toot button when above 500 characters (#2088)
* Disable toot button when above 500 characters
* Consider multibyte characters
* Consider spoiler_text
spf [Tue, 18 Apr 2017 15:25:44 +0000 (17:25 +0200)]
fix admin input display (#1633)
JP DeVries [Tue, 18 Apr 2017 15:21:25 +0000 (17:21 +0200)]
Moving aria-label to div.column (#1769)
* Use landmark regions on columns
Closes mastodon#1720
* Moving aria-label to div.column
Matt Jankowski [Tue, 18 Apr 2017 15:15:30 +0000 (11:15 -0400)]
Simplify renders in views (#2084)
* Simplify render in mailer views
* Simplify render in about/more view
* Simplify render in accounts follow views
* Simplify render in recovery code views
* Simplify render in stream entry embed
* Simplify render in stream entries status partial
* Simplify render in authorize follow new view
usagi-f [Tue, 18 Apr 2017 14:04:35 +0000 (23:04 +0900)]
Update storybook file autoload (#2057)
ik-fib [Tue, 18 Apr 2017 14:04:13 +0000 (23:04 +0900)]
Add "Mastodon" to user agent (#2073)
Remove non-const version string
Freeze option is unnecessary
Keiji, Yoshimi [Tue, 18 Apr 2017 14:03:27 +0000 (23:03 +0900)]
Translate onboarding dialog to japanese (#2062)
* translate onboarding modal to japanese
* fixed translation by feedback
kuro5hin [Tue, 18 Apr 2017 13:58:22 +0000 (09:58 -0400)]
Fix streaming server worker count (#2082)
* Make sure we start at least one streaming worker, even if there's only one CPU and we're in production mode.
* Oops, let's make sure we're counting cpus right too.
839 [Tue, 18 Apr 2017 13:57:46 +0000 (22:57 +0900)]
Avoid dynamic methods due to processing speed (#2080)
Andrey Blinov [Tue, 18 Apr 2017 13:57:16 +0000 (16:57 +0300)]
Fix header icons in navigation bar (#2081)
Olivier Humbert [Tue, 18 Apr 2017 13:21:47 +0000 (15:21 +0200)]
French translation update (#2063)
fixes
Koala Yeung [Tue, 18 Apr 2017 13:21:16 +0000 (21:21 +0800)]
Add Occitan (oc) translation (#2077)
* Added oc.yml
* Added `config/locales/oc.yml`.
Translated in General Occitan (Quent-in).
* Added oc.jsx (Occitan translation)
* Written in General Occitan (lengadocian)
* Added `app/assets/javascripts/components/locales/oc.js`
* Added doorkeeper.oc.yml
* Added `config/locales/doorkeeper.oc.yml` (Quent-in)
* Added simple_form.oc.yml
* Added `config/locales/simple_form.oc.yml` (Quent-in).
* Merge en.yml changes into oc.yml
Added new strings for translations
* Fix typo in oc.yml
* Update javascript locale support (oc)
* Update ruby locale list (oc)
* Fix oc.yml
* Remove obsoleted translations
* Moved old translation of `reports` to `admin.reports`
Ratmir Karabut [Tue, 18 Apr 2017 13:20:37 +0000 (16:20 +0300)]
Update Russian translation (#1967)
* 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
geta6 [Tue, 18 Apr 2017 11:10:49 +0000 (20:10 +0900)]
Add hasMore field to account timeline (#2066)
Eugen Rochko [Mon, 17 Apr 2017 23:58:14 +0000 (01:58 +0200)]
Merge branch 'patf-pause-gif'
Eugen Rochko [Mon, 17 Apr 2017 23:57:50 +0000 (01:57 +0200)]
Adjust visuals of non-autoplaying GIFV
Eugen Rochko [Mon, 17 Apr 2017 23:25:50 +0000 (01:25 +0200)]
Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
Matt Jankowski [Mon, 17 Apr 2017 23:21:55 +0000 (19:21 -0400)]
Remove unused methods (#1730)
* Remove unused method #set_counters_maps from api controller
* Remove unused method #set_account_counters_maps from api controller
* Remove unused method Account#followers_domains
* Remove unused User.prolific scope
* Add mastodon:users:admins task to list all admin emails
* Use interpolated query style in Account.triadic_closures
* Coverage for Account.triadic_closures
Eugen Rochko [Mon, 17 Apr 2017 23:20:29 +0000 (01:20 +0200)]
Merge branch 'pixiv-fix/cache_blocking'
Eugen Rochko [Mon, 17 Apr 2017 23:14:02 +0000 (01:14 +0200)]
Rename cache key to exclude_account_ids_for:id, adjust formatting
Eugen Rochko [Mon, 17 Apr 2017 23:09:57 +0000 (01:09 +0200)]
Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking
Eugen [Mon, 17 Apr 2017 23:07:46 +0000 (01:07 +0200)]
Add forgotten AtomSerializer spec (#2047)
Marcin Cieślak [Mon, 17 Apr 2017 23:02:50 +0000 (01:02 +0200)]
Ignore /vendor/bundle (#1880)
Damien Erambert [Mon, 17 Apr 2017 23:02:02 +0000 (16:02 -0700)]
Add FR locales to the onboarding modal (#1976)
* Add FR locale for the onboarding modal component
* Slightly increase the max-width and max-height of the onboarding modal
This is done so it doesn't break with locales whose strings would be
too long
* Update FR locales for onboarding upon PR comments
Mingye Wang [Mon, 17 Apr 2017 23:01:32 +0000 (19:01 -0400)]
Add simplified Chinese js translation (#2044)
This single-file commit, heavily based on the zh-hk version as of
ec9999c , fixes the missing js locale. Intentional, significant
departures from current zh-cn yml localizations have been marked with
rationales given.
Matt Jankowski [Mon, 17 Apr 2017 22:16:32 +0000 (18:16 -0400)]
Instance helper to replace site title helper (#2038)
* Move site title helper to instance helper (name change only)
* Remove newline in <title> tag
* Add site_hostname helper method to wrap up local_domain value
* Use site_hostname helper in places that need local_domain value
jeroenpraat [Mon, 17 Apr 2017 22:16:03 +0000 (00:16 +0200)]
Updated, improved and fixed Dutch language strings (#2030)
* Fixed some words
* Improved and more consistent
* Fixes and a bit less 'je'
* Improved and more consistent
* Another round of improvements and consistency
* More improvements and less 'je'
* Update
* Updated with admin strings
* More improvements and additions - not complete yet, but most is there
* This is what we call in Dutch 'the English disease' :-)
* fix comma
* admin.reportsi
* not needed
* hopefully now fixed
Matt Jankowski [Mon, 17 Apr 2017 21:19:45 +0000 (17:19 -0400)]
Use .presence instead of ternary on site description for og: content (#2033)
Sam Hewitt [Mon, 17 Apr 2017 19:49:51 +0000 (15:49 -0400)]
optimized logo (#2020)
- adjusted elements to fit the pixel grid for better scaling
- optimized the PNG asset and the SVG asset
Matt Jankowski [Mon, 17 Apr 2017 19:28:31 +0000 (15:28 -0400)]
README tidy up (#2026)
* Remove docker guide and put it in docs repo
* Move tasks to docs repo
* Move requirements to contributing doc
* Move advice about tagged releases to docs repo
* Move local domain and host config to docs repo
* Link to related tech
Andrey Blinov [Mon, 17 Apr 2017 19:01:42 +0000 (22:01 +0300)]
Fix import pt_br locale in mastodon.jsx (#2011)
Zac Anger [Mon, 17 Apr 2017 18:30:38 +0000 (12:30 -0600)]
Return early from submit if no text. (#1962)
spf [Mon, 17 Apr 2017 18:27:11 +0000 (20:27 +0200)]
French i18n-tasks missing fr (#2018)
Matt Jankowski [Mon, 17 Apr 2017 18:02:29 +0000 (14:02 -0400)]
Remove i18n_spec file (#2014)
These were being skipped with `xit`, but we also just added the `unused` task to
the CI server, and it will be caught there. That seems good enough for this,
instead of requiring a full keys check on every local spec suite run.
Matt Jankowski [Mon, 17 Apr 2017 18:02:00 +0000 (14:02 -0400)]
Media controller specs (#2022)
* Add spec for media controller
* Add MediaAttachment.attached scope
* Simplify methods in media controller
Eugen [Mon, 17 Apr 2017 17:58:54 +0000 (19:58 +0200)]
Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988)
Also improve efficiency of the mastodon:maintenance:add_static_avatars task
Eugen [Mon, 17 Apr 2017 17:58:38 +0000 (19:58 +0200)]
Fix #1897 - Return reblogged: false on unreblog (was wrongly named variable) (#1989)
Matt Jankowski [Mon, 17 Apr 2017 17:58:03 +0000 (13:58 -0400)]
Improve handling of HTTP_ACCEPT for webfinger (#2008)
This change includes:
- Improve the spec coverage for incoming request to the webfinger action
- For requests without an accept header (ie, what a browser might look like),
return a JSON response.
- For requests with an explicit format of xml or json, return that format.
- For requests using an accept header, return that format.
Also adds failing spec showing webfinger does not return xml, which covers the
issue described in: https://github.com/tootsuite/mastodon/issues/1983
Tomohiro Suwa [Mon, 17 Apr 2017 17:57:02 +0000 (02:57 +0900)]
Fix nil query_username (#2013)
alpaca-tc [Mon, 17 Apr 2017 13:54:33 +0000 (22:54 +0900)]
Required foreign keys (#2003)
* Add `required: true` option to foreign column
* Fixes NoMethodError
```
> Favourite.new.valid?
NoMethodError: undefined method `reblog?' for nil:NilClass
```
IWAI, Masaharu [Mon, 17 Apr 2017 13:15:24 +0000 (22:15 +0900)]
Update Japanese translation (#1993)
Sync text for toot form
Christophe Gesché [Mon, 17 Apr 2017 13:15:14 +0000 (15:15 +0200)]
Update fr.jsx "clear" (Nettoyer peut-être ambigu) (#1987)
Un utiliser mal expérimenté pourrait comprendre "retirer les erreurs".
Ici il s'agit d'une suppression pure et simple, pas une épuration/nettoyage.
clear would be translated "remove" instead of "cleaning" Cleaning can be unterstood "keep but clean"
tom [Mon, 17 Apr 2017 10:27:19 +0000 (06:27 -0400)]
Make contents of boost confirmation dialog scroll (#1710)
This is necessary for boosting long posts on small screens - see this post for video: https://slime.global/@masklayer/102308
Brad Urani [Mon, 17 Apr 2017 10:26:45 +0000 (03:26 -0700)]
Open sidekiq and pghero admin pages in new browser tabs (#1596)
* Open sidekiq and pghero admin pages in new tabs
* Add missing comma
Patrick Figel [Mon, 17 Apr 2017 10:14:03 +0000 (12:14 +0200)]
Add gif auto-play/pause preference
This introduces a new per-user preference called
"Auto-play animated GIFs", which is enabled by default. When a
user disables this setting, gifs in toots become click-to-play.
Previews of animated gifs were changed to display the video play
button so that users can distinguish them from regular images.
This setting also affects account avatars in the detailed account
view, which was changed to use the same hover-to-play mechanism
that is used for animated avatars in timelines.
Fixes #1652
Ian Kelling [Mon, 17 Apr 2017 08:42:29 +0000 (01:42 -0700)]
Add documentation of SMTP_DOMAIN (#1738)
Without setting it, exim will reject the mail with a message like:
rejected EHLO from [10.20.0.1]: syntactically invalid argument(s): {}
Miguel Jacq [Mon, 17 Apr 2017 08:41:19 +0000 (18:41 +1000)]
Allow using an SMTP server without authentication (#1597)
* Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none'
* Add note in .env.production.sample about SMTP settings for servers where no auth is required
* Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none
happycoloredbanana [Mon, 17 Apr 2017 08:40:14 +0000 (11:40 +0300)]
NFS for shared folder requires a private_network (#1263)
Dale Price [Mon, 17 Apr 2017 08:39:54 +0000 (03:39 -0500)]
Add mask-icon.svg (#1572) (#1585)
* Add mask-icon (#1572)
* use updated svg logo for mask-icon
Expenses [Mon, 17 Apr 2017 08:38:59 +0000 (20:38 +1200)]
Added missing `rake secret` command (#1894)
Hugo Gameiro [Mon, 17 Apr 2017 08:38:27 +0000 (09:38 +0100)]
Add Brazilian Portuguese and fix European Portuguese (#1966)
* update portuguese translation
added the missing fields and improved the translation
* pt translations fix
* improve last translation commit
* fix damn quotes
* add pt_br to index.jsx
* add pt-BR to import index.jsx
* add pt-BR to mastodon.jsx
* add pt-BR to settings_helper.rb
* add pt-BR to application.rb
* order alphabetically pt.jsx
* create pt-BR.jsx
* Create devise.pt-BR.yml
* language improvements to devise.pt.yml
* created doorkeeper.pt-BR.yml
* fixes to doorkeeper.pt.yml
* create pt-BR.yml
* improvements to pt.yml
* Create simple_form.pt-BR.yml
* Improvements to simple_form.pt.yml
* improvements to pt.yml