80c5a58fc3
Fix custom widget form styling
2017-06-19 12:06:16 +01:00
032650e095
Merge branch 'develop' into t3chguy/fix_forwarding
2017-06-19 01:53:35 +01:00
7b4cd31124
make forward_message be friendly with the RVS stuffs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-16 16:12:52 +01:00
aa7ddfe86e
Remove unused collapse_rhs
...
Remove all the places we pass collapse_rhs through to places it's
never used. Remove the commented RHS collapse button from
SimpleRoomHeader.
2017-06-16 15:47:40 +01:00
2a01e638b7
Make sure captcha disappears when container does
...
Should fix https://github.com/vector-im/riot-web/issues/4095
2017-06-16 10:25:51 +01:00
9ecf82a1f2
Show correct text in set email password dialog (2)
...
Fixes https://github.com/vector-im/riot-web/issues/4311
The cancel button onClick was hooked directly up to onFinished, so
the mouse event ended up as the boolean for whether an email had
been set.
2017-06-14 16:06:28 +01:00
449c65b784
Merge pull request #1095 from matrix-org/luke/fix-guest-password-success-and-email-set
...
Give password confirmation correct title, description
2017-06-14 15:16:36 +01:00
1d4a3ae5a3
Give password confirmation correct title, description
...
Fixes https://github.com/vector-im/riot-web/issues/4311
This was due to `BaseDialog` calling `onFinished` with a mouse event instead of `false` (and it was assumed to call with `true/false`, but doesn't)
2017-06-14 14:58:39 +01:00
57ef6f3cf8
Make enter submit change password form
...
Fixes https://github.com/vector-im/riot-web/issues/4302
2017-06-14 14:50:48 +01:00
edb11d805e
AppsDrawer: Open add app widget if opening empty drawer
...
This felt much better than having to also click the add app widget
button.
2017-06-14 15:05:29 +02:00
5f020423bc
AddAppDialog: Put the submit button inside the form
2017-06-14 15:05:11 +02:00
2d3c886646
AppsDrawer: Generate room alias for vrdemo
2017-06-14 13:27:15 +02:00
9c8ab2691b
AppsDrawer: Only append queryParams once
2017-06-14 13:26:43 +02:00
880e7149f3
ModularWidgets: Add a quick VR demo widget
2017-06-14 13:05:43 +02:00
57dfbc4701
Remove unused imports
2017-06-14 10:53:02 +01:00
0566e5d992
Merge pull request #1090 from matrix-org/luke/set-email-after-password-2
...
Ask for email address after setting password for the first time
2017-06-14 09:57:07 +01:00
4344af58ee
Ask for email address after setting password for the first time
...
So that the user can reset their password.
2017-06-14 09:31:16 +01:00
9dad5d0132
Merge pull request #1088 from matrix-org/t3chguy/fix_purple_e2e_room_settings
...
remove mx_filterFlipColor from verified e2e icon so its not purple :/
2017-06-13 17:45:56 +01:00
f4aadafed9
remove mx_filterFlipColor from verified e2e icon so its not purple :/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-13 17:42:30 +01:00
d67e7289e8
Merge branch 'develop' into rob/apps
2017-06-13 15:50:43 +02:00
03ba3bd431
Merge branch 'rxl881/apps' into rob/apps
2017-06-13 15:41:52 +02:00
91eabbba60
MessageComposer: Trigger Jitsi app from call buttons
2017-06-13 15:35:13 +02:00
5d898dd098
AuxPanel: Add type checking for userId and showApps properties
2017-06-13 15:34:05 +02:00
b63edcb390
AppTile: Support deletion of apps from room state
2017-06-13 15:33:17 +02:00
bcb2f8408b
AppTile: Fix typo in property name
2017-06-13 15:32:40 +02:00
2aa0aa61e3
AddAppDialog: Support adding apps to room state
2017-06-13 15:31:37 +02:00
a72cb794f2
AppsDrawer: Populate apps from room state
2017-06-13 15:28:37 +02:00
bd00c1d4b1
Merge pull request #1083 from matrix-org/t3chguy/width_height_int
...
width and height must be int otherwise synapse cries
2017-06-13 13:23:12 +01:00
ad7c835471
width and height must be int otherwise synapse cries
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-13 12:19:20 +01:00
876899948f
Merge in upstream changes
2017-06-13 11:44:23 +01:00
10ba5f8c3c
Only process user_directory response if it's for the current query
2017-06-13 11:03:22 +01:00
2da30137ec
Fix import path and add LG widget
2017-06-13 10:31:16 +01:00
1ce1984858
Fix regressions with starting a 1-1.
2017-06-13 10:15:29 +01:00
7b0565e9d1
Merge branch 'master' into develop
2017-06-12 15:53:04 +01:00
6133186583
fullstop fails
2017-06-12 15:36:24 +01:00
b893887707
Fix merge conflict
2017-06-12 14:52:41 +01:00
f9f924bbd6
Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps
2017-06-12 14:50:25 +01:00
cc74a09abd
Remove start_upgrade_registration dispatch handler
...
This dispatch is no longer raised anywhere, so we may as well get rid of the
code that it executes, as well as the state which is only set there.
2017-06-12 08:38:29 +01:00
e6d7eedbe6
Remove NeedToRegisterDialog
...
- since it's no longer used anywhere
2017-06-12 08:36:41 +01:00
3ddbf83c62
Add userid back
2017-06-11 07:13:50 +01:00
f940d2c100
Add reason for ban in room settings
2017-06-10 16:57:09 +01:00
3b7ce49eab
Merge pull request #1070 from matrix-org/t3chguy/dark_theme/e2e_icons
...
adds mx_filterFlipColor so that the dark theme will invert this image
2017-06-10 01:06:31 +01:00
34caf5586f
adds mx_filterFlipColor so that the dark theme will invert this image
...
making it more suitable for the said theme
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-10 00:08:40 +01:00
a4a0acc28d
fullstop fails
2017-06-09 22:19:14 +01:00
d6b85c9d4d
Fix translations on conf call banner
...
* You can't substitute react elements into a text string
* Substituting in undefined gives the string 'undefined', so
initialise it to the empty string.
2017-06-09 22:06:43 +01:00
9e0b476b72
Merge branch 'develop' into rob/apps
2017-06-09 12:06:44 +02:00
ce0977373e
Merge pull request #1058 from matrix-org/luke/fix-event-id-state
...
Control currently viewed event via RoomViewStore
2017-06-08 18:10:29 +01:00
df625b0d31
hit MemberInfo with Gemini to fix vector-im/riot-web#4223
2017-06-08 17:26:40 +01:00
f26aeef2bf
Merge pull request #1056 from matrix-org/kegan/translation-tamarin
...
Add remaining translations
2017-06-08 15:06:26 +01:00
9baaf5499f
Linting
2017-06-08 14:58:54 +01:00
Richard Lewis