tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,088 Commits 10 Branches 0 Tags
89e8e110c80e2ba18cbf8a862db8bf71e1678543
Commit Graph
707 Commits
Author SHA1 Message Date
Eugen Rochko 9f7ea77d0c Merge branch 'master' of github.com:tootsuite/mastodon 2017-04-11 21:30:48 +02:00
Eugen Rochko 960181fd99 Fix look of the modals 2017-04-11 21:24:17 +02:00
Eugen Rochko 2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master 2017-04-11 20:43:56 +02:00
KomicandEugen 47aacb773b Better background-photo.jpeg (#1560) 
Fixed the nasty banding & recompressed it at about the same level
 2017-04-11 19:51:13 +02:00
Matt JankowskiandEugen 82d9336114 Increase breakpoint size for bio on account show (#1559) 2017-04-11 19:35:06 +02:00
blackle 06444bf050 Allow user to disable the boost confirm dialog in preferences 2017-04-11 10:10:16 -04:00
blackle f53fb6aa66 Bypass boost confirm modal if alt is pressed 2017-04-11 08:34:14 -04:00
Corey Dutsonandwxcafé c9b9225951 Adjust css for user detail page (#1463) 
- details a background for contrast
- add 5px padding to the top of the `details-counters` children to line them up with the bio to the right (Which has a 5px padding on the top)
 2017-04-11 14:20:18 +02:00
blackle 01e5447e35 Add boost confirm modal 2017-04-10 22:35:55 -04:00
Matt JankowskiandEugen 4ada50985a Pagination improvements (#1445) 
* Replace will_paginate with kaminari

* Use #page instead of #paginate in controllers

* Replace will_paginate.page_gap with pagination.truncate in i18n

* Customize kaminari views to match prior styles

* Set kaminari options to match prior behavior

* Replace will_paginate with paginate in views
 2017-04-11 01:11:41 +02:00
EugenandGitHub 12f72e1740 When avatar/header are GIF, generate static versions (#1428) 
* When avatar/header are GIF, generate static versions.
Account API returns "avatar"/"avatar_static", "header"/"header_static"
Static version is the same as original for other cases
Web UI de-animates avatars in toots, lists of users

Fix #441, fix #596, prerequisite for #1064

* Fix JS test

* Add rake task to generate static avatars/headers from GIF ones, add test
 2017-04-11 00:38:58 +02:00
Matthias JouanandEugen 3fd5385e7b Add username as a title for mentions (#1385) 
Add a title attribute on mention links for both notifications
and mentions in statuses.

Related to #1350
 2017-04-11 00:35:35 +02:00
EugenandGitHub 2810013b93 API param to exclude notification types from response (#1341) 
* Add exclude_types param to /api/v1/notifications

* Exclude notification types in web UI through exclude_types in the API
 2017-04-10 23:45:29 +02:00
Chris MartinandEugen ae57b3a8c5 Add more specific class names to notification divs (#1120) 2017-04-10 22:41:52 +02:00
Rachel HandEugen f690320fb9 Keep newlines in xml (#1397) 2017-04-10 21:32:45 +02:00
Stephen BurgessandEugen 553170b77a Fix #1097 When onClick is falsy, do not make status content clickable (#1434) 2017-04-10 21:31:26 +02:00
Jessica StokesandEugen 8a6096a3de Allow typing a toot while an image uploads (#1429) 
This patch stops disabling the toot text field when an image is uploading. Instead, you can type to your heart's content and when the image uploads it'll append the image URL, and restore the position of your cursor to wherever it was in the toot text just prior. Effectively, the image URL is appended to the toot, and typing is not interrupted at all! ✨
 2017-04-10 21:30:58 +02:00
Corey Dutsonandwxcafé 087ca3009b Adjust background of emoji panel (#1461) 
Addresses #1451 which notes the emoji picker is too light. I agree, so I submit this adjustment.

Changes:
Changed the background to a darkened version of another system color
 2017-04-10 20:56:14 +02:00
Jessica StokesandEugen db7c7d1af1 Improve scrolling behaviour (#1415) 
* Replace column margin with padding

This improves horizontal scrolling behaviour significantly; scrolled flex elements are... a little weird.

* Move clear column button styling to css
 2017-04-10 16:27:30 +02:00
Ram LmnandEugen 42fb4faa0f Fix icon and emoji sizes (#1403) 
Fixes icons and emoji size issues described in #1233.
 2017-04-10 13:02:09 +02:00
Ratmir KarabutandEugen 9043b32183 Add Russian translation (ru) (#1023) 
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency
 2017-04-10 12:52:06 +02:00
Gavin Moganandwxcafé 8bdf02812c Add search to emoji picker (#1395) 2017-04-10 09:58:09 +02:00
Hugo GameiroandEugen 4ea4ef9d0f update portuguese translation (#1280) 
added the missing fields and improved the translation
 2017-04-09 18:49:26 +02:00
StefOfficielandEugen 12e29c9660 Update fr.jsx (#1329) 
* Update fr.jsx

* Remove duplicate translation
 2017-04-09 14:58:08 +02:00
Jonathan KleeandEugen ba2aea3a80 add empty notifications french translation (#1111) 2017-04-09 14:54:02 +02:00
Brian MockandEugen 53eb31f124 Fixes #1311 margin shouldn't stay fixed (#1312) 2017-04-09 14:45:26 +02:00
Rachel HandEugen b1881a3d48 Fix nonworking clear notices button (#1316) 2017-04-09 11:35:23 +02:00
EugenandGitHub 9acdb166e8 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278) 
* Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled

* Clean up
 2017-04-08 22:20:08 +02:00
Pavel DjundikandEugen 470eb0042e Improve responsiveness of registration form and closed banner (#1265) 2017-04-08 18:31:50 +02:00
Pavel DjundikandEugen fc146a19cc Improve about page responsiveness (#1252) 2017-04-08 15:28:23 +02:00
Thomas CitharelandEugen 41f8fde83e Update french translation (#1148) 
Add french translation for emails sent

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add non-breaking spaces

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

changes and fixes to the nbsps

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

French update

a few fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-04-08 13:11:16 +02:00
Markus Amalthea MagnusonandEugen 157f0a2aa7 Add titles to more icons, and change clear notifications icon. (#1101) 2017-04-08 13:07:55 +02:00
Nicolai von NeudeckandEugen c803f5b440 Updated German translation (#1248) 
Fixed various spelling and grammar mistakes.
Used more gender-neutral language.
 2017-04-08 13:04:58 +02:00
Alda Marteau-HardiandEugen 35eff3f2d0 Add some missing strings to prevent some React warning in the console (#1230) 2017-04-08 12:16:16 +02:00
Chris HeningerandGitHub 0ad694f96b Add SVG version of logo to repo 2017-04-07 20:40:18 -07:00
Shel RandGitHub fef478781d Merge branch 'master' into master 2017-04-07 22:21:21 -04:00
Shel RandGitHub 9f43e3b428 Merge branch 'master' into patch-4 2017-04-07 22:02:26 -04:00
Matt Jankowski 97ae53daa8 Reduce size of background-photo.jpeg 
Reduced by running through `guetzli` image optimizer.
 2017-04-06 16:24:57 -04:00
André LewinandGitHub bf7cefa516 Merge branch 'master' into master 2017-04-05 20:28:58 +02:00
tomandGitHub 8989569dd4 Update components.scss 
Use nicer scrollbars in MS edge
 2017-04-05 12:10:25 -04:00
JantsoPandGitHub 20b53e6add Merge branch 'master' into master 2017-04-05 10:07:17 +02:00
JantsoPandGitHub b8a867adcc updated translation 
Updated some translations after seeing them in service. Should be better now
 2017-04-05 09:56:10 +02:00
EugenandGitHub afdcdce551 Merge pull request #839 from SirCmpwn/profile-readability 
Improve readability of text on profiles
 2017-04-05 03:23:16 +02:00
Drew DeVault c106b6d3e0 Improve readability of text on profiles 2017-04-04 21:13:23 -04:00
EugenandGitHub e76dd52b08 Merge pull request #818 from JantsoP/master 
Updated Finnish Translation
 2017-04-05 03:09:20 +02:00
axolotl 8736ef50ad Added Esperanto translation inside the javascripts folder 2017-04-04 20:54:42 +02:00
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI 2017-04-04 15:28:12 +02:00
JantsoPandGitHub 10a8666e04 updated line 28 about GitHub 2017-04-04 15:07:15 +02:00
halna_TanaguruandGitHub 3abb0f7bc7 Merge branch 'master' into development 2017-04-04 12:06:53 +02:00
JantsoPandGitHub db4a41cf58 Merge branch 'master' into master 2017-04-04 08:41:46 +02:00