David Yip
eef50289c6
Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
2017-10-25 16:01:20 -05:00
Jenkins
cfc46d7334
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-10-25 16:17:14 +00:00
Ratmir Karabut
51d4add08d
Update Russian translation ( #5517 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
* Update Russian translation
* Fix formatting error
* Update Russian translation
* Update Russian translation
* Update ru.jsx
* Fix syntax error
* Remove two_factor_auth.warning (appears obsolete)
* Add missing strings in ru.yml
A lot of new strings translated, especially for the newly added admin section
* Fix translation consistency
* Update Russian translation
* Update Russian translation (pluralizations)
* Update Russian translation
* Update Russian translation
* Update Russian translation (pin)
* Update Russian translation (account deletion)
* Fix extra line
* Update Russian translation (sessions)
* Update Russian translation
* Update Russian translation
* Fix merge conflicts (revert)
* Update Russian translation
* Update Russian translation (fix)
* Update Russian translation (fix quotes)
* Update Russian translation (fix quotes)
* Update Russian translation (fix)
* Update Russian translation
* Add quotes
* bundle exec i18n-tasks normalize
2017-10-26 00:21:58 +09:00
Anna e só
93255b003f
l10n: PT-BR translation updated ( #5530 )
2017-10-25 23:11:03 +09:00
Olivier Nicole
fe8646f078
Complete Esperanto translation ( #5520 )
2017-10-25 22:38:37 +09:00
Ondřej Hruška
77cad0daf0
option to add title to <Button>, use for toot buttons ( #197 )
2017-10-24 19:08:07 +02:00
David Yip
86b0a24362
Merge pull request #196 from glitch-soc/fix-imports
...
Added app/javascript for imports
2017-10-23 23:34:43 -05:00
kibigo!
e8dc70ac81
Added app/javascript for imports
2017-10-23 20:22:48 -07:00
David Yip
2b753ac54f
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-22 22:57:41 -05:00
Matthew Walsh
897931099c
Changes to match other timelines in 2.0
2017-10-22 18:45:35 -07:00
Matthew Walsh
737ab88c86
Added a timeline for Direct statuses
...
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL
2017-10-22 18:35:14 -07:00
Marcin Mikołajczak
67992e1b7e
i18n: Update Polish Translation ( #5494 )
2017-10-22 08:34:39 +09:00
Ondřej Hruška
067e4e2404
Compose buttons bar redesign + generalize dropdown ( #194 )
...
* Generalize compose dropdown for re-use
* wip stuffs
* new tootbox look and removed old doodle button files
* use the house icon for ...
2017-10-21 20:24:53 +02:00
beatrix
eed9808f5f
hide mentions of muted accounts (in home col) ( #190 )
...
* hide mentions of muted accounts (in home col)
also cleans up some old crap
* add test
2017-10-20 10:49:54 -04:00
beatrix
6a65bb12e0
Merge pull request #191 from glitch-soc/garglamel-yaml
...
ƔAML update
2017-10-19 19:29:52 -04:00
kibigo!
9e2b6657c0
Updates to bio metadata script
2017-10-19 16:11:53 -07:00
beatrix
e085775f60
Merge pull request #189 from glitch-soc/scrollable-compose-area
...
Make the compose area optionally scrollable
2017-10-19 12:28:47 -04:00
Nolan Lawson
1a8b2157d0
Remove unnecessary translateZ(0) when doing scale() ( #5473 )
2017-10-19 18:27:55 +02:00
David Yip
8b8eeb0fbf
Make the compose area optionally scrollable.
...
On desktop, the compose text box grows to accommodate the content. On
mobile, the text box does not grow to accommodate text context, but does
grow to accommodate images. It is possible in both cases to overflow
the available area, which makes accessing other UI elements (e.g.
visibility setttings) difficult.
This commit makes the compose area optionally scrollable, which allows
those UI elements to remain available even if they go off-screen.
2017-10-19 10:59:50 -05:00
masarakki
2fa2051ecf
remove-duplicated-jest-config ( #5465 )
2017-10-19 13:51:38 +02:00
David Yip
2325bf7423
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
Ondřej Hruška
0a9b3b1415
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
c17395266c
Update stylesheet imports in glitch components.
...
Commit cd59b66680
moved the Mastodon
variables and mixins deeper in the directory hierarchy; this commit
brings the glitch components in line with that change.
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
Sho Kusano
85e47a4423
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
Renato "Lond" Cerqueira
a761e02bd1
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
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
Yamagishi Kazutoshi
0d618ce271
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
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
Eugen Rochko
cb48c98e02
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
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
Eugen Rochko
8eee4b3d35
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
Nolan Lawson
845b2f4ad9
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
fef7c55bce
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
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
unarist
90fb04f1bb
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
Yamagishi Kazutoshi
d7063885bc
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
Yamagishi Kazutoshi
5e6b51e2c9
Normalize locale files ( #5429 )
2017-10-17 11:45:59 +02:00
masarakki
f76a224328
use-DB_NAME-in-development ( #5430 )
2017-10-17 11:45:37 +02:00
aschmitz
4dbdda6b89
Clean up reblog tracking keys, related improvements ( #5428 )
...
* Clean up reblog-tracking sets from FeedManager
Builds on #5419 , with a few minor optimizations and cleanup of sets
after they are no longer needed.
* Update tests, fix multiply-reblogged case
Previously, we would have lost the fact that a given status was
reblogged if the displayed reblog of it was removed, now we don't.
Also added tests to make sure FeedManager#trim cleans up our reblog
tracking keys, fixed up FeedCleanupScheduler to use the right loop,
and fixed the test for it.
2017-10-17 11:45:06 +02:00