Commit Graph

62959 Commits

Author SHA1 Message Date
Weblate
d5038b35f6 Merge remote-tracking branch 'origin/develop' into develop 2017-08-11 16:48:32 +00:00
Balaji Ravichandran
2ff23f3b62 Translated using Weblate (Tamil)
Currently translated at 8.2% (17 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
2017-08-11 16:48:32 +00:00
random
eb0c0e63ea Translated using Weblate (Italian)
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/it/
2017-08-11 16:48:32 +00:00
Luke Barnard
07ca70fd44 Fix scrollbar for pills with initial avatar 2017-08-11 17:48:25 +01:00
Balaji Ravichandran
ce1e9c3050 Added translation using Weblate (Tamil) 2017-08-11 14:03:21 +00:00
ErCiccione Calcifer
305adf8b62 Translated using Weblate (Italian)
Currently translated at 19.2% (176 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2017-08-11 13:02:45 +00:00
random
504209b5a6 Translated using Weblate (Italian)
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/it/
2017-08-11 12:36:47 +00:00
Weblate
7911df46a0 Merge remote-tracking branch 'origin/develop' into develop 2017-08-11 09:52:41 +00:00
David Baker
d610788866 Merge pull request #4777 from vector-im/luke/fix-quick-search-nav
move focus-via-up/down cursors to LeftPanel
2017-08-11 10:52:36 +01:00
Weblate
711a8cee8a Merge remote-tracking branch 'origin/develop' into develop 2017-08-11 09:49:29 +00:00
Oon Arfiandwi
7a3c52af7e Translated using Weblate (Indonesian)
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/id/
2017-08-11 09:49:28 +00:00
Kevin Németh
e633d43c38 Translated using Weblate (Hungarian)
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/hu/
2017-08-11 09:49:28 +00:00
David Baker
3eeabe8d91 Merge pull request #4775 from vector-im/luke/fix-user-url-no-middle-panel
Remove userId property on RightPanel
2017-08-11 10:49:25 +01:00
David Baker
02217c8bd2 Merge pull request #1290 from matrix-org/luke/fix-user-url-no-middle-panel
At /user, view member of current room
2017-08-11 10:49:22 +01:00
Szimszon
8b4e00330a Translated using Weblate (Hungarian)
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-08-11 09:44:03 +00:00
Richard Lewis
454ec40b00 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes 2017-08-11 10:35:20 +01:00
Michael Telatynski
84f4fbe142 DRY up code and change flow to be less destructive
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 23:56:57 +01:00
Richard Lewis
0323151bee Show a dialog if the maximum number of widgets allowed has been reached. 2017-08-10 23:53:43 +01:00
Krombel
975aa0f08a Added translation using Weblate (Indonesian) 2017-08-10 22:24:12 +00:00
Michael Telatynski
3fd1a366bf add back button to all pages and widen textarea 2017-08-10 23:13:40 +01:00
Oon Arfiandwi
eb036bd8f1 Translated using Weblate (Indonesian)
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/id/
2017-08-10 21:15:51 +00:00
Michael Telatynski
4bb8aecc25 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools 2017-08-10 21:29:58 +01:00
Weblate
72cbdb2e39 Merge remote-tracking branch 'origin/develop' into develop 2017-08-10 17:20:25 +00:00
Luke Barnard
752934350f Merge pull request #4776 from shvchk/patch-2
Make member device info buttons fluid and stackable with flexbox
2017-08-10 18:20:22 +01:00
Matthew Hodgson
5bfb5d4c3c move focus-via-up/down cursors to LeftPanel
Conflicts:
	src/components/structures/LeftPanel.js
2017-08-10 18:18:15 +01:00
Andrei Shevchuk
a72fc80ef6 Remove width 100% from device info buttons wrapper 2017-08-10 20:08:46 +03:00
Luke Barnard
44c6f3fafc Add todo to make RP listen to RVS 2017-08-10 16:59:12 +01:00
Michael Telatynski
b75ae63956 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/devtools 2017-08-10 16:10:20 +01:00
Michael Telatynski
2d4484e0f2 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools 2017-08-10 16:06:14 +01:00
Andrei Shevchuk
68dd47aa7b Make member device info buttons fluid and stackable with flexbox
Buttons with short text stay as they are, buttons with long text don't get overflowed, but just grow and wrap on a new line if needed, still remaining aligned with others (see screenshot in PR comments)

Signed-off-by: Andrei Shevchuk <andrei@shevchuk.co>
2017-08-10 17:50:09 +03:00
Weblate
a13c0b12cb Merge remote-tracking branch 'origin/develop' into develop 2017-08-10 14:36:08 +00:00
Luke Barnard
535e33509b Merge pull request #4688 from vector-im/t3chguy/i18n_analytics
un-i18n Modal Analytics
2017-08-10 15:36:04 +01:00
Luke Barnard
12966d06cd Merge pull request #1255 from matrix-org/t3chguy/i18n_analytics
un-i18n Modal Analytics
2017-08-10 15:35:46 +01:00
Luke Barnard
d3ba1f40dc Merge pull request #1272 from matrix-org/t3chguy/hide_other_events
allow hiding of avatar/display name changes
2017-08-10 15:35:11 +01:00
Luke Barnard
89254e77f4 When no member, use null roomId 2017-08-10 15:23:14 +01:00
Michael Telatynski
5450d6b9ca remove redundant check and add comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:22:53 +01:00
Michael Telatynski
41843f021d don't track two more potential risks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:21:01 +01:00
Michael Telatynski
56ea528f43 don't track error messages .2
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:17:52 +01:00
Michael Telatynski
4c6836bc3f don't track error messages .2
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:13:30 +01:00
Michael Telatynski
625ca96d86 add comment about why state key must be not undefined
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 14:01:24 +01:00
Michael Telatynski
a6064c53d3 export shouldHideEvent fn named
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 14:00:26 +01:00
Michael Telatynski
ab3abd2f7f fix string casing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:59:55 +01:00
Michael Telatynski
1603360c13 s/Membership/Member/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:58:19 +01:00
Michael Telatynski
9c5ceb6775 don't track error messages
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:56:01 +01:00
Michael Telatynski
b19c1010aa Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/Analytics.js
2017-08-10 13:54:55 +01:00
Michael Telatynski
67f9c3774d make string more human-friendly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:51:47 +01:00
Michael Telatynski
24599ace32 don't track error messages
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:49:11 +01:00
Weblate
d20c1fe029 Merge remote-tracking branch 'origin/develop' into develop 2017-08-10 12:29:44 +00:00
Marcel
aae7515339 Add Login Page LanguageDropdown CSS (#4767) 2017-08-10 13:29:41 +01:00
Marcel
60c1ba4f4d Add LanguageDropdown to LoginPage (#1284) 2017-08-10 13:29:10 +01:00