63695 Commits

Author SHA1 Message Date
David Baker d86fe0df6e Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-29 13:29:55 +01:00
David Baker 3c149a11ae Merge pull request #1341 from matrix-org/dbkr/remove_audio_element_load
Remove unnecessary 'load' on notif audio element
2017-08-29 12:39:00 +01:00
Mohamed Aamir a499efc8cf Translated using Weblate (Tamil)
Currently translated at 44.4% (92 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
2017-08-29 10:59:59 +00:00
Bamstam fdfa33b603 Translated using Weblate (German)
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-08-28 20:51:57 +00:00
Nathan van Beelen 4a55fcbc26 Translated using Weblate (Dutch)
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-08-28 15:01:50 +00:00
Silke e66c7bf623 Translated using Weblate (Dutch)
Currently translated at 94.2% (915 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-08-28 13:53:12 +00:00
Michael Telatynski 315f7a3ae7 apply shouldHideEvent fn to onRoomTimeline for RoomStatusBar
prevents N new message(s) when a hidden message comes in.
2017-08-28 13:46:09 +01:00
Osoitz ff498e4c3a Translated using Weblate (Basque)
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-08-28 09:20:28 +00:00
Michael Telatynski 6127727267 text4event widget modified, used to show widget added each time. 2017-08-28 08:19:39 +01:00
Iru Cai (vimacs) a9fed3a9e7 Translated using Weblate (Chinese (Simplified))
Currently translated at 60.5% (588 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-08-28 02:08:13 +00:00
Michael Telatynski 9658efd6d7 add comment and remove redundant logic 2017-08-28 01:04:18 +01:00
Michael Telatynski 21af3fe189 modularize and invert logic, so banned etc will count as left 2017-08-28 00:46:28 +01:00
Michael Telatynski 433cd505ee skip direct chats which either you or the target have left 2017-08-28 00:39:59 +01:00
Michael Telatynski b644751ca1 skip direct chats which you have left in memberinfo 2017-08-28 00:16:22 +01:00
Michael Telatynski a2b57f502c lets let people know that the bug report actually sent properly :)
RFC on the wording of it.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-28 00:07:48 +01:00
Michael Telatynski edb449dfe5 we need to pass whether it is an invite RoomSubList explicitly (i18n) 2017-08-27 23:38:25 +01:00
Michael Telatynski 1c387c1fd1 fix two room list regressions:
+ missing roomsublist badge for invites
+ missing room badge for invites if i18n!=English

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-27 23:37:13 +01:00
Michael Telatynski d14f16f0e9 look at event property of the mxEv, this way we won't have all
the additional internal keys :)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-27 17:25:51 +01:00
Michael Telatynski a437f23e9d add i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-26 18:48:24 +01:00
Michael Telatynski 78aa0a59de Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools 2017-08-26 18:29:19 +01:00
Michael Telatynski 1ad4a8170f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/devtools 2017-08-26 18:28:56 +01:00
Jan Kudrik 6616d14e9e Translated using Weblate (Czech)
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
2017-08-26 16:10:12 +00:00
David Baker 6077693829 Merge pull request #1340 from matrix-org/t3chguy/fix_robot_error
_tJsx returns a React Object, the sub fn must return a React Object
2017-08-26 15:22:24 +01:00
David Baker acbcc00016 Remove unnecessary 'load' on notif audio element
It's not necessary to explicitly load and it throws an exception
if you call it while the element is playing, so better to just
remove it.
2017-08-26 15:15:51 +01:00
Jeff Huang 5de4e3d2bb Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2017-08-26 13:25:54 +00:00
Miloslav Nenadál f670e0f66b Translated using Weblate (Czech)
Currently translated at 7.1% (69 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-08-26 09:58:54 +00:00
Miloslav Nenadál 5cf7a0f180 Translated using Weblate (Czech)
Currently translated at 80.6% (167 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
2017-08-26 09:54:26 +00:00
Michael Telatynski cd1e58cb61 _tJsx returns a React Object, the sub fn must return a React Object
not a string
2017-08-26 08:18:55 +01:00
Lauris Mierkalns 8a27fde38d Translated using Weblate (Latvian)
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
2017-08-25 20:49:02 +00:00
Magorak a05d7bb6cb Translated using Weblate (Czech)
Currently translated at 7.0% (68 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-08-25 19:43:21 +00:00
Magorak c2f01d8d1e Translated using Weblate (Czech)
Currently translated at 53.6% (111 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
2017-08-25 19:29:39 +00:00
Nostradamos 3726926776 added padding-left/padding-right: 12px to login/register buttons 2017-08-25 18:23:56 +02:00
Eero bf19d20ec3 Translated using Weblate (Finnish)
Currently translated at 50.2% (104 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
2017-08-25 14:30:08 +00:00
David Baker b15bbc8f9d copyright 2017-08-25 13:35:04 +01:00
David Baker d63a0d30c8 Fix spurious notifications
When loading new content whilst scrolling down the timeline .

Use the Event event which only fire for events received in a sync,
rather than Room.timeline which fires for events from pagination
too.
2017-08-25 13:18:01 +01:00
David Baker a673cbcf1e s/member/groupMember/ 2017-08-25 13:00:43 +01:00
David Baker 299db845ff PR feedback 2017-08-25 12:10:13 +01:00
Richard Lewis a30d8cfa2f Add whitespace 2017-08-25 10:02:32 +01:00
Richard Lewis c046f4bf36 Ignore package-lock.json 2017-08-25 09:53:40 +01:00
Richard Lewis f39f2e525b Update parallelshell version. 2017-08-25 09:52:44 +01:00
Richard Lewis 52717ae486 Update parallelshell version. 2017-08-25 09:51:07 +01:00
Richard Lewis 0f09cca0e3 Ignore package-lock.json 2017-08-25 09:49:40 +01:00
Andrey 221935d894 Translated using Weblate (Russian)
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-08-25 05:54:07 +00:00
Paul Tötterman 0927d2c943 Translated using Weblate (Swedish)
Currently translated at 55.2% (536 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2017-08-25 05:32:21 +00:00
Iru Cai (vimacs) 2942caf6a2 Translated using Weblate (Chinese (Simplified))
Currently translated at 51.4% (500 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-08-25 03:43:10 +00:00
cafade 5f85bc6d7d Translated using Weblate (Spanish)
Currently translated at 80.7% (784 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-08-24 21:41:33 +00:00
Rupus Reinefjord 0beaa76f87 Translated using Weblate (Swedish)
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/
2017-08-24 16:20:04 +00:00
Luke Barnard 006919cb44 Merge pull request #1292 from MTRNord/promiseDeprecationWarnings
Fix deprecation warning about promise.defer()
2017-08-24 16:20:48 +01:00
Marcel d34ba57adb Add missing returns 2017-08-24 16:42:32 +02:00
Weblate a3d0072e45 Merge remote-tracking branch 'origin/develop' into develop 2017-08-24 13:56:44 +00:00