26f08f0791
double-decker tootbox
2017-10-16 22:10:14 +02:00
6cd5b3bbe5
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-16 01:29:02 -05:00
f72ad67a39
Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification
...
Avatar unification, mk.II
2017-10-16 00:49:05 -05:00
56094cb4bd
1.6 changed files for unified avatar styling -- updated to restore unity
2017-10-15 21:14:21 -07:00
22df18e902
Merge pull request #173 from glitch-soc/zerowidthmoji
...
use zerowidth spaces with emojis
2017-10-15 20:04:19 -05:00
894da3dcca
Clear timer when unmounting RelativeTimestamp components ( #5408 )
...
Possibly the cause of #5379 , #5377
2017-10-16 03:03:36 +02:00
8eb7d30a6c
l10n Occitan: finishing touches ( #5404 )
...
* Update oc.json
* Update oc.yml
2017-10-15 23:07:32 +02:00
7fe1428cc4
Update French translation ( #5401 )
2017-10-15 21:21:05 +09:00
b3b4b5a2eb
Adjust public hashtag pages ( #5357 )
2017-10-14 14:48:12 +02:00
ae716a12e1
replace newlines in desktop notif with spaces instead of removing them ( #5361 )
2017-10-14 14:41:12 +02:00
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
c6f76db2e1
Update French translation ( #5384 )
...
Update French translation
2017-10-14 14:30:19 +02:00
2c704ca9c6
l10n: update Persian translation for 2.0 ( #5391 )
2017-10-14 14:28:19 +02:00
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
eb96aa86a4
Update German translation ( #5389 )
2017-10-14 19:00:23 +09:00
531dadad86
Doodle palette, options, fill tool ( #172 )
2017-10-14 00:58:38 +02:00
723890b6fa
use zerowidth spaces for emojis
2017-10-14 00:48:53 +02:00
2af964ef20
Fixed a bug where the canvas would get transparent bg upon erase
2017-10-13 18:13:00 +02:00
33e806217f
Initial doodle support
2017-10-13 18:07:01 +02:00
c35132a738
Dutch strings: small change ( #5375 )
...
* Dutch strings: small change
* And this too.
2017-10-13 18:03:56 +02:00
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
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
d37305c628
Reduce discrepancies between server and client-side character count ( #5360 )
2017-10-12 23:26:34 +02:00
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
df626fdd43
Fix the notification bug with newlines
2017-10-12 21:28:17 +02:00
6a2b1ba91e
Another tabs-vs-spaces fix, but with ~feeling~
2017-10-12 09:36:26 -05:00
3cfcc7a50e
Fix some consistance errors in gender neutral formulations. Add some missing ones. ( #5350 )
2017-10-12 16:31:14 +02:00
fe1c20cfb9
Fix tabs-vs-spaces issue pointed out by eslint.
2017-10-12 09:23:06 -05:00
cb7ba23cd8
Update oc.json ( #5343 )
2017-10-12 15:40:45 +02:00
13e05fece2
Merge tag 'v2.0.0rc2' into gs-master
2017-10-12 04:22:59 -05:00
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
eeaa8fba43
Fix our media gallery not having alt text and tooltips
2017-10-11 22:02:24 +02:00
b0b5ff1b0f
workaround for scrollIntoView bug ???
2017-10-11 21:49:22 +02:00
0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
6bc07d3de3
Updating Dutch strings for 2.0 ( #5334 )
2017-10-11 21:21:22 +02:00
0352c40e99
Use gender neutral language as in the rest of the french translation ( #5331 )
2017-10-11 21:20:56 +02:00
07ea625cb2
Fix styles of error pages ( #5335 )
...
Signed-off-by: Lynx Kotoura <admin@sanin.link>
Signed-off-by: Lynx Kotoura <admin@sanin.link>
2017-10-11 21:18:45 +02:00
3cc6255a7e
Removed length check which now happens in reducer
2017-10-11 11:50:11 -07:00
35e2cad4eb
Fixed header emojification
2017-10-11 11:00:28 -07:00
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
1823cf435a
In thread view, only scroll first update, scroll to replied-to post ( #5322 )
2017-10-11 19:21:44 +02:00
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
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
38600b2792
Update ar.json ( #5316 )
...
Pushing new arabic translated strings for Mastodon web client.
2017-10-11 21:19:04 +09:00
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
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
9815be2a44
Fix #5293 - Pre-fill frequently used emojis to avoid bugs ( #5305 )
2017-10-10 20:47:14 +02:00
4bb3e4eeba
Fix #5295 - Order custom emoji lexicographically ( #5297 )
2017-10-10 15:18:12 +02:00
784c7510d7
Fix an error when video playback buffer is empty ( #5300 )
2017-10-10 15:17:53 +02:00
1c6fc0e4ce
Center error layout ( #5289 )
2017-10-09 20:51:36 +02:00
Ondřej Hruška