614bd703cc
Merge remote-tracking branch 'origin/develop' into develop
2017-12-08 18:18:49 +00:00
f2d68e4601
Merge pull request #1649 from matrix-org/rxl881/titleBar
...
Add maximize / minimize apps drawer icons.
2017-12-08 19:18:45 +01:00
9e76ec6203
Merge remote-tracking branch 'origin/develop' into develop
2017-12-08 16:52:10 +00:00
bb9376098a
Merge pull request #1654 from matrix-org/dbkr/crypto_store_migrate_warning
...
Warn when migrating e2e data to indexeddb
2017-12-08 16:52:05 +00:00
07cd3d8b2e
Merge remote-tracking branch 'origin/develop' into develop
2017-12-08 16:33:30 +00:00
0d38e7510d
Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show
...
Don't Auto-show UnknownDeviceDialog
2017-12-08 16:33:25 +00:00
54afadf12c
Merge remote-tracking branch 'origin/develop' into develop
2017-12-07 15:56:15 +00:00
b20667a5a8
Merge pull request #1655 from matrix-org/rxl881/cmc
...
Remove logging.
2017-12-07 15:56:10 +00:00
df438924a7
Remove logging.
2017-12-07 09:57:53 +00:00
34774fed8f
Merge remote-tracking branch 'origin/develop' into develop
2017-12-07 09:41:44 +00:00
4603d593de
Merge pull request #1588 from pvagner/develop
...
Add some missing translatable strings
2017-12-07 09:41:39 +00:00
c3d6ff1e3b
Merge remote-tracking branch 'origin/develop' into develop
2017-12-06 22:54:43 +00:00
ed675fe791
Allow bypass of widget loading screen on hide / show.
2017-12-06 22:54:32 +00:00
2a01985076
better proptypes
2017-12-06 19:07:12 +00:00
0deed4bb88
null guard
2017-12-06 19:05:25 +00:00
1a3671d241
remove stray param
2017-12-06 19:04:29 +00:00
5bca5a7a8e
More underscore
2017-12-06 19:02:26 +00:00
aa99b898ce
Add that it might not work now either
...
also a comma
2017-12-06 18:57:48 +00:00
fe01539e17
Merge remote-tracking branch 'origin/develop' into develop
2017-12-06 16:44:52 +00:00
e20db416f2
Add field to bypass riot widget loading screen.
2017-12-06 16:44:41 +00:00
4462694438
lint
2017-12-06 16:06:33 +00:00
65c210cdde
Warn when migrating e2e data to indexeddb
2017-12-06 15:28:20 +00:00
802abe7091
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
2017-12-06 11:07:01 +01:00
9fd8deb16d
Add maximize / minimize apps drawer icons.
2017-12-05 18:18:51 +00:00
bdf1fee64d
Merge remote-tracking branch 'origin/develop' into develop
2017-12-05 12:03:02 +00:00
9eb334a1d4
Merge pull request #1640 from matrix-org/rxl881/widgetTitle
...
Add widget -> riot postMessage API
2017-12-05 12:02:57 +00:00
49a2985515
Register message endpoints.
...
Store endpoint origins only.
2017-12-05 00:08:17 +00:00
ef1faff4b2
Merge remote-tracking branch 'origin/develop' into develop
2017-12-01 14:18:22 +00:00
641add4964
Fix one kind of scroll jump
...
by calling onWidgetLoad when the <img> in MImageBody loads
2017-12-01 14:18:13 +00:00
b8d7881663
Merge remote-tracking branch 'origin/develop' into develop
2017-12-01 12:04:25 +00:00
b26cf23574
Merge pull request #1641 from matrix-org/luke/tag-panel-shift-click-semantics
...
Implement shift-click and ctrl-click semantics for TP
2017-12-01 12:04:21 +00:00
363fe04a10
isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent
2017-12-01 10:44:00 +00:00
ddd0e161c0
Fix broken imports
2017-12-01 10:41:56 +00:00
fe81fcb8c6
Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
...
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
cef6f8088e
Merge remote-tracking branch 'origin/develop' into develop
2017-11-30 15:43:29 +00:00
eaaa9fe747
Don't show group when clicking tag panel
2017-11-30 15:35:40 +00:00
5ff5ca4705
Remove logging and broken title fetching functions.
2017-11-30 14:50:30 +00:00
3bcb3195c4
Implement shift-click and ctrl-click semantics for TP
2017-11-30 14:48:54 +00:00
2cfbbb000e
Refactor messaging listerners.
2017-11-30 10:20:29 +00:00
4f5f44ff38
Add widget postmessage API stub.
2017-11-29 22:16:22 +00:00
fb92be765c
Merge remote-tracking branch 'origin/develop' into develop
2017-11-29 18:16:48 +00:00
f708250d44
Add feature flag for Tag Panel
2017-11-29 18:00:42 +00:00
ead30fae9d
Use unmounted instead of mounted
2017-11-29 17:07:43 +00:00
45bcb6f2ed
Implement TagPanel (or LeftLeftPanel) for group filtering
...
This allows for filtering of the RoomList by group. When a group is selected, the room list will show:
- Rooms in the group
- Direct messages with members in the group
A button at the bottom of the TagPanel allows for creating new groups, which will appear in the panel following creation.
2017-11-29 16:53:43 +00:00
31680e6f27
Merge remote-tracking branch 'origin/develop' into develop
2017-11-28 16:01:43 +00:00
ff25c2f329
Merge pull request #1638 from matrix-org/luke/feature-bulk-device-deletion
...
Implement UI for using bulk device deletion API
2017-11-28 16:01:39 +00:00
172070b2ad
Merge remote-tracking branch 'origin/develop' into develop
2017-11-28 16:00:53 +00:00
a5acc2cfc2
Merge pull request #1637 from matrix-org/luke/replace-IRC-with-flair
...
Replace (IRC) with flair
2017-11-28 16:00:47 +00:00
736b8045aa
Remove evil auth cache
2017-11-28 15:54:00 +00:00
204bbebfca
Only calculate displayed groups if flair enabled
2017-11-28 15:49:11 +00:00
Weblate