treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
2,480 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

2480 Commits (fe231a6cec08b942e703b214e203506936fb00d4)

Author SHA1 Message Date
Christoph Witzany 23b457c287 Make Docker image buildable on ARM (#2065) 
* after yarn upgrade

* after manually removing node-gyp as top level dependency
 2017-04-20 13:29:38 +02:00
Yamagishi Kazutoshi 17367e7c47 Fix PropTypes warning in OnboardingModal (#2191) 2017-04-20 13:22:54 +02:00
Matt Jankowski bbd0d7f5d0 Use default locale for html lang in layouts (#2212) 2017-04-20 13:09:31 +02:00
Matt Jankowski 813239e4fe Link to profile/feed/salmon from admin/accounts show page (#2186) 2017-04-20 04:00:02 +02:00
Ash Furrow 9b1a881d40 Removes timestamp from URLs. (#2185) 2017-04-20 03:54:24 +02:00
Eugen f29afaa268 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
 2017-04-20 03:54:02 +02:00
Miguel Jacq 2d94636b58 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) 2017-04-20 03:12:14 +02:00
Marcin Cieślak 0ab0db9fe7 Add static gif for upload testing (#2168) 2017-04-19 23:47:50 +02:00
Eugen 5849eac93e 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
 2017-04-19 23:21:00 +02:00
evilny0 520dd00efd Updated note about 'none' SMTP authentication method in .env.production.sample (#2167) 2017-04-19 23:16:43 +02:00
Darshak Parikh 831ed1565f Add some Spanish translatoins (#2170) 2017-04-19 22:19:41 +02:00
alpaca-tc e40ea6cd9d Extract error messages to locale file (#2162) 2017-04-19 22:19:32 +02:00
jeroenpraat e190b3b052 Dutch language strings: a few important fixes (#2163) 2017-04-19 22:19:19 +02:00
György Nádudvari 2d4611520a Fixed hungarian translation (#2158) 2017-04-19 19:21:44 +02:00
Tomohiro Suwa 7fe94bff51 Fix css for toot button when uploading images (#2161) 2017-04-19 19:21:23 +02:00
fsubal b504ce11e1 fix broken style when follower has long description (#2159) 2017-04-19 19:20:51 +02:00
Eugen 3cb2e684dc Fix double-escaping of display names in <title> (#2155) 2017-04-19 17:46:24 +02:00
Eugen a38b05112e Fix possibility of unrightful webfinger redirect (#2147) 
* Fix possibility of unrightful webfinger redirect

* Add more tests for FollowRemoteAccountService
 2017-04-19 17:28:35 +02:00
Matt Jankowski 58ce961281 Remove unused view files in accounts/ (#2153) 2017-04-19 17:19:23 +02:00
Yamagishi Kazutoshi a7b4c39def 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}
 2017-04-19 17:17:32 +02:00
matsurai25 4903d68df4 fix Japanese search result translation (#2149) 
add 'result' mean, '件' only mean count unit.
 2017-04-19 16:41:30 +02:00
Matteo Aquila 1c6208545a Completed Italian translation (#2151) 
* Added it.jsx

* Update index.jsx

* Update mastodon.jsx
 2017-04-19 16:40:45 +02:00
matsurai25 203a5d4dba fix search text 'zero' (#2150) 2017-04-19 16:40:24 +02:00
geta6 7a521a7278 Automatically change the size of textarea (#2128) 2017-04-19 15:39:46 +02:00
Matt Jankowski 7a1129892c Simplify render in controllers (#2144) 2017-04-19 15:37:42 +02:00
Eugen 48d8e5a82f 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
 2017-04-19 15:37:18 +02:00
alpaca-tc c413926027 Replace User.count -> User.confirmed.count (#2127) 2017-04-19 14:58:27 +02:00
Yamagishi Kazutoshi 34d2168ac1 Remove unnecessary word from Japanese locale (#2143) 2017-04-19 14:54:47 +02:00
abcang 815462feff 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
 2017-04-19 14:52:18 +02:00
857b 0e51c20a7c 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
 2017-04-19 14:30:23 +02:00
Joël Quenneville 4439bcce9a 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.
 2017-04-19 14:29:23 +02:00
Alex Dunn 06581631e8 capistrano: link robots.txt (#1576) 
Related to #1533.
 2017-04-19 14:28:23 +02:00
Isabelle Knott de57e481fe Do not show link preview card if toot has a spoiler (#1617) 
* Do not show link preview card if toot has a spoiler

* == to ===
 2017-04-19 14:28:00 +02:00
Ash Furrow 13e8bd3bc2 Moves from hamburger icon to asterisk. (#2116) 2017-04-19 14:21:14 +02:00
chrolis 29ebd3b0b4 Improve visibility of mute, block, report menu in Japanese (#2131) 2017-04-19 14:21:00 +02:00
tmyt 2e1e061f24 Make configuarable s3_permissions for paperclip (#2139) 2017-04-19 14:20:36 +02:00
Misty De Meo 03971de5c5 Update title text for "reply all" button (#2118) 2017-04-19 14:20:04 +02:00
Yamagishi Kazutoshi a3358f438f Change to switch signature version for Amazon S3 (#2124) 2017-04-19 14:18:50 +02:00
Matt Jankowski 9a8134cea6 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.
 2017-04-19 13:52:37 +02:00
Kota Ouchi e952cec09c Update ja.yml (follow for #2118) (#2137) 
* Update ja.yml (follow for #2118)

* typo fix
 2017-04-19 13:44:07 +02:00
Isao Sugimoto 0961123c71 update simple_form.ja.yml (follow for #1991) (#2113) 2017-04-19 03:55:19 +02:00
Isao Sugimoto 6b86990443 update ja.yml (follow for #2106) (#2109) 2017-04-19 00:52:30 +02:00
Michel a4932b04b1 Update fr.yml (#2107) 
Just updated some values.
Best regards,
cyweo
 2017-04-19 00:52:19 +02:00
Eugen 64c57b7465 Fix wording on admin instances view, fix typos in language detector spec (#2106) 2017-04-18 23:39:51 +02:00
Eugen 42a35d395e Remove unused fonts (#2103) 2017-04-18 23:34:50 +02:00
Eugen 21816d08ec 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
 2017-04-18 23:15:44 +02:00
Eugen 2f4657aac7 Add more tests for AtomSerializer (#2096) 2017-04-18 22:30:17 +02:00
Isao Sugimoto f927f88ccb missing translate ja.yml (#2100) 2017-04-18 22:29:39 +02:00
Eugen e47b32072f 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
 2017-04-18 22:29:14 +02:00
Matt Jankowski 4591c7dbdb 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
 2017-04-18 22:20:12 +02:00