mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,097 Commits
69 Branches
20 Tags
354 MiB
Commit Graph

557 Commits (2f2b84bfbbfa21a09e03dca05e159aadb70d2232)

Author SHA1 Message Date
Henry Smith 1921c5416b Fix console error when scrolling a column with no scrollable content (#1574) 2017-04-11 21:58:28 +02:00
Thomas Citharel 327a6e166f Update french locale (#1525) 
* Update devise.fr.yml fixing minor typos

* add missing strings

* Fix a translation and add translation for devise part

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-04-11 21:54:40 +02:00
pinfort 6f5268b02d Add Japanese translation (#1552) 
* add device.ja.yml

* update device.ja.yml

* add file simple_form.ja.yml

* 👍Added doorkeeper.ja.yml

* add ja.yml

* Update doorkeeper.ja.yml

fixed url to uri

* update ja.yml

* fix some translations

* fix japanese grammar of a translate

* fix some translates

* fix ja.yml

* add ja.jsx

* add Japanese user mail views

* Added japanese translate locales

* Added :ja to available_locales

こっちも

* Added "日本語" to HUMAN_LOCALES

* Imported/Added ja to addLocaleData

* update ja.jsx
 2017-04-11 21:52:09 +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
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
blackle 01e5447e35 Add boost confirm modal 2017-04-10 22:35:55 -04:00
Eugen 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 Jouan 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
Eugen 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 Martin ae57b3a8c5 Add more specific class names to notification divs (#1120) 2017-04-10 22:41:52 +02:00
Rachel H f690320fb9 Keep newlines in xml (#1397) 2017-04-10 21:32:45 +02:00
Stephen Burgess 553170b77a Fix #1097 When onClick is falsy, do not make status content clickable (#1434) 2017-04-10 21:31:26 +02:00
Jessica Stokes 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
Jessica Stokes 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
Ratmir Karabut 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 Mogan 8bdf02812c Add search to emoji picker (#1395) 2017-04-10 09:58:09 +02:00
Hugo Gameiro 4ea4ef9d0f update portuguese translation (#1280) 
added the missing fields and improved the translation
 2017-04-09 18:49:26 +02:00
StefOfficiel 12e29c9660 Update fr.jsx (#1329) 
* Update fr.jsx

* Remove duplicate translation
 2017-04-09 14:58:08 +02:00
Jonathan Klee ba2aea3a80 add empty notifications french translation (#1111) 2017-04-09 14:54:02 +02:00
Rachel H b1881a3d48 Fix nonworking clear notices button (#1316) 2017-04-09 11:35:23 +02:00
Thomas Citharel 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 Magnuson 157f0a2aa7 Add titles to more icons, and change clear notifications icon. (#1101) 2017-04-08 13:07:55 +02:00
Nicolai von Neudeck 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-Hardi 35eff3f2d0 Add some missing strings to prevent some React warning in the console (#1230) 2017-04-08 12:16:16 +02:00
André Lewin bf7cefa516 Merge branch 'master' into master 2017-04-05 20:28:58 +02:00
JantsoP 20b53e6add Merge branch 'master' into master 2017-04-05 10:07:17 +02:00
JantsoP b8a867adcc updated translation 
Updated some translations after seeing them in service. Should be better now
 2017-04-05 09:56:10 +02:00
Eugen 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
JantsoP 10a8666e04 updated line 28 about GitHub 2017-04-04 15:07:15 +02:00
halna_Tanaguru 3abb0f7bc7 Merge branch 'master' into development 2017-04-04 12:06:53 +02:00
JantsoP db4a41cf58 Merge branch 'master' into master 2017-04-04 08:41:46 +02:00
JantsoP b8243c1b49 changed line 25 for better translation 2017-04-04 08:26:59 +02:00
halna_Tanaguru 3f30ae1f97 accessibility fix 
eanable focus on ClearColumnButton
 2017-04-03 22:45:29 +02:00
David Baumgold 5652f00d81 GitHub should be capitalized 2017-04-03 11:44:11 -04:00
JantsoP a229840ffe fixed typo 2017-04-03 14:16:03 +02:00
JantsoP bfa99981e5 Merge branch 'master' into master 2017-04-03 13:50:57 +02:00
JantsoP 22f88b845a add finnish translation 
add finnish translation
 2017-04-03 13:33:43 +02:00
JantsoP eabb86b124 add finnish language 
add finnish language
 2017-04-03 13:32:10 +02:00
JantsoP 69fc95a2f5 Create Finnish translation for Mastodon 
Create Finnish translation for Mastodon
 2017-04-03 12:09:33 +02:00
Marvin Kopf 1236a12cae add mute option in status dropdown 2017-04-03 10:44:08 +02:00
Eugen d2358aefec Merge branch 'master' into master 2017-04-03 01:07:53 +02:00
Eugen 61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales 
Feature/improve french locales (again)
 2017-04-03 00:25:56 +02:00
Kazhnuz c76d20c2a0 Add forgotten comma 2017-04-02 23:39:41 +02:00
Damien Erambert 4f7cce25ac Add more lcoales in fr.jsx 2017-04-02 14:23:40 -07:00
Kazhnuz 633e5ec6f6 Update French Translation 2017-04-02 23:18:01 +02:00
Eugen 09b4b65fde Merge pull request #740 from 0x70b1a5/master 
remove black border on video mute/spoiler buttons
 2017-04-02 22:22:56 +02:00
Eugen 48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales 
Improve/add some French locales
 2017-04-02 22:22:44 +02:00