erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity
2420 commits 90 branches 256 tags 992 MiB
Commit graph

2420 commits

This branch
This branch
All branches
Author SHA1 Message Date
Darshak Parikh
43caf1fa5f Add some Spanish translatoins (#2170) 2017-04-19 22:19:41 +02:00
alpaca-tc
2c0d756ad9 Extract error messages to locale file (#2162) 2017-04-19 22:19:32 +02:00
jeroenpraat
f06cba3f60 Dutch language strings: a few important fixes (#2163) 2017-04-19 22:19:19 +02:00
György Nádudvari
09dad88853 Fixed hungarian translation (#2158) 2017-04-19 19:21:44 +02:00
Tomohiro Suwa
7832425fdd Fix css for toot button when uploading images (#2161) 2017-04-19 19:21:23 +02:00
fsubal
abe16a7026 fix broken style when follower has long description (#2159) 2017-04-19 19:20:51 +02:00
Eugen
baabbce672 Fix double-escaping of display names in <title> (#2155) 2017-04-19 17:46:24 +02:00
Eugen
1d47910d3b 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
708bdd53f1 Remove unused view files in accounts/ (#2153) 2017-04-19 17:19:23 +02:00
Yamagishi Kazutoshi
2510119f19 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
fe1ddc3b96 fix Japanese search result translation (#2149) 
add 'result' mean, '件' only mean count unit.
 2017-04-19 16:41:30 +02:00
Matteo Aquila
a3486e0543 Completed Italian translation (#2151) 
* Added it.jsx

* Update index.jsx

* Update mastodon.jsx
 2017-04-19 16:40:45 +02:00
matsurai25
30183c0a74 fix search text 'zero' (#2150) 2017-04-19 16:40:24 +02:00
geta6
15a4fc5dcc Automatically change the size of textarea (#2128) 2017-04-19 15:39:46 +02:00
Matt Jankowski
a8e1afc30a Simplify render in controllers (#2144) 2017-04-19 15:37:42 +02:00
Eugen
bfbc2ca0d8 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
5ce8a1811a Replace User.count -> User.confirmed.count (#2127) 2017-04-19 14:58:27 +02:00
Yamagishi Kazutoshi
dca0ffa1a1 Remove unnecessary word from Japanese locale (#2143) 2017-04-19 14:54:47 +02:00
abcang
70891a99a9 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
3572f4423f 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
23eea5c5ae 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
35bdacba7a capistrano: link robots.txt (#1576) 
Related to #1533.
 2017-04-19 14:28:23 +02:00
Isabelle Knott
97012487ed 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
9a7ea7c870 Moves from hamburger icon to asterisk. (#2116) 2017-04-19 14:21:14 +02:00
chrolis
1ac41c873a Improve visibility of mute, block, report menu in Japanese (#2131) 2017-04-19 14:21:00 +02:00
tmyt
6c83fec971 Make configuarable s3_permissions for paperclip (#2139) 2017-04-19 14:20:36 +02:00
Misty De Meo
2bb54d5c57 Update title text for "reply all" button (#2118) 2017-04-19 14:20:04 +02:00
Yamagishi Kazutoshi
8b8e140c71 Change to switch signature version for Amazon S3 (#2124) 2017-04-19 14:18:50 +02:00
Matt Jankowski
8bac0350d1 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
c0b30c56db 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
0a850a8edb update simple_form.ja.yml (follow for #1991) (#2113) 2017-04-19 03:55:19 +02:00
Isao Sugimoto
71f5cf12d2 update ja.yml (follow for #2106) (#2109) 2017-04-19 00:52:30 +02:00
Michel
9d8bf4ea42 Update fr.yml (#2107) 
Just updated some values.
Best regards,
cyweo
 2017-04-19 00:52:19 +02:00
Eugen
96268e76e6 Fix wording on admin instances view, fix typos in language detector spec (#2106) 2017-04-18 23:39:51 +02:00
Eugen
c6a4ab3b92 Remove unused fonts (#2103) 2017-04-18 23:34:50 +02:00
Eugen
e09ab2c0bd 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
6bd1019235 Add more tests for AtomSerializer (#2096) 2017-04-18 22:30:17 +02:00
Isao Sugimoto
0d6c1e9cba missing translate ja.yml (#2100) 2017-04-18 22:29:39 +02:00
Eugen
ff5baa5349 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
297c11dba2 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
happycoloredbanana
0a7588282a Remove API authentication for public statuses (after review) (#1919) 2017-04-18 21:58:57 +02:00
Mingye Wang
3ed219f907 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)
 2017-04-18 21:29:31 +02:00
Matt Jankowski
55e1503522 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
 2017-04-18 21:09:07 +02:00
Matt Jankowski
66d8f99a30 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
 2017-04-18 19:36:18 +02:00
Tomohiro Suwa
f23281e31e Disable toot button when above 500 characters (#2088) 
* Disable toot button when above 500 characters

* Consider multibyte characters

* Consider spoiler_text
 2017-04-18 19:35:55 +02:00
spf
9783d8b6c0 fix admin input display (#1633) 2017-04-18 17:25:44 +02:00
JP DeVries
7525971561 Moving aria-label to div.column (#1769) 
* Use landmark regions on columns

Closes mastodon#1720

* Moving aria-label to div.column
 2017-04-18 17:21:25 +02:00
Matt Jankowski
84b5fae8e3 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
 2017-04-18 17:15:30 +02:00
usagi-f
d90b1650d8 Update storybook file autoload (#2057) 2017-04-18 16:04:35 +02:00
ik-fib
23ecc681c4 Add "Mastodon" to user agent (#2073) 
Remove non-const version string

Freeze option is unnecessary
 2017-04-18 16:04:13 +02:00