Commit Graph

4785 Commits

Author SHA1 Message Date
Travis Ralston
078ee54edf Move the PinnedEventsPanel to the react-sdk
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 13:15:21 -06:00
Travis Ralston
2d5acfc0bc Filter pinned events before rendering
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:30:52 -06:00
Travis Ralston
b0190f6a65 i18n for remaining strings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:22:06 -06:00
Travis Ralston
0a3bc1c667 Don't try to show redacted messages
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:21:44 -06:00
Travis Ralston
aff02885de Don't fail if an event doesn't belong to a room.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:21:21 -06:00
Travis Ralston
965a25ba84 Fix bug where rooms missing m.room.pinned_events could not pin messages
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:08:22 -06:00
Travis Ralston
f7389b70aa Hide the pin option in the context menu if the user can't pin messages
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:01:17 -06:00
Travis Ralston
efdb4b02c6 i18n for 'Jump to message' button
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:55:52 -06:00
Travis Ralston
59a253af37 Don't show the unpin button if the user can't unpin the message.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:53:44 -06:00
Travis Ralston
9b11f576fe Add action bar to pinned event tiles; support unpinning from the panel
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:42:58 -06:00
Travis Ralston
fa5a23e0df Permalink pins to their original events
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:42:58 -06:00
Travis Ralston
5daa16ab53 Add panel for pinned messages.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:42:58 -06:00
Travis Ralston
774c3dbd38 Pin/unpin message option in a message's context menu
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:42:58 -06:00
Luke Barnard
f35289a664 Merge pull request #5140 from vector-im/luke/groups-room-icons
Create basic icon for the GroupRoomList tab and adding rooms to groups
2017-09-29 17:23:02 +01:00
Luke Barnard
d3b8d8bf9d Create basic icon for the GroupRoomList tab and adding rooms to groups 2017-09-29 17:03:58 +01:00
Luke Barnard
5544270bc4 Merge pull request #5131 from vector-im/luke/groups-button
Add button to get to MyGroups
2017-09-29 11:00:29 +01:00
Luke Barnard
47919bc291 Honour the Groups feature flag 2017-09-29 10:39:49 +01:00
Luke Barnard
bb64e9a18b Merge pull request #5137 from vector-im/luke/fix-header-button-key-prop-warning
Remove `key` prop pass-thru on HeaderButton
2017-09-28 11:26:54 +01:00
Luke Barnard
f9a92ad15a Lint 2017-09-28 10:02:16 +01:00
Luke Barnard
ce13837216 Remove key prop pass-thru on HeaderButton
This is redundant and throws a warning
2017-09-28 09:46:10 +01:00
Luke Barnard
9c86a655ca Add button to get to MyGroups 2017-09-27 17:46:53 +01:00
Luke Barnard
1740319b7a Add margin to flair avatars to separate them 2017-09-27 14:15:21 +01:00
Luke Barnard
2adf08dee0 CSS for GroupView: align "save"/"cancel" buttons in settings 2017-09-27 10:31:35 +01:00
David Baker
f64f293cdb Merge pull request #5125 from vector-im/luke/groups-add-rooms
Implement "Add room to group" feature
2017-09-26 18:15:54 +01:00
Luke Barnard
888e3abc75 Implement "Add room to group" feature
This step needs to be taken before adding a room to a group summary
2017-09-26 14:35:38 +01:00
David Baker
94855c0f48 Merge pull request #4967 from vector-im/rob/electron-screensharing
Add Jitsi screensharing support in electron app
2017-09-25 17:00:00 +01:00
David Baker
798558e5cc Merge pull request #5117 from vector-im/luke/refactor-right-panel-header-buttons
Refactor right panel header buttons
2017-09-25 16:37:44 +01:00
Robert Swain
f79b8e0c71 ElectronPlatform: Import desktopCapturer explicitly 2017-09-25 17:19:04 +02:00
Robert Swain
44c0fb77da Merge branch 'develop' into rob/electron-screensharing 2017-09-25 17:16:21 +02:00
Luke Barnard
bfdb92ff6b Nit: Re-order property 2017-09-25 16:13:54 +01:00
Luke Barnard
77f30aacf9 Re-add clickPhase for FilePanel header button 2017-09-25 16:13:13 +01:00
Luke Barnard
fd7e81193e Less coupling between HeaderButton and RightPanel
Use isHighlighted as a prop instead of computing based on phases and currentPhase
2017-09-25 16:06:46 +01:00
Luke Barnard
75fef3f21a Merge pull request #5104 from vector-im/dbkr/publicity_toggle
CSS for publicity status & toggle button
2017-09-25 14:53:23 +01:00
Luke Barnard
28e9fdc873 rebase in progress; onto 7137ba71 2017-09-25 14:42:44 +01:00
Luke Barnard
7137ba7188 Refactor right panel header buttons
To reduce repetition of code, simplify the process of adding header buttons and remove the need for many handler functions.
2017-09-25 14:13:02 +01:00
David Baker
813615610f CSS for publicity status & toggle button 2017-09-22 19:27:36 +01:00
Luke Barnard
ae6b705d7b Merge pull request #5103 from vector-im/luke/groups-remove-featured-rooms-and-users
CSS for "X" in top right of features users/rooms
2017-09-22 16:32:46 +01:00
Luke Barnard
1b67e7d606 CSS for "X" in top right of features users/rooms 2017-09-22 15:58:36 +01:00
David Baker
39c7bf633d Merge pull request #5051 from vector-im/dbkr/add_finnish
Include Finnish translation
2017-09-22 10:19:50 +01:00
David Baker
133e17c1db Merge remote-tracking branch 'origin/develop' into dbkr/add_finnish 2017-09-22 09:50:56 +01:00
David Baker
ef503cca11 Merge branch 'master' into develop 2017-09-21 21:56:58 +01:00
David Baker
2b7ee756f8 v0.12.6 2017-09-21 21:53:09 +01:00
David Baker
b25075974c Prepare changelog for v0.12.6 2017-09-21 21:53:09 +01:00
David Baker
af3feccc2d v0.12.6 2017-09-21 21:50:48 +01:00
David Baker
aaff9133c7 Newer js-sdk & react-sdk for js-sdk build fix 2017-09-21 21:49:43 +01:00
David Baker
50e6536195 Merge branch 'master' into develop 2017-09-21 18:11:46 +01:00
David Baker
fbccf22e00 v0.12.5 2017-09-21 18:08:17 +01:00
David Baker
e8c347a755 Prepare changelog for v0.12.5 2017-09-21 18:08:17 +01:00
David Baker
dbd4cf8756 Clean on prepublish (#5097)
Otherwise you can make broken releases on case insensitive file
systems
2017-09-21 18:06:41 +01:00
David Baker
f450ce422e v0.12.5 2017-09-21 18:06:03 +01:00