OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,384 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

10384 Commits (58be44ad9edb31bc05244f301c4f2e4ff7e34dd2)

Author SHA1 Message Date
Luke Barnard b18a8c483e
Merge pull request #1952 from matrix-org/luke/context-menus-downwards-keep-vertically-on-screen 
Keep context menus that extend downwards vertically on screen
 2018-06-12 16:27:57 +01:00
Luke Barnard ffcba9498e Keep context menus that extend downwards vertically on screen 
This fixes https://github.com/vector-im/riot-web/issues/3429 in the case
of RoomList context menus *and* EventTile context menus.

This was mostly stolen from #1903 and it would be good to factor things
out at a later date such that #1903 is replaced with similar logic
within ContextualMenu.
 2018-06-12 16:14:24 +01:00
Michael Telatynski ed779cabc4
add mx_filterFlipColor to mx_MemberInfo_cancel img 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 15:35:06 +01:00
Michael Telatynski 9dd2184b33
remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 15:29:05 +01:00
Michael Telatynski c820836bcc
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 15:23:11 +01:00
Weblate f073178a1f Merge remote-tracking branch 'origin/develop' into develop 2018-06-12 13:27:26 +00:00
strix aluco 848052bb80 Translated using Weblate (Ukrainian) 
Currently translated at 23.6% (281 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2018-06-12 13:27:26 +00:00
Silke 9b6c3f44ec Translated using Weblate (Dutch) 
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2018-06-12 13:27:24 +00:00
David Baker e858cf3bcb Merge branch 'master' into develop 2018-06-12 14:26:29 +01:00
David Baker 13d52065f5 Merge branch 'release-v0.12.7' 2018-06-12 14:23:48 +01:00
David Baker ef1f580abb v0.12.7 2018-06-12 14:21:30 +01:00
David Baker 0ad738d510 Prepare changelog for v0.12.7 2018-06-12 14:21:30 +01:00
David Baker 334dccbdc7 Released js-sdk 2018-06-12 14:14:14 +01:00
Luke Barnard 0934006817 Track decryption success/failure rate with piwik 
Emit a piwik event when a decryption occurs in the category "E2E" with
the action "Decryption result" and the name either "failure" or
"success".

NB: This will cause Riot to a lot of networking when decrypting many
events. One HTTP request per decrypted event should be expected.
 2018-06-12 14:13:09 +01:00
Michael Telatynski 18546dbe06
QR Code align [m] logo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:33:38 +01:00
Michael Telatynski f9b3f0f9d1
run gen-i18n and prune-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:02 +01:00
Michael Telatynski d8a1feb501
fix Modal typo and refactor BaseDialog to fix " undefined" className 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:02 +01:00
Michael Telatynski 7f1ce52dd3
link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:01 +01:00
Michael Telatynski 64bcf6fd7e
allow ContextualMenu to run without background, for tooltips & fix copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:01 +01:00
Michael Telatynski e3c455e599
Style the ShareDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:01 +01:00
Michael Telatynski e7a4a0b2e0
allow context-menus/tooltips to work over modals 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:01 +01:00
Michael Telatynski 074051297a
add a ShareDialog for sharing users,groups and rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:21:55 +01:00
Luke Barnard 2120858e5f
Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-06-11 14:24:40 +01:00
Weblate 6172196495 Merge remote-tracking branch 'origin/develop' into develop 2018-06-08 16:36:48 +00:00
David Baker 50e08c7560
Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone 
re-run checkIfAlone if a member change occurred in the active room
 2018-06-08 17:36:42 +01:00
Weblate 13675b258d Merge remote-tracking branch 'origin/develop' into develop 2018-06-08 15:48:46 +00:00
David Baker 06321deea9
Merge pull request #1935 from turt2live/travis/persist-pinned-open 
Persist pinned message open-ness between room switches
 2018-06-08 16:48:40 +01:00
Weblate 2f8814d1c5 Merge remote-tracking branch 'origin/develop' into develop 2018-06-08 15:46:39 +00:00
David Baker 8dce276e5b
Merge pull request #1933 from turt2live/travis/pin-cosmetics 
Pinned message cosmetic improvements
 2018-06-08 16:46:33 +01:00
Weblate 6c7b8f619b Merge remote-tracking branch 'origin/develop' into develop 2018-06-08 15:41:18 +00:00
Kenneth Larsson 62978b7a2b Translated using Weblate (Swedish) 
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-06-08 15:41:18 +00:00
Andrey b8cc438cb3 Translated using Weblate (Russian) 
Currently translated at 99.8% (1188 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-06-08 15:41:18 +00:00
Yao Wei 92c146bcac Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-06-08 15:41:16 +00:00
David Baker 3983535536
Merge pull request #1916 from akihikodaki/sinon 
Update sinon to 5.0.7
 2018-06-08 16:41:11 +01:00
Michael Telatynski 0b9b03c9ee
re-run checkIfAlone if a member change occurred in the active room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-07 22:01:27 +01:00
Silvano 89b927e278 Translated using Weblate (Italian) 
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-06-07 15:34:12 +00:00
Travis Ralston 83f0459a7f
Merge branch 'develop' into travis/persist-pinned-open 2018-06-06 09:17:08 -06:00
David Baker 4834816a06 v0.12.7-rc.1 2018-06-06 16:06:45 +01:00
David Baker c8bf743506 Prepare changelog for v0.12.7-rc.1 2018-06-06 16:06:44 +01:00
David Baker 881e9a8070 js-sdk rc.1 2018-06-06 16:00:16 +01:00
David Baker 0d9ba17677
Merge pull request #1944 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-06-06 15:52:54 +01:00
Walter 03d67988e8 Translated using Weblate (Russian) 
Currently translated at 99.8% (1188 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-06-06 14:40:42 +00:00
Weblate 8b33c13517 Merge remote-tracking branch 'origin/develop' into develop 2018-06-06 09:08:58 +00:00
Michael Telatynski ffec32c7d9
Merge pull request #1943 from akihikodaki/react 
Import react as React in src/components/views/elements/DNDTagTile.js
 2018-06-06 10:08:52 +01:00
Akihiko Odaki bf0d03bce3 Import react as React in src/components/views/elements/DNDTagTile.js 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-06-06 17:59:50 +09:00
Weblate 0ca7fb4abc Merge remote-tracking branch 'origin/develop' into develop 2018-06-05 09:37:06 +00:00
David Baker bea99e07b3
Merge pull request #1940 from matrix-org/luke/exit_settings 
Fix click on faded left/right/middle panel -> close settings
 2018-06-05 10:36:58 +01:00
Weblate 21e4ee5901 Merge remote-tracking branch 'origin/develop' into develop 2018-06-04 15:40:03 +00:00
Peter Vágner c792ae1c6f Translated using Weblate (Slovak) 
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-06-04 15:40:03 +00:00
Nathan van Beelen 3c204f1eb8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2018-06-04 15:40:01 +00:00