Luke Barnard
ca0d8e425e
Merge branch 'develop' of github.com:vector-im/riot-web into develop
2017-10-11 16:00:34 +01:00
Luke Barnard
ae1a5a50b0
Move inline CSS for flair
...
Also, move vertical align from mx_Flair to img otherwise the SenderProfile has increased height when Flair is present, causing bug with scroll position
2017-10-11 16:00:26 +01:00
Luke Barnard
e405d6cbd6
Merge pull request #5167 from vector-im/t3chguy/quickfix
...
Remove trailing comma in JSON
2017-10-11 16:40:29 +02:00
Luke Barnard
508ff4f917
Merge pull request #3849 from psaavedra/set_default_federate_by_settings
...
Added default_federate property
2017-10-11 16:28:25 +02:00
David Baker
83f7af5d7e
Merge pull request #5197 from vector-im/dbkr/say_which_homeserver
...
CSS for greying out login form
2017-10-11 14:12:20 +01:00
David Baker
27a81c25d2
CSS for greying out login form
2017-10-11 14:06:12 +01:00
David Baker
e39730d52e
Say which translation file failed ( #5196 )
...
So we can see which i18n file is invalid when it fails
2017-10-11 09:56:38 +01:00
David Baker
20d2a6685f
Remove spurious comma
2017-10-10 18:28:15 +01:00
Michael Telatynski
a5e41102bc
Remove trailing comma in JSON
2017-10-04 23:42:27 +01:00
Michael Telatynski
85a590ad5a
Remove trailing comma in JSON
2017-10-04 23:41:54 +01:00
Michael Telatynski
bf6a3470b4
Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings
2017-10-04 22:35:58 +01:00
Luke Barnard
3d7b1cb382
Merge pull request #5164 from vector-im/luke/fix-no-roomlist-placeholders
...
Fix bug that made sub list placeholders not show for ILAG etc.
2017-10-04 16:13:45 +01:00
Luke Barnard
70bbf2df7a
Fix bug that made sub list placeholders not show for ILAG etc.
2017-10-04 15:58:40 +01:00
Luke Barnard
56c366ebd3
Merge pull request #5161 from vector-im/luke/refactor-editable-list-from-alias-settings
...
Factor out EditableItemList component from AliasSettings
2017-10-04 10:56:21 +01:00
Luke Barnard
a9d308004e
Factor out EditableItemList component from AliasSettings
2017-10-04 10:30:09 +01:00
Luke Barnard
ec414147d1
Merge pull request #5110 from pafcu/mark-and-remove-translations
...
Mark and remove some translations
2017-10-04 10:24:36 +01:00
pafcu
9680bcb117
Implement reviewer suggestions
2017-10-03 18:22:58 +02:00
Luke Barnard
d082e44d94
Merge pull request #5141 from vector-im/luke/groups-remove-room
...
CSS for "remove" button on GroupRoomTile
2017-10-03 11:45:07 +01:00
Luke Barnard
195395e7ee
Adjust CSS for groupRoomTile and add QuestionDialog right padding
...
(The confirmation dialog for removing a room needed padding)
2017-10-03 11:14:43 +01:00
Luke Barnard
014464d82b
CSS for "remove" button on GroupRoomTile
2017-09-29 17:58:42 +01: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
Stefan Parviainen
25cf115533
Update docs with _td() and some other recommendations
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-27 22:01:56 +02: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
Stefan Parviainen
b424eea573
Remove unnecessary strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-23 17:02:26 +02:00
Stefan Parviainen
3cff8c1230
Mark some strings as translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-23 13:46:51 +02: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
