Commit Graph

4307 Commits

Author SHA1 Message Date
Weblate
54afadf12c Merge remote-tracking branch 'origin/develop' into develop 2017-12-07 15:56:15 +00:00
Richard Lewis
b20667a5a8 Merge pull request #1655 from matrix-org/rxl881/cmc
Remove logging.
2017-12-07 15:56:10 +00:00
Richard Lewis
df438924a7 Remove logging. 2017-12-07 09:57:53 +00:00
Weblate
34774fed8f Merge remote-tracking branch 'origin/develop' into develop 2017-12-07 09:41:44 +00:00
Luke Barnard
4603d593de Merge pull request #1588 from pvagner/develop
Add some missing translatable strings
2017-12-07 09:41:39 +00:00
Weblate
c3d6ff1e3b Merge remote-tracking branch 'origin/develop' into develop 2017-12-06 22:54:43 +00:00
Richard Lewis
ed675fe791 Allow bypass of widget loading screen on hide / show. 2017-12-06 22:54:32 +00:00
Weblate
fe01539e17 Merge remote-tracking branch 'origin/develop' into develop 2017-12-06 16:44:52 +00:00
Richard Lewis
e20db416f2 Add field to bypass riot widget loading screen. 2017-12-06 16:44:41 +00:00
Peter Vágner
802abe7091 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 2017-12-06 11:07:01 +01:00
Weblate
bdf1fee64d Merge remote-tracking branch 'origin/develop' into develop 2017-12-05 12:03:02 +00:00
Richard Lewis
9eb334a1d4 Merge pull request #1640 from matrix-org/rxl881/widgetTitle
Add widget -> riot postMessage API
2017-12-05 12:02:57 +00:00
Richard Lewis
49a2985515 Register message endpoints.
Store endpoint origins only.
2017-12-05 00:08:17 +00:00
Weblate
ef1faff4b2 Merge remote-tracking branch 'origin/develop' into develop 2017-12-01 14:18:22 +00:00
Luke Barnard
641add4964 Fix one kind of scroll jump
by calling onWidgetLoad when the <img> in MImageBody loads
2017-12-01 14:18:13 +00:00
Weblate
b8d7881663 Merge remote-tracking branch 'origin/develop' into develop 2017-12-01 12:04:25 +00:00
Luke Barnard
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
Luke Barnard
363fe04a10 isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent 2017-12-01 10:44:00 +00:00
Luke Barnard
ddd0e161c0 Fix broken imports 2017-12-01 10:41:56 +00:00
Luke Barnard
fe81fcb8c6 Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
Weblate
cef6f8088e Merge remote-tracking branch 'origin/develop' into develop 2017-11-30 15:43:29 +00:00
Luke Barnard
eaaa9fe747 Don't show group when clicking tag panel 2017-11-30 15:35:40 +00:00
Richard Lewis
5ff5ca4705 Remove logging and broken title fetching functions. 2017-11-30 14:50:30 +00:00
Luke Barnard
3bcb3195c4 Implement shift-click and ctrl-click semantics for TP 2017-11-30 14:48:54 +00:00
Richard Lewis
2cfbbb000e Refactor messaging listerners. 2017-11-30 10:20:29 +00:00
Richard Lewis
4f5f44ff38 Add widget postmessage API stub. 2017-11-29 22:16:22 +00:00
Weblate
fb92be765c Merge remote-tracking branch 'origin/develop' into develop 2017-11-29 18:16:48 +00:00
Luke Barnard
f708250d44 Add feature flag for Tag Panel 2017-11-29 18:00:42 +00:00
Luke Barnard
ead30fae9d Use unmounted instead of mounted 2017-11-29 17:07:43 +00:00
Luke Barnard
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
Weblate
31680e6f27 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 16:01:43 +00:00
Luke Barnard
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
Weblate
172070b2ad Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 16:00:53 +00:00
David Baker
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
Luke Barnard
736b8045aa Remove evil auth cache 2017-11-28 15:54:00 +00:00
Luke Barnard
204bbebfca Only calculate displayed groups if flair enabled 2017-11-28 15:49:11 +00:00
Luke Barnard
b32e4a57bc Factor out _getDisplayeDGroups 2017-11-28 15:46:23 +00:00
Luke Barnard
b748c62880 Renames for clarification 2017-11-28 15:40:36 +00:00
Luke Barnard
1c71983610 Implement UI for using bulk device deletion API 2017-11-28 15:32:40 +00:00
Weblate
85e4634024 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 14:07:27 +00:00
Luke Barnard
55b5f2b249 Merge branch 'develop' into luke/allow-guest-view-group 2017-11-28 14:06:43 +00:00
Weblate
3ec3c1ac5b Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 14:02:02 +00:00
Luke Barnard
3addb924b1 Replace (IRC) with flair
If a user has public groups that are honoured in their flair, remove the (IRC) to give the appearance that the flair replaces it.
2017-11-28 13:50:05 +00:00
Luke Barnard
a8594a58e5 Allow guest to see MyGroups, show ILAG when creating a group 2017-11-28 13:32:46 +00:00
Luke Barnard
7ec4010881 Make GroupStore use MatrixClientPeg
To avoid weirdness with using a cached matrix client
2017-11-28 11:54:05 +00:00
Luke Barnard
1a3ad5a342 Allow guests to view individual groups
For homeservers that still disallow guests (running synapse without https://github.com/matrix-org/synapse/pull/2715), start ILAG.
2017-11-28 11:52:46 +00:00
Weblate
950c4c7433 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 11:02:50 +00:00
David Baker
bbaa46f773 Merge pull request #1634 from matrix-org/luke/move-group-flair-toggle-to-user-settings
Move group publication toggles to UserSettings
2017-11-28 11:02:45 +00:00
Luke Barnard
d4f5e7e6d7 Deal with errors, lack of groups, loading 2017-11-28 10:46:20 +00:00
Weblate
a8ede7f241 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 10:29:55 +00:00