Commit graph

1156 commits

Author SHA1 Message Date
JantsoP
7227a992fc Create Finnish translation for Mastodon
Create Finnish translation for Mastodon
2017-04-03 12:09:33 +02:00
Eugen
8ba7d4ed82 Merge branch 'master' into master 2017-04-03 01:07:53 +02:00
Eugen
720922cd13 Merge pull request #746 from eramdam/feature/improve-french-locales
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
Kazhnuz
e6a6c102f6 Add forgotten comma 2017-04-02 23:39:41 +02:00
Damien Erambert
5f0e912d87 Add more lcoales in fr.jsx 2017-04-02 14:23:40 -07:00
Kazhnuz
6ac05fc74b Update French Translation 2017-04-02 23:18:01 +02:00
Eugen
e3509e02c0 Merge pull request #740 from 0x70b1a5/master
remove black border on video mute/spoiler buttons
2017-04-02 22:22:56 +02:00
Eugen
0335a52e28 Merge pull request #741 from eramdam/feature/improve-french-locales
Improve/add some French locales
2017-04-02 22:22:44 +02:00
Eugen Rochko
4bfabbd5e2 Avoid re-loading already loaded relationships. Also fixes issue where wrong
button would be displayed in account lists for unloaded relationships
2017-04-02 22:02:38 +02:00
Eugen Rochko
eb85833dc7 Keep track of which timelines are connected live to avoid redundant
refreshes on navigation
2017-04-02 21:44:06 +02:00
Eugen Rochko
1ee4c6415c Catching rack timeout from rails doesn't work 2017-04-02 21:12:18 +02:00
Tobias Merkle
bba468bcca single-quotes 2017-04-02 14:55:13 -04:00
Tobias Merkle
034cfeb1ac remove black border on buttons 2017-04-02 14:54:24 -04:00
Eugen Rochko
00e99e58db Add proper error page for request timeouts 2017-04-02 19:43:44 +02:00
Olivia Mossberg
6e4703703a Merge branch 'master' of github.com:tootsuite/mastodon
It's just an upstream merge
2017-04-02 17:04:31 +02:00
Olivia Mossberg
2d8a0caf98 Fix word-break in account profiles
word-break:break-all is a surefire way to break things. It should be set
to normal.
This merge just set it back to what it should be.
Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected
errors.
2017-04-02 16:54:24 +02:00
Eugen Rochko
f04816f005 Fix wording "show reblogs" -> "show boosts", order reports chronologically in
admin UI
2017-04-02 16:45:49 +02:00
Eugen Rochko
4db2e2f4eb Fix issue with feed merge-in code as well 2017-04-02 15:58:25 +02:00
Eugen Rochko
572cf64791 Fix feed regeneration bug 2017-04-02 15:46:31 +02:00
Eugen Rochko
347830262f Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master 2017-04-02 12:36:26 +02:00
Damien Erambert
22fb48ca13 Add fr locale for community_timeline in fr.jsx 2017-04-01 23:45:53 -07:00
Eugen Rochko
e407ed24a6 Fix landing page sign up form ignoring username field 2017-04-02 04:13:22 +02:00
Tobias Merkle
8befce32f3 improve video button visibililty 2017-04-01 21:02:30 -04:00
Eugen Rochko
431bfcaad6 Fix broken reference 2017-04-01 22:29:20 +02:00
Eugen Rochko
d1f8bd2673 Paperclip will complain on its own if this variable is missing 2017-04-01 22:16:26 +02:00
Eugen Rochko
b794690bfe Made modal system more generic 2017-04-01 22:11:28 +02:00
Maxime BORGES
9f0d00567b Fix word-break in profile's note on profile page and profile component 2017-04-01 20:17:28 +02:00
Eugen Rochko
348e817d53 Improve mobile tabs a little 2017-04-01 15:17:35 +02:00
Eugen Rochko
3c6e9ee33c Fix reworked search 2017-03-31 22:45:56 +02:00
Eugen Rochko
a895f0d448 Rework search 2017-03-31 21:11:09 +02:00
shel
57e3d4c58b Merge branch 'master' into patch-2 2017-03-31 10:34:14 -04:00
Eugen Rochko
7931d5886c Fix web UI profile clickable area overlapping with follow button area 2017-03-31 14:23:44 +02:00
Eugen Rochko
355b9278d5 Fix some views still not using counter caches 2017-03-31 14:02:07 +02:00
Eugen Rochko
be9accbacc Fix #700 - hide spoilers on static pages 2017-03-31 13:54:36 +02:00
Eugen Rochko
9169326960 :active and :focus states same as :hover for buttons 2017-03-31 12:08:51 +02:00
Eugen Rochko
bbc3a36c82 Fix drag & drop overlay flickering 2017-03-31 11:48:25 +02:00
Eugen Rochko
244da78105 Import feature for following/blocking lists (addresses #62, #177, #201, #454) 2017-03-30 19:42:33 +02:00
Eugen Rochko
96e58cf289 Add counter caches for a large performance increase on API requests 2017-03-30 15:06:59 +02:00
Eugen Rochko
cdbfbbc691 Improve emojis - use SVGs where possible 2017-03-29 22:27:24 +02:00
Eugen Rochko
8c97719fbc Hide drag & drop area on drop event regardless of success 2017-03-28 14:17:24 +02:00
Eugen Rochko
4ef48bcc42 Fix #408 - link @ names in bios 2017-03-28 14:16:08 +02:00
Eugen Rochko
a4ce8b09fb Fix #690 - Webfinger should handle new shortform profile URLs now (nice) 2017-03-28 11:25:43 +02:00
shel
728174500e Clarify post privacy warning
I was informed that the current warning if you @ a remote server in a private post is inadequate. These are suggested changes to better inform users.
2017-03-26 12:49:14 -04:00
Eugen Rochko
02e2336daa Add tooltip to privacy dropdown 2017-03-26 13:30:57 +02:00
Eugen Rochko
74fb333eb7 Fix up some localizations 2017-03-26 13:22:38 +02:00
Eugen Rochko
d50aa74690 Fix style issue 2017-03-26 13:13:41 +02:00
Eugen Rochko
66ba47a1f3 Merge branch 'feature/language_zh-cn' of https://github.com/leopku/mastodon into leopku-feature/language_zh-cn 2017-03-26 13:10:04 +02:00
Eugen Rochko
2a8906d56a Compose form layout fixes 2017-03-26 13:08:15 +02:00
leopku
58c9d97d07 🌐 add simplified chinese language 2017-03-26 14:13:18 +08:00
shel
8ab274f67a Change to using variables
Thanks garg
2017-03-25 20:42:49 -04:00