d996e7eebd
Merge remote-tracking branch 'origin/develop' into develop
2018-06-13 09:03:41 +00:00
5a275fcfef
Merge pull request #1953 from matrix-org/t3chguy/skip_set_displayname
...
don't set the displayname on registration as Synapse now does it
2018-06-13 10:03:35 +01:00
4ac8b7747c
Merge remote-tracking branch 'origin/develop' into develop
2018-06-13 08:45:35 +00:00
8136069046
Translated using Weblate (Basque)
...
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/eu/
2018-06-13 08:45:32 +00:00
791784399a
Merge pull request #1955 from matrix-org/t3chguy/create_room_dialog_scaling
...
allow CreateRoom to scale properly horizontally
2018-06-13 09:45:29 +01:00
22bec0d67d
allow CreateRoom to scale properly horizontally
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:13:32 +01:00
b477d1d976
Translated using Weblate (French)
...
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/fr/
2018-06-13 08:13:09 +00:00
18d542965d
Translated using Weblate (Bulgarian)
...
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/bg/
2018-06-13 05:20:08 +00:00
c1d375c3fd
Translated using Weblate (Basque)
...
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/eu/
2018-06-12 16:15:20 +00:00
175f1aa15c
don't set the displayname on registration as Synapse now does it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 16:43:54 +01:00
7a8fb27506
Merge remote-tracking branch 'origin/develop' into develop
2018-06-12 15:28:03 +00:00
6a382aa57c
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-12 15:28:03 +00:00
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
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
f073178a1f
Merge remote-tracking branch 'origin/develop' into develop
2018-06-12 13:27:26 +00:00
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
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
e858cf3bcb
Merge branch 'master' into develop
2018-06-12 14:26:29 +01:00
13d52065f5
Merge branch 'release-v0.12.7'
2018-06-12 14:23:48 +01:00
ef1f580abb
v0.12.7
2018-06-12 14:21:30 +01:00
0ad738d510
Prepare changelog for v0.12.7
2018-06-12 14:21:30 +01:00
334dccbdc7
Released js-sdk
2018-06-12 14:14:14 +01:00
6172196495
Merge remote-tracking branch 'origin/develop' into develop
2018-06-08 16:36:48 +00:00
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
13675b258d
Merge remote-tracking branch 'origin/develop' into develop
2018-06-08 15:48:46 +00:00
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
2f8814d1c5
Merge remote-tracking branch 'origin/develop' into develop
2018-06-08 15:46:39 +00:00
8dce276e5b
Merge pull request #1933 from turt2live/travis/pin-cosmetics
...
Pinned message cosmetic improvements
2018-06-08 16:46:33 +01:00
6c7b8f619b
Merge remote-tracking branch 'origin/develop' into develop
2018-06-08 15:41:18 +00:00
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
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
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
3983535536
Merge pull request #1916 from akihikodaki/sinon
...
Update sinon to 5.0.7
2018-06-08 16:41:11 +01:00
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
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
83f0459a7f
Merge branch 'develop' into travis/persist-pinned-open
2018-06-06 09:17:08 -06:00
4834816a06
v0.12.7-rc.1
2018-06-06 16:06:45 +01:00
c8bf743506
Prepare changelog for v0.12.7-rc.1
2018-06-06 16:06:44 +01:00
881e9a8070
js-sdk rc.1
2018-06-06 16:00:16 +01:00
0d9ba17677
Merge pull request #1944 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2018-06-06 15:52:54 +01:00
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
8b33c13517
Merge remote-tracking branch 'origin/develop' into develop
2018-06-06 09:08:58 +00:00
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
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
0ca7fb4abc
Merge remote-tracking branch 'origin/develop' into develop
2018-06-05 09:37:06 +00:00
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
21e4ee5901
Merge remote-tracking branch 'origin/develop' into develop
2018-06-04 15:40:03 +00:00
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
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
195d596c89
Translated using Weblate (Bulgarian)
...
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/bg/
2018-06-04 15:40:01 +00:00
Weblate