David Yip
90770f6d59
Merge pull request #185 from glitch-soc/fix-null-status
...
workaround for null status
2017-10-18 17:01:31 -05:00
beatrix
088d05b088
Merge pull request #188 from glitch-soc/merge-upstream-2-0-0
...
Merge with upstream v2.0.0
2017-10-18 17:57:42 -04:00
beatrix
c756651278
Merge pull request #188 from glitch-soc/merge-upstream-2-0-0
...
Merge with upstream v2.0.0
2017-10-18 17:57:42 -04:00
Ondřej Hruška
0a9b3b1415
formatting fix for eslint
2017-10-18 23:44:06 +02:00
Ondřej Hruška
eb907a5bab
formatting fix for eslint
2017-10-18 23:44:06 +02:00
David Yip
722fe5fda8
Remove unused filesAttached property.
2017-10-18 13:20:45 -05:00
David Yip
39c9cdf7fe
Remove unused filesAttached property.
2017-10-18 13:20:45 -05:00
David Yip
c17395266c
Update stylesheet imports in glitch components.
...
Commit cd59b66680
2017-10-18 11:52:34 -05:00
David Yip
86cf4468af
Update stylesheet imports in glitch components.
...
Commit 6e54719474
2017-10-18 11:52:34 -05:00
David Yip
dd4f9f18cb
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
David Yip
42e8c8eb0e
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
Sho Kusano
85e47a4423
Suppress type error(not a function) on calling fastSeek ( #5452 )
2017-10-18 17:13:51 +02:00
Sho Kusano
09d81defcd
Suppress type error(not a function) on calling fastSeek ( #5452 )
2017-10-18 17:13:51 +02:00
Eugen Rochko
b222a9d5ee
Bump version to 2.0.0 🐘
2017-10-18 13:53:56 +02:00
Eugen Rochko
3810d98cd8
Bump version to 2.0.0 🐘
2017-10-18 13:53:56 +02:00
Renato "Lond" Cerqueira
a761e02bd1
Fix pt-BR translation strings related to advanced search. ( #5449 )
2017-10-18 13:53:17 +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
8eea3bd6d8
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
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
ecef91e5ca
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
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
Yamagishi Kazutoshi
0d618ce271
Run i18n-tasks checked-normalized in Travis CI ( #5443 )
2017-10-18 11:57:02 +02:00
Yamagishi Kazutoshi
990d6dd565
Run i18n-tasks checked-normalized in Travis CI ( #5443 )
2017-10-18 11:57:02 +02:00
Yamagishi Kazutoshi
8c97598548
Enable coverage for Jest ( #5442 )
2017-10-18 11:39:36 +02:00
Yamagishi Kazutoshi
402da46ff6
Enable coverage for Jest ( #5442 )
2017-10-18 11:39:36 +02:00
JohnD28
8e386ca547
fr.json typo (realtive time) ( #5447 )
...
Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie
2017-10-18 16:47:14 +09: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
cb48c98e02
Bump version to 2.0.0rc4
2017-10-17 23:16:35 +02:00
Eugen Rochko
637ea3bb5b
Bump version to 2.0.0rc4
2017-10-17 23:16:35 +02:00
Jeroen
6235b8a8b1
Dutch: A few strings I found last minute ( #5440 )
...
* Dutch: A few strings I found last minute
* Update simple_form.nl.yml
2017-10-17 23:15:40 +02:00
Jeroen
363d0d3a44
Dutch: A few strings I found last minute ( #5440 )
...
* Dutch: A few strings I found last minute
* Update simple_form.nl.yml
2017-10-17 23:15:40 +02:00
YaQ
cd59b66680
Make theme directory and Rename application.scss ( #5336 )
...
* Rename application.scss
* Move to 'default' directory
* Follow review
Move directory, and Rename "mastodon".
* Revert rename
* undo removal of newline
2017-10-18 05:20:07 +09:00
YaQ
6e54719474
Make theme directory and Rename application.scss ( #5336 )
...
* Rename application.scss
* Move to 'default' directory
* Follow review
Move directory, and Rename "mastodon".
* Revert rename
* undo removal of newline
2017-10-18 05:20:07 +09:00
Eugen Rochko
8eee4b3d35
When unreblog arrives over streaming API, just delete in UI ( #5439 )
2017-10-17 22:17:02 +02:00
Eugen Rochko
f3003417c5
When unreblog arrives over streaming API, just delete in UI ( #5439 )
2017-10-17 22:17:02 +02:00
JeanGauthier
a18201f690
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
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
Nolan Lawson
845b2f4ad9
Fix scrolling of dropdown when offscreen ( #5434 )
2017-10-17 20:38:16 +02:00
Nolan Lawson
8b22a63ab0
Fix scrolling of dropdown when offscreen ( #5434 )
2017-10-17 20:38:16 +02:00
Eugen Rochko
24155c5890
Fix unwanted content warning gap in CSS ( #5436 )
...
Fix #5356
2017-10-17 20:07:44 +02:00
Eugen Rochko
05686cc99d
Fix unwanted content warning gap in CSS ( #5436 )
...
Fix #5356
2017-10-17 20:07:44 +02:00
Eugen Rochko
fef7c55bce
When status is fetched instead of delivered, do not stream it ( #5437 )
2017-10-17 20:05:21 +02:00
Eugen Rochko
484208ce12
When status is fetched instead of delivered, do not stream it ( #5437 )
2017-10-17 20:05:21 +02:00
unarist
8b2ee20dfa
Don't capture scheme-less URLs in the status ( #5435 )
...
Specifically, this fixes status length calculation to be same as JS side.
BTW, since this pattern used in not only preview card fetching, we
should extract it (with twitter-regex?) and write tests I think.
2017-10-17 18:32:25 +02:00
unarist
3bc8924940
Don't capture scheme-less URLs in the status ( #5435 )
...
Specifically, this fixes status length calculation to be same as JS side.
BTW, since this pattern used in not only preview card fetching, we
should extract it (with twitter-regex?) and write tests I think.
2017-10-17 18:32:25 +02:00
JeanGauthier
e1efabf979
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
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
90fb04f1bb
Fix React warning about tabIndex on status with CW ( #5432 )
2017-10-17 13:03:12 +02:00
unarist
2d395324e1
Fix React warning about tabIndex on status with CW ( #5432 )
2017-10-17 13:03:12 +02:00
Jakob Kramer
15ae7fe6b2
Update German translation ( #5425 )
2017-10-17 12:02:47 +02:00
