beatrix
cda8575ae3
Merge pull request #184 from tootsuite/master
...
Fix reduced motion breaking public galleries (#5423 )
2017-10-16 17:05:42 -04:00
David Yip
02887e0953
Merge pull request #182 from glitch-soc/wide-tootbox-panel
...
Full-width tootbox panel to make room for buttons
2017-10-16 15:49:22 -05:00
Ondřej Hruška
adec2b6716
satisfy eslint and jest
2017-10-16 22:24:44 +02:00
Ondřej Hruška
f1d386a3ad
double-decker tootbox
2017-10-16 22:10:14 +02:00
Ondřej Hruška
26e7e5f0ef
fix some lint errors
2017-10-16 21:13:34 +02:00
Nolan Lawson
d7b8208a37
Fix reduced motion breaking public galleries ( #5423 )
2017-10-16 21:08:01 +02:00
David Yip
e19bc7835a
Merge remote-tracking branch 'upstream/master' into gs-master
2017-10-16 09:23:59 -05:00
Eugen Rochko
55642feb4b
Filter out duplicate IDs in timelines reducer ( #5417 )
...
Possibly the cause of #5379 , #5377
2017-10-16 15:59:30 +02:00
voidSatisfaction
7ae6d55b8a
Add up-to-date korean translation on client ( #5402 )
...
* chore: add Korean translation for client
* fix: change unlisted and embed Korean words
2017-10-16 14:39:28 +02:00
KY
e1357265ed
Fix #5082 - disable retweet link for followers only toot ( #5397 )
...
* Fix #5082 - disable retweet link for followers only toot
* Hide reblog count when it is a direct message
2017-10-16 14:10:12 +02:00
Marcin Mikołajczak
8953c2a918
i18n: Update Polish translation ( #5416 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-16 14:09:51 +02:00
JeanGauthier
c102025e2c
i18n ultim hour «More» dropdown title + reduce motion ( #5415 )
...
* Correction fem. form
* More dropdown title
* More dropdown title
* More dropdown title
* Add option to reduce motion (#5393 )
2017-10-16 14:09:26 +02:00
Yamagishi Kazutoshi
dd505c5d8c
Enable ESLint rules import/* ( #5414 )
...
* Enable ESLint rules import/*
* fix
2017-10-16 11:12:09 +02:00
Nolan Lawson
a54c272a1f
Add option to reduce motion ( #5393 )
...
* Add option to reduce motion
* Use HOC to wrap all Motion calls
* fix case-sensitive issue
* Avoid updating too frequently
* Get rid of unnecessary change to _simple_status.html.haml
2017-10-16 09:36:15 +02:00
Nolan Lawson
a5d60195fc
Fix offline-plugin warning in dev mode ( #5411 )
2017-10-16 09:33:50 +02:00
Yamagishi Kazutoshi
fb5040885c
Replace JavaScript Testing Framework from Mocha to Jest ( #5412 )
2017-10-16 09:33:08 +02:00
Nolan Lawson
cb0c479fd4
i18n "More" dropdown title ( #5410 )
2017-10-16 09:31:47 +02:00
Nolan Lawson
0e9e72f228
Refactor and simplify icon_button.js ( #5413 )
2017-10-16 09:30:09 +02:00
David Yip
ec18363c3b
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-16 01:29:02 -05:00
David Yip
b015ab4e94
Merge pull request #173 from glitch-soc/zerowidthmoji
...
use zerowidth spaces with emojis
2017-10-15 20:04:19 -05:00
Eugen Rochko
4a0367d04a
Clear timer when unmounting RelativeTimestamp components ( #5408 )
...
Possibly the cause of #5379 , #5377
2017-10-16 03:03:36 +02:00
JeanGauthier
2b099f9f2e
l10n Occitan: finishing touches ( #5404 )
...
* Update oc.json
* Update oc.yml
2017-10-15 23:07:32 +02:00
Yannick A
c03e2d7c51
Update French translation ( #5401 )
2017-10-15 21:21:05 +09:00
Ondřej Hruška
b88cae6c6b
replace newlines in desktop notif with spaces instead of removing them ( #5361 )
2017-10-14 14:41:12 +02:00
spla
9fc9d3554d
Updated Catalan strings ( #5323 )
...
* Add Catalan language
* Add Catalan language
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update settings_helper.rb
* Update mastodon.js
* Update index.js
* Update application.rb
* Update ca.yml
* removed extra spaces at line 225
* Catalan translation update
added activerecord.ca.yml
* Update activerecord.ca.yml
Done
* Updated activerecord.ca.yml
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Update ca.json
Removed :
<<<<<<< HEAD
"getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master
* Syncing to master
* Added new Catalan strings
* removed config.secret_key line
* Corrected <sotrong> tag to <strong>
Line 515
* Removed extra line
* Reverted
* yarn.lock reverted
* Updated Catalan strings
* Updated Catalan strings
2017-10-14 14:40:35 +02:00
Yannick A
7b717319f6
Update French translation ( #5384 )
...
Update French translation
2017-10-14 14:30:19 +02:00
Masoud Abkenar
5c26c3062d
l10n: update Persian translation for 2.0 ( #5391 )
2017-10-14 14:28:19 +02:00
Ondřej Hruška
f92d0bbda4
Doodle improvements 2 ( #176 )
...
* Fix some doodle bugs and added Background color functionality
* added protections against accidental doodle erase, screen size changing
* resolve react warning about 'selected' on <option>
2017-10-14 12:24:35 +02:00
Jakob Kramer
2425ba45ae
Update German translation ( #5389 )
2017-10-14 19:00:23 +09:00
Ondřej Hruška
a438c1dc83
Doodle palette, options, fill tool ( #172 )
2017-10-14 00:58:38 +02:00
Ondřej Hruška
4eb270dd19
use zerowidth spaces for emojis
2017-10-14 00:48:53 +02:00
Ondřej Hruška
0cca5ac567
Fixed a bug where the canvas would get transparent bg upon erase
2017-10-13 18:13:00 +02:00
Ondřej Hruška
f1f6d8220a
Initial doodle support
2017-10-13 18:07:01 +02:00
Jeroen
c07034708c
Dutch strings: small change ( #5375 )
...
* Dutch strings: small change
* And this too.
2017-10-13 18:03:56 +02:00
Eugen Rochko
284b078741
Do not try to guess why home timeline is empty in web UI ( #5370 )
...
* Do not try to guess why home timeline is empty in web UI
* Fix style issue
2017-10-13 16:44:16 +02:00
Eugen Rochko
bfc6479a96
When unfollowing, remove from home in web UI immediately ( #5369 )
...
Do NOT send "delete" through streaming API when unmerging from
home timeline. "delete" implies that the original status was
deleted, which is not true!
2017-10-13 16:44:02 +02:00
ThibG
2e88988fce
Reduce discrepancies between server and client-side character count ( #5360 )
2017-10-12 23:26:34 +02:00
Anna e só
02d14fd373
l10n: PT-BR translation updated ( #5362 )
...
* PT-BR translation updated
* Testing
* Indentation error fixed
* More indentation errors fixed
2017-10-13 06:16:43 +09:00
Ondřej Hruška
e960e2c1d2
Fix the notification bug with newlines
2017-10-12 21:28:17 +02:00
David Yip
227824429b
Another tabs-vs-spaces fix, but with ~feeling~
2017-10-12 09:36:26 -05:00
Alda Marteau-Hardi
dfde574160
Fix some consistance errors in gender neutral formulations. Add some missing ones. ( #5350 )
2017-10-12 16:31:14 +02:00
David Yip
3cc091d374
Fix tabs-vs-spaces issue pointed out by eslint.
2017-10-12 09:23:06 -05:00
JeanGauthier
7c06e0af86
Update oc.json ( #5343 )
2017-10-12 15:40:45 +02:00
David Yip
7d0cf5a6a1
Merge tag 'v2.0.0rc2' into gs-master
2017-10-12 04:22:59 -05:00
Sylvhem
ad4d5aaf96
Fixes and updates for the French translation ( #5340 )
...
* Ajout du support des thèmes multiples
Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples.
Add translations for the new strings allowing support for multiple themes.
* Mise à jour de la traduction
Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas.
Update modified strings and add new translations for the ones who are missing them.
* Remplace « ' » par « ’ »
Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019).
En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux.
Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019).
In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.
2017-10-12 00:58:01 +02:00
Ondřej Hruška
f8749b268c
workaround for scrollIntoView bug ???
2017-10-11 21:49:22 +02:00
Ondřej Hruška
132a22ace5
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
Jeroen
e3717ffadc
Updating Dutch strings for 2.0 ( #5334 )
2017-10-11 21:21:22 +02:00
Alda Marteau-Hardi
ae4345e6d4
Use gender neutral language as in the rest of the french translation ( #5331 )
2017-10-11 21:20:56 +02:00
kibigo!
02827345ae
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
