2e00968bcd
AppPermission: Note that apps are not E2E encrypted in E2E rooms
2017-08-18 17:44:33 +02:00
1c36e47403
Fix add widget link
2017-08-18 15:59:12 +01:00
b7d46d91ed
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-18 15:35:01 +01:00
bf07333915
Merge pull request #1316 from matrix-org/luke/fix-app-name-case
...
Don't apply case logic to app names
2017-08-18 15:08:40 +01:00
5e0a7212d9
Don't apply case logic to app names
...
As they should have the Correct Case in integrations land now
2017-08-18 14:57:28 +01:00
36fffa1696
Stop integ manager opening on every room switch
...
This was caused by a broken assumption which was AppsDrawer component mounting === clicking on apps draw toggle.
This was introduced in matrix-org/matrix-react-sdk#1312 .
Known issue with this fix: deleting the last app doesn't hide the app drawer.
2017-08-18 14:48:58 +01:00
857a8c9519
Remove empty defaultProps.
2017-08-18 13:28:47 +01:00
3a7aa926c3
Merge pull request #1313 from matrix-org/luke/feature-app-tile-ux
...
Add behaviour to toggle app draw on app tile header click
2017-08-18 13:08:57 +01:00
caff761df7
Merge pull request #1308 from matrix-org/t3chguy/mels_fix
...
Change OOO so that MELS generation will continue over hidden events
2017-08-18 13:08:35 +01:00
84f5e5aad2
REmove unused onCancelClick
2017-08-18 12:21:48 +01:00
1a1a80b633
Merge branch 'develop' into luke/feature-app-tile-ux
2017-08-18 12:12:00 +01:00
cab3123bd8
Merge pull request #1312 from matrix-org/luke/feature-widget-timeline-events
...
Implement TextualEvent tiles for im.vector.modular.widgets
2017-08-18 12:10:22 +01:00
615d96a065
catch hidden event being RM
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-08-18 11:53:52 +01:00
96900e76a0
Move error logging to where it is first caught.
2017-08-18 11:51:32 +01:00
4b5cdac032
Don't show widget security warning to the person who added it to the room.
2017-08-18 11:41:27 +01:00
57505c3a61
Add behaviour to toggle app draw on app tile header click
2017-08-18 10:56:35 +01:00
9382689675
Merge branch 'develop' into luke/feature-widget-timeline-events
2017-08-18 10:47:25 +01:00
acc54b97f1
Implement TextualEvent tiles for im.vector.modular.widgets
...
E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget"
The name is calculated by taking the `name` in the event content, falling back on the `type`, falling back on the previous content `type`. This is then capitalised.
2017-08-18 10:35:33 +01:00
bb0845954d
improve wording for directory listings
2017-08-17 19:10:45 +01:00
7c04a6671d
expand auxPanel when showing apps
2017-08-17 19:06:19 +01:00
120a4f4f44
Check for valid roomId before renering manageIntegsButton.
2017-08-17 18:10:50 +01:00
0907fff080
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-17 17:47:46 +01:00
91fe308f06
Merge pull request #1310 from matrix-org/t3chguy/hotfix1
...
hotfix bad fn signature regression
2017-08-17 17:31:55 +01:00
766c188a1e
hotfix bad fn signature regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-08-17 17:15:18 +01:00
02edadbd15
Don't bubble cancel click to room header.
2017-08-17 12:21:44 +01:00
d1ee257b5a
Pass roomId rather than whole room object.
2017-08-17 12:15:01 +01:00
eb77dcc8e3
Camel case variable name
2017-08-17 11:24:25 +01:00
2c25639a61
Fix copyright header
2017-08-17 11:22:42 +01:00
9111cb421e
Merge pull request #1291 from matrix-org/rxl881/maxWidgets
...
Show a dialog if the maximum number of widgets allowed has been reached.
2017-08-17 10:03:42 +01:00
59815359f8
Add misiing _tJsx import
2017-08-16 23:55:43 +02:00
fceccfc503
Add missing Robot string to translation
2017-08-16 23:54:36 +02:00
252ab208e4
Merge pull request #1300 from matrix-org/dbkr/userpicker
...
Refactor ChatInviteDialog to be UserPickerDialog
2017-08-16 14:29:07 +01:00
14903274c0
Change OOO so that MELS generation will continue over hidden events
...
this fixes the scenario of N Member events, then an invisible event
e.g. (m.room.aliases) then more Member events. Pre hide-join-parts
this is how it worked.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-08-16 13:20:32 +01:00
81273ec855
Move non-invite specific stuff to UserAddress
2017-08-15 13:42:23 +01:00
bbcf7e1d9b
s/inviteList/userList/
2017-08-15 13:30:13 +01:00
fa660c8211
PR feedback
2017-08-15 10:57:24 +01:00
004cc42cfc
Merge pull request #1298 from matrix-org/luke/store-history-as-raw-content
...
Store history as raw content
2017-08-15 09:18:22 +01:00
6baca05968
Merge pull request #1297 from matrix-org/luke/fix-user-pill-onclick
...
Add onClick to user pills
2017-08-15 09:15:50 +01:00
b7b449434d
Lint
2017-08-15 09:10:13 +01:00
1b66e88b6e
ChatInviteDialog -> UserPickerDialog pt 2
...
The other changes I forgot to add
2017-08-14 17:43:00 +01:00
447aa1e5a0
Refactor ChatInviteDialog to be UserPickerDialog
...
Now it's just a means of choosing users and all the actual inviting
functionality is moved out to Invite.js. This will allow us to
reuse it for inviting to groups.
Adds the ability to restrict what types of addresses may be chosen,
although this isn;t used yet, it will be necessary for groups
because groups don't support 3pid invites.
2017-08-14 17:38:59 +01:00
6b1b643d41
Merge branch 'develop' into luke/store-history-as-raw-content
2017-08-14 16:42:22 +01:00
7d10a7556b
Merge pull request #1295 from matrix-org/luke/fix-emoji-picker-gone
...
preventDefault when moving autocomplete selection with vertical arrow
2017-08-14 16:37:32 +01:00
5eff2a3df2
Merge branch 'develop' into luke/fix-user-pill-onclick
2017-08-14 16:32:01 +01:00
e48c4911b8
Merge pull request #1294 from matrix-org/revert-1290-luke/fix-user-url-no-middle-panel
...
Revert "At /user, view member of current room"
2017-08-14 16:31:24 +01:00
0079e70006
Display RM when it = a standalone member event
...
Standalone = not next to any member events in the timeline.
fixes vector-im/riot-web#4694
2017-08-14 15:40:49 +01:00
9742962d61
preventDefault when moving autocomplete selection with vertical arrow
...
Otherwise the composer selection updates, in turn hiding the autocomplete box - fixes vector-im/riot-web#4790
2017-08-14 15:16:13 +01:00
bb229d33a4
Add onClick to user pills
...
instead of using the converted matrix.to href. This is undesirable and a better solution would be to fix routing in Riot in general and then change user pills to do something like `/room/../member/@userId`.
2017-08-14 14:44:08 +01:00
2844b574d5
Re-add useful comment
2017-08-14 14:41:03 +01:00
b59de7964c
Wait for first sync before dispatching view_user on /user
...
the RightPanel will be mounted once we're done doing the first sync, so wait until then and then dispatch a view_user. This is not very nice but it's what we do for view_room.
2017-08-14 14:37:49 +01:00
Robert Swain