Ondřej Hruška
eb907a5bab
formatting fix for eslint
2017-10-18 23:44:06 +02:00
David Yip
39c9cdf7fe
Remove unused filesAttached property.
2017-10-18 13:20:45 -05:00
David Yip
42e8c8eb0e
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
Sho Kusano
09d81defcd
Suppress type error(not a function) on calling fastSeek ( #5452 )
2017-10-18 17:13:51 +02:00
Renato "Lond" Cerqueira
26b2a6a71e
Fix pt-BR translation strings related to advanced search. ( #5449 )
2017-10-18 13:53:17 +02:00
Technowix
edf9a5e4fc
Revert #5438 for FR ( #5450 )
...
As said here https://github.com/tootsuite/mastodon/pull/5438 the point of shortening the timestamp is legit, and after some time of adaptation no mistakes can be mades.
2017-10-18 13:51:30 +02:00
Håkan Eriksson
c710069c12
Some typos and supplementation in sentence structures ( #5441 )
...
* Swedish file added
* Swedish file added
* Swedish file updated
* Swedish languagefile added
* Add Swedish translation
* Add Swedish translation
* Started the Swedish translation
* Added Swedish lang settings
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Swedish language completed and added
* Swedish language Simple_form added
* Swedish language Divise added
* Swedish language doorkeeper added
* Swedish language - now all file complete
* Swedish - Typos and supplementation in sentence structure
* Update simple_form.sv.yml
* Update sv.yml
* Update sv.yml
Rearranged the alphabetical order.
2017-10-18 13:50:52 +02:00
JohnD28
e7099d8d9e
fr.json typo (realtive time) ( #5447 )
...
Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie
2017-10-18 16:47:14 +09:00
Eugen Rochko
f3003417c5
When unreblog arrives over streaming API, just delete in UI ( #5439 )
2017-10-17 22:17:02 +02:00
JeanGauthier
33ea042dec
i18n better wording (OC/CA/FR) + string added in FR ( #5438 )
...
* Update oc.json
* Update fr.json
* Update ca.json
* Update fr.json
* Update simple_form.fr.yml
* Update ca.json
* Update fr.json
* Update oc.json
* Update oc.json
* Update fr.json
2017-10-17 21:49:39 +02:00
Eugen Rochko
05686cc99d
Fix unwanted content warning gap in CSS ( #5436 )
...
Fix #5356
2017-10-17 20:07:44 +02:00
JeanGauthier
a02de9e012
i18n update ( #5427 ) in OC/CA/FR/ES ( #5431 )
...
* Update oc.json
* Update ca.json
* Update fr.json
* Update es.json
2017-10-17 13:03:28 +02:00
unarist
2d395324e1
Fix React warning about tabIndex on status with CW ( #5432 )
2017-10-17 13:03:12 +02:00
Jakob Kramer
e6c9756fa9
Update German translation ( #5425 )
2017-10-17 12:02:47 +02:00
Yamagishi Kazutoshi
5050719fac
Add Japanese translations ( #5427 )
...
* yarn manage:translations
* Add Japanese translation for #5410
* Add Japanese translation for #5393
2017-10-17 11:47:05 +02:00
Håkan Eriksson
a2b600428c
Swedish translation ( #5406 )
...
* Swedish file added
* Swedish file added
* Swedish file updated
* Swedish languagefile added
* Add Swedish translation
* Add Swedish translation
* Started the Swedish translation
* Added Swedish lang settings
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Swedish language completed and added
* Swedish language Simple_form added
* Swedish language Divise added
* Swedish language doorkeeper added
* Swedish language - now all file complete
2017-10-17 13:41:36 +09:00
Jeroen
df1a9c5ab5
Small update Dutch (nl) strings ( #5424 )
...
* Update Dutch strings
* Update Dutch
2017-10-17 01:00:23 +02:00
Ondřej Hruška
4421f6598f
Fix dual toot button wrong behavior after compose re-design
2017-10-16 23:32:13 +02:00
beatrix
7364b26e4b
Merge pull request #184 from tootsuite/master
...
Fix reduced motion breaking public galleries (#5423 )
2017-10-16 17:05:42 -04:00
David Yip
313ba202ef
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
37ff061d9b
satisfy eslint and jest
2017-10-16 22:24:44 +02:00
Ondřej Hruška
26f08f0791
double-decker tootbox
2017-10-16 22:10:14 +02:00
Ondřej Hruška
4b397adb5b
fix some lint errors
2017-10-16 21:13:34 +02:00
Nolan Lawson
8980aa804f
Fix reduced motion breaking public galleries ( #5423 )
2017-10-16 21:08:01 +02:00
David Yip
dbb1fce94d
Merge remote-tracking branch 'upstream/master' into gs-master
2017-10-16 09:23:59 -05:00
Eugen Rochko
aec70b44fc
Filter out duplicate IDs in timelines reducer ( #5417 )
...
Possibly the cause of #5379 , #5377
2017-10-16 15:59:30 +02:00
voidSatisfaction
03975dbde4
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
f72936b4e6
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
3c530d95f6
i18n: Update Polish translation ( #5416 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-16 14:09:51 +02:00
JeanGauthier
1e7b3bf625
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
bf0ee1a25c
Enable ESLint rules import/* ( #5414 )
...
* Enable ESLint rules import/*
* fix
2017-10-16 11:12:09 +02:00
Nolan Lawson
fa0be3f834
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
981e20b03a
Fix offline-plugin warning in dev mode ( #5411 )
2017-10-16 09:33:50 +02:00
Yamagishi Kazutoshi
d5b767c374
Replace JavaScript Testing Framework from Mocha to Jest ( #5412 )
2017-10-16 09:33:08 +02:00
Nolan Lawson
93b54b8d4b
i18n "More" dropdown title ( #5410 )
2017-10-16 09:31:47 +02:00
Nolan Lawson
e7ab9bf8b4
Refactor and simplify icon_button.js ( #5413 )
2017-10-16 09:30:09 +02:00
David Yip
6cd5b3bbe5
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-16 01:29:02 -05:00
David Yip
22df18e902
Merge pull request #173 from glitch-soc/zerowidthmoji
...
use zerowidth spaces with emojis
2017-10-15 20:04:19 -05:00
Eugen Rochko
894da3dcca
Clear timer when unmounting RelativeTimestamp components ( #5408 )
...
Possibly the cause of #5379 , #5377
2017-10-16 03:03:36 +02:00
JeanGauthier
8eb7d30a6c
l10n Occitan: finishing touches ( #5404 )
...
* Update oc.json
* Update oc.yml
2017-10-15 23:07:32 +02:00
Yannick A
7fe1428cc4
Update French translation ( #5401 )
2017-10-15 21:21:05 +09:00
Ondřej Hruška
ae716a12e1
replace newlines in desktop notif with spaces instead of removing them ( #5361 )
2017-10-14 14:41:12 +02:00
spla
f63a40e7c2
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
c6f76db2e1
Update French translation ( #5384 )
...
Update French translation
2017-10-14 14:30:19 +02:00
Masoud Abkenar
2c704ca9c6
l10n: update Persian translation for 2.0 ( #5391 )
2017-10-14 14:28:19 +02:00
Ondřej Hruška
cdc22d23b9
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
eb96aa86a4
Update German translation ( #5389 )
2017-10-14 19:00:23 +09:00
Ondřej Hruška
531dadad86
Doodle palette, options, fill tool ( #172 )
2017-10-14 00:58:38 +02:00
Ondřej Hruška
723890b6fa
use zerowidth spaces for emojis
2017-10-14 00:48:53 +02:00
Ondřej Hruška
2af964ef20
Fixed a bug where the canvas would get transparent bg upon erase
2017-10-13 18:13:00 +02:00
Ondřej Hruška
33e806217f
Initial doodle support
2017-10-13 18:07:01 +02:00
Jeroen
c35132a738
Dutch strings: small change ( #5375 )
...
* Dutch strings: small change
* And this too.
2017-10-13 18:03:56 +02:00
Eugen Rochko
48f7a58799
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
388d093beb
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
d37305c628
Reduce discrepancies between server and client-side character count ( #5360 )
2017-10-12 23:26:34 +02:00
Anna e só
ad917cda10
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
df626fdd43
Fix the notification bug with newlines
2017-10-12 21:28:17 +02:00
David Yip
6a2b1ba91e
Another tabs-vs-spaces fix, but with ~feeling~
2017-10-12 09:36:26 -05:00
Alda Marteau-Hardi
3cfcc7a50e
Fix some consistance errors in gender neutral formulations. Add some missing ones. ( #5350 )
2017-10-12 16:31:14 +02:00
David Yip
fe1c20cfb9
Fix tabs-vs-spaces issue pointed out by eslint.
2017-10-12 09:23:06 -05:00
JeanGauthier
cb7ba23cd8
Update oc.json ( #5343 )
2017-10-12 15:40:45 +02:00
David Yip
13e05fece2
Merge tag 'v2.0.0rc2' into gs-master
2017-10-12 04:22:59 -05:00
Sylvhem
3ebe03b729
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
b0b5ff1b0f
workaround for scrollIntoView bug ???
2017-10-11 21:49:22 +02:00
Ondřej Hruška
0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
Jeroen
6bc07d3de3
Updating Dutch strings for 2.0 ( #5334 )
2017-10-11 21:21:22 +02:00
Alda Marteau-Hardi
0352c40e99
Use gender neutral language as in the rest of the french translation ( #5331 )
2017-10-11 21:20:56 +02:00
kibigo!
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
Eugen Rochko
1823cf435a
In thread view, only scroll first update, scroll to replied-to post ( #5322 )
2017-10-11 19:21:44 +02:00
Eugen Rochko
476e79b8e3
Fully disable hotkeys when input element is focused ( #5324 )
...
Because alt+n is a way to enter some kinda letter on some keyboard
2017-10-11 16:31:07 +02:00
JohnD28
19d3317a69
Update french translation : mastodon/locales/fr.json ( #5318 )
...
* Update fr.json
* Update fr.json
* Update fr.json
2017-10-11 22:07:09 +09:00
ButterflyOfFire
38600b2792
Update ar.json ( #5316 )
...
Pushing new arabic translated strings for Mastodon web client.
2017-10-11 21:19:04 +09:00
unarist
b0407ece42
Fix an error when ancestors get loaded before the status itself ( #5312 )
...
When ancestors get loaded, we scroll to the target status (i.e. skip
ancestors). However, ancestors may get loaded before the status itself,
then it causes TypeError because `this.node` is undefined yet.
Since we don't show anything until the status gets loaded, we don't need
to scroll to the target status in this time. If we get the status itslef
later, it causes `componentDidUpdate` and scrolling correctly.
2017-10-11 11:25:15 +02:00
Eugen Rochko
b3d7ad958f
Fix #5306 : Stop hotkeys in input fields even when shift is pressed ( #5309 )
...
AZERTY layouts require pressing shift to press a number at all, so
it triggers a column switch even when simply typing numbers in
textarea
2017-10-11 01:01:17 +02:00
Eugen Rochko
9815be2a44
Fix #5293 - Pre-fill frequently used emojis to avoid bugs ( #5305 )
2017-10-10 20:47:14 +02:00
Eugen Rochko
4bb3e4eeba
Fix #5295 - Order custom emoji lexicographically ( #5297 )
2017-10-10 15:18:12 +02:00
unarist
784c7510d7
Fix an error when video playback buffer is empty ( #5300 )
2017-10-10 15:17:53 +02:00
Eugen Rochko
488584bfc1
Track frequently used emojis in web UI ( #5275 )
...
* Track frequently used emojis in web UI
* Persist emoji usage, but debounce commits to the settings API
* Fix #5144 - Add tooltips to picker
* Display only 2 lines of frequently used emojis
2017-10-08 21:47:15 +02:00
JeanGauthier
94f15338c3
i18n update Occitan ( #5263 )
...
* Update oc.json
* Update oc.yml
* Update oc.yml
* Update oc.json
2017-10-08 14:18:27 +09:00
Nolan Lawson
db33a53ee8
Video preload should be a string ( #5267 )
2017-10-08 03:06:43 +02:00
Nolan Lawson
7de6d269d2
Use ES module build of react-router-dom ( #5264 )
2017-10-08 02:55:58 +02:00
Eugen Rochko
684001d729
Dynamically calculate card height for embeds instead of padding ( #5265 )
...
The padding trick was hard-coded to a 16:9 ratio, but we can use
width and height provided from OEmbed information and width
of the card itself to calculate a new height
2017-10-08 02:34:49 +02:00
Eugen Rochko
292f3cd7e0
Show buffering in video player ( #5261 )
2017-10-08 02:33:08 +02:00
Eugen Rochko
f486ef2666
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
Eugen Rochko
d2dee6ea43
Fix custom emoji in emoji picker, persist skin tone ( #5258 )
2017-10-07 19:02:30 +02:00
MitarashiDango
b7e65a004f
Japanese translation (relative time) ( #5251 )
2017-10-08 01:32:03 +09:00
Nolan Lawson
057db0ecd0
Update emoji-mart to v2.1.1 ( #5256 )
2017-10-07 12:17:02 +02:00
Eugen Rochko
11436358b4
Fix regression from #5206 - deduplicate descendants ( #5253 )
2017-10-07 12:16:39 +02:00
Eugen Rochko
45682f876d
Make auto-play GIFs preference affect custom emojis in web UI ( #5254 )
2017-10-07 02:38:52 +02:00
K.SHIRAKASHI
d5f490b1a2
Fix error on reloading status detail column ( #5248 )
2017-10-06 20:37:56 +02:00
MIYAGI Hikaru
6f2d88dd28
Fix error at emoji_compressed in Firefox ESR ( #5241 )
2017-10-06 16:40:41 +02:00
Nolan Lawson
72d939b69f
Fix thinking_face emoji autocomplete ( #5238 )
2017-10-06 12:03:13 +02:00
Ondřej Hruška
37e141bccb
comment out unused stuff with Video
2017-10-06 09:23:28 +02:00
Nolan Lawson
97b3d0cd56
Import only Spring/Motion from react-motion ( #5236 )
2017-10-06 03:46:15 +02:00
Nolan Lawson
fd7f0732fe
Compress and combine emoji data ( #5229 )
2017-10-06 03:42:34 +02:00
Nolan Lawson
2aca22b8ea
import only Overlay from react-overlays ( #5235 )
2017-10-06 03:24:33 +02:00
Eugen Rochko
7db0f8dcb2
Implement hotkeys for web UI ( #5164 )
...
* Fix #2102 - Implement hotkeys
Hotkeys on status list:
- r to reply
- m to mention author
- f to favourite
- b to boost
- enter to open status
- p to open author's profile
- up or k to move up in the list
- down or j to move down in the list
- 1-9 to focus a status in one of the columns
- n to focus the compose textarea
- alt+n to start a brand new toot
- backspace to navigate back
* Add navigational hotkeys
The key g followed by:
- s: start
- h: home
- n: notifications
- l: local timeline
- t: federated timeline
- f: favourites
- u: own profile
- p: pinned toots
- b: blocked users
- m: muted users
* Add hotkey for focusing search, make escape un-focus compose/search
* Fix focusing notifications column, fix hotkeys in compose textarea
2017-10-06 01:07:59 +02:00
Eugen Rochko
b9c76e2edb
When processing custom emoji, ensure a non-animated version exists ( #5230 )
...
Use the non-animated version in web UI, but return both in API
2017-10-05 23:41:47 +02:00
MitarashiDango
ecfa1c3f3b
fix error (When part of conversation has already been deleted.) ( #5216 )
2017-10-04 16:28:39 +02:00
Eugen Rochko
632178d754
Use own, shorter relative timestamps ( #5171 )
...
* Use own, shorter relative timestamps
* Add acct to title tooltip of display name in statuses
* Improve i18n of the relative times
2017-10-04 01:23:52 +02:00
