Matthew Hodgson
ffb1584e10
horizontally scale images properly
2016-02-18 18:59:45 +00:00
Matthew Hodgson
dbf3439e35
fix statusbar layout some more
2016-02-18 18:13:23 +00:00
Matthew Hodgson
11ac6defed
tint searchbar
2016-02-18 17:32:15 +00:00
Matthew Hodgson
27222a54c7
somewhat cryptic hack to make empty RoomStatusBars not take up 41px rather than 36px of height
2016-02-17 18:54:46 +00:00
Matthew Hodgson
3263076ea6
Merge branch 'develop' into rav/update_status_bar
2016-02-17 18:37:40 +00:00
Matthew Hodgson
3c659dcf57
experimental fix for https://github.com/vector-im/vector-web/issues/947 and https://github.com/vector-im/vector-web/issues/946 . may well introduce more problems
2016-02-17 12:43:42 +00:00
Matthew Hodgson
2cd3150c56
tart up mx_EventTile_selected
2016-02-15 20:22:45 +00:00
Matthew Hodgson
cdc1447804
fix search highlight css
2016-02-15 20:19:30 +00:00
Matthew Hodgson
11c9aff69a
fix radiobutton css
2016-02-15 22:06:16 +02:00
Matthew Hodgson
58959d014a
show vaguely accurate default avatar
2016-02-15 22:01:30 +02:00
Richard van der Hoff
1a9125a886
Fix horizontal alignment of top unread-messages bar
2016-02-15 18:10:11 +00:00
Matthew Hodgson
8e008572e5
CSS for setting display name prompt
2016-02-15 19:37:19 +02:00
Richard van der Hoff
18c6aa38e4
Styling and imgs to support new read_marker semantics
...
Support for adding a new 'Scroll up' bar in react-sdk
2016-02-15 17:22:55 +00:00
Matthew Hodgson
177fba360d
shrink 3pid invite placeholder text
2016-02-15 11:13:24 +02:00
Matthew Hodgson
ad9935739c
proper fix for https://github.com/vector-im/vector-web/issues/917 and resolve https://github.com/vector-im/vector-web/issues/928
2016-02-15 09:56:52 +02:00
Matthew Hodgson
a2193d61b0
show the leave button by default for now as it causes too much pain otherwise
2016-02-14 21:34:32 +02:00
Matthew Hodgson
0ca6efdfca
fix the nightmarish https://github.com/vector-im/vector-web/issues/917
2016-02-14 21:28:01 +02:00
Matthew Hodgson
f3df0d07f8
filter room directory case insensitively
2016-02-14 13:32:15 +02:00
Matthew Hodgson
155728b136
make babel actually do full ES6 emulation for Safari 8
2016-02-10 14:54:55 +00:00
David Baker
1732805f31
Always parse the hash of a URL as we do elsewhere by looking for a query string part, otherwise we end up passing the query into showscreen which then spreads havok.
2016-02-10 13:45:24 +00:00
Richard van der Hoff
bab9de1899
CSS fixes to match matrix-org/matrix-react-sdk#30b4b91.
...
This mostly works, but there is some weirdness with the status bar being too
high by default, and getting smaller when it has content in it.
2016-02-09 14:44:59 +00:00
Kegan Dougal
27791c06ee
Cache-bust on /version request
2016-02-05 15:53:33 +00:00
David Baker
485343864c
semicolon
2016-02-05 10:57:49 +00:00
David Baker
f035b8c50e
Rate limit UI updates to avoid browser death
2016-02-04 18:09:24 +00:00
David Baker
15fec7f27c
Merge pull request #862 from vector-im/dbkr/style_dialog_submit_button
...
Style submit input controls in dialogs the way we style buttons.
2016-02-04 15:07:44 +00:00
David Baker
c0c7ae1596
Style submit input controls in dialogs the way we style buttons.
2016-02-04 11:50:29 +00:00
Kegsay
6c5a00162c
Merge pull request #856 from vector-im/kegan/version-stamp
...
Add a version update checker and NewVersionBar to show on the UI.
2016-02-03 17:09:24 +00:00
Kegan Dougal
b307a6d64e
Invoke onVersion when we know the current version even if there is no new version (for settings)
2016-02-03 16:50:05 +00:00
Kegan Dougal
4628cf82a7
Split out response text to its own var to prevent trim() messing up comparisons
2016-02-03 16:23:17 +00:00
Kegan Dougal
5eed734325
Add a version update checker and NewVersionBar to show on the UI.
2016-02-03 16:16:14 +00:00
David Baker
d132c75263
Remove the autoPeek stuff and always either peek or show the join prompt bar
2016-02-02 15:51:23 +00:00
David Baker
d1dc082489
Remove empty if block
2016-02-01 18:02:52 +00:00
Richard van der Hoff
f94272c539
Add some crude CSS for highlighting the selected event
...
(To be useful, this needs functionality which hasn't yet landed in react-sdk).
2016-01-30 00:43:47 +00:00
David Baker
3b18b9b54b
Fix connection lost bar CSS
2016-01-29 10:07:22 +00:00
David Baker
6a36b022e4
New style guest warning bar
2016-01-28 13:00:44 +00:00
David Baker
35600f11ad
CSS that changes the connection lost bar into a more general 'warning bar' so we can use it for a guest access warning
2016-01-28 09:19:28 +00:00
Matthew Hodgson
75886c4143
make badges scale with size of RoomTile
2016-01-24 14:50:24 -05:00
Matthew Hodgson
cd853ab5b4
try for a simpler invite placeholder look & feel
2016-01-24 19:02:49 +00:00
Matthew Hodgson
292af1e59c
improve settings layout and fix FF bugs
2016-01-24 18:14:52 +00:00
Matthew Hodgson
d3bc0feb83
fix ugly wrapping bug
2016-01-24 17:54:01 +00:00
Matthew Hodgson
19bfd829d0
add scrollToBottomBar and fix spacing for status bars in general
2016-01-24 01:52:21 +00:00
Matthew Hodgson
759b318bb5
fix safari
2016-01-23 01:24:04 +00:00
Matthew Hodgson
dd19d2aaee
red bar for highlights even if there's a unreadNotify too
2016-01-22 18:04:54 +00:00
Matthew Hodgson
e0ecde6760
put a black badge on unread notifications, and a red one for unread highlights
2016-01-22 17:23:04 +00:00
Matthew Hodgson
5e21059144
Merge pull request #729 from vector-im/matthew/truncateroomlist
...
truncate room list
2016-01-22 16:09:28 +00:00
Matthew Hodgson
0a32874b39
oops, reset truncate state on hide, not collapse
2016-01-22 16:09:06 +00:00
Kegan Dougal
302c63058b
Invoke onShowMoreRooms to allow parents to kick their scrollbars..
2016-01-22 15:46:58 +00:00
Matthew Hodgson
0ee1892a0b
truncate room list
2016-01-22 15:31:42 +00:00
David Baker
e11ae99a9f
Add vector rules with the appropriate kind, otherwise the room_message rule takes precedence over content / display name rules etc and prevents bings.
2016-01-22 14:12:29 +00:00
manuroe
ce45f0b1e6
Push settings: Use a dont_notify rule when 1:1 or group chat rooms are set to OFF
2016-01-22 09:30:31 +01:00
Matthew Hodgson
a76167d175
correct layout for truncated lists
2016-01-21 17:38:46 +00:00
manuroe
f3064a2994
Put back removing of "When people join or leave a room" settings push rule
2016-01-21 16:37:17 +01:00
manuroe
029cf754ee
Added notif settings for "Messages sent by bot" ( https://github.com/vector-im/vector-web/issues/692 )
...
In order to do that, the rules definitions have been update to support "dont_notify" hs default push rules
2016-01-21 16:16:44 +01:00
David Baker
1a248c8e5c
Merge pull request #710 from vector-im/unread_sync
...
Use read receipts to calculate unread room status
2016-01-21 13:29:49 +00:00
David Baker
b913e72735
Remove member event rule as per SYN-607
2016-01-21 12:01:28 +00:00
David Baker
4d4c6e06ec
Merge remote-tracking branch 'origin/develop' into unread_sync
2016-01-21 10:39:35 +00:00
David Baker
2d917910da
Merge pull request #556 from vector-im/notif_sync
...
Use unread count for room highlight state
2016-01-21 10:31:46 +00:00
David Baker
a08d00c672
Apply patch to the right branch: update for new count format
2016-01-21 10:20:45 +00:00
Matthew Hodgson
bd75234a2f
make CSS work on FF
2016-01-21 00:39:26 +00:00
Matthew Hodgson
6573ba8c20
fix up Start Chat behaviour as per Amandine's feedback
2016-01-21 00:16:26 +00:00
Matthew Hodgson
f4a2b6ab7e
Merge pull request #697 from vector-im/matthew/roompreview
...
Lots of CSS bugfixes and polishing
2016-01-20 22:32:08 +00:00
Matthew Hodgson
6117e09a3f
implement the correct design for memberlist
2016-01-20 22:04:32 +00:00
Matthew Hodgson
1fd60f1e44
revert read marker css
2016-01-20 17:23:33 +00:00
David Baker
ac2e69ba28
Use new unread count methods
2016-01-20 17:20:19 +00:00
Matthew Hodgson
48052415b7
usersettings button layout
2016-01-20 17:09:53 +00:00
Matthew Hodgson
e87e22a438
rhsbutton
2016-01-20 17:06:13 +00:00
Matthew Hodgson
5b2f921190
Fix bold avatar letters
2016-01-20 17:01:19 +00:00
Matthew Hodgson
b830f43371
remove RoomAvatar; stale border-radius; fix aliases table
2016-01-20 16:59:53 +00:00
Matthew Hodgson
6332e3908e
roomsettings css fixes
2016-01-20 16:39:14 +00:00
Matthew Hodgson
82742f9f13
oops, fix tinted read up to marker correctly
2016-01-20 16:06:35 +00:00
manuroe
888fde0f53
Fixed call push notifications settings that always stayed OFF
2016-01-20 17:01:09 +01:00
David Baker
eb62456007
Update for new unread count format
2016-01-20 15:58:21 +00:00
Matthew Hodgson
60d2d45255
readd in the .mx_EntityTile_power class. don't understand why it was killed :'(
2016-01-20 15:39:42 +00:00
Matthew Hodgson
6ecdb02e81
sanitize avatar border radii
2016-01-20 15:26:48 +00:00
Matthew Hodgson
4d3918109a
skin new invite UI CSS
2016-01-20 14:58:27 +00:00
Matthew Hodgson
9a9db53e0a
fix tinting of read marker again
2016-01-20 14:58:17 +00:00
Matthew Hodgson
3e8c6a42d3
roomsettings layout tweaks
2016-01-18 19:58:02 +00:00
Matthew Hodgson
3b8e5073b5
improve layout
2016-01-18 19:57:32 +00:00
Matthew Hodgson
a775086e81
wording from amandine
2016-01-18 19:57:17 +00:00
Matthew Hodgson
d5c291ae62
Merge branch 'kegan/invite-search' into matthew/roompreview
2016-01-18 18:00:58 +00:00
Matthew Hodgson
d6f6f32c74
WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now
2016-01-18 17:37:13 +00:00
Kegan Dougal
317e1fb9cd
Merge branch 'develop' into kegan/invite-search
2016-01-18 17:33:26 +00:00
manuroe
6182c983ab
PushRules settings: Applied review remarks (2/2)
2016-01-18 18:24:53 +01:00
Kegan Dougal
ac4b221690
More CSS fun for border bottom
2016-01-18 17:22:02 +00:00
manuroe
fdf5b0a4fc
Merge branch 'develop' into push-rules-settings
...
# Conflicts:
# src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
2016-01-18 18:14:20 +01:00
manuroe
7c0fffa79b
PushRules settings: Applied easy review remarks
2016-01-18 18:07:33 +01:00
Kegan Dougal
fef02f2fd1
s/MemberTile/EntityTile/
2016-01-18 16:43:00 +00:00
manuroe
bdcf683942
PushRules settings: Create a dedicated rule for "Messages sent to group".
...
The default fallback rule cannot be used because it matches with too much events.
2016-01-18 16:41:48 +01:00
manuroe
ae14210763
PushRules settings: Put keywords in the right position
2016-01-18 16:31:18 +01:00
manuroe
830160f074
PushRules settings: Enabled all radio buttons of the table.
...
Each rule is described in the code so that if the server does not have it in its default rules or if the user wants to use actions different from the hs one, the code will create a new rule that will override the hs one.
2016-01-18 16:24:06 +01:00
Matthew Hodgson
0ef03c5ca4
Merge pull request #653 from vector-im/matthew/roomsettings2
...
Finish off RoomSettings (part 2)
2016-01-18 13:39:55 +00:00
Matthew Hodgson
5a1b0a1dab
Merge pull request #657 from vector-im/matthew/memberlist
...
Fix up MemberList and MemberInfo cosmetics a bit
2016-01-18 13:39:42 +00:00
Kegan Dougal
77621fe035
Add missing CSS from #638
2016-01-18 12:06:46 +00:00
Matthew Hodgson
8792be4db2
moar space
2016-01-18 01:25:57 +00:00
Matthew Hodgson
1fef91b82c
MemberInfo lipstick
2016-01-18 01:18:11 +00:00
Matthew Hodgson
b2a1c89e83
bring back power badges
2016-01-18 00:16:04 +00:00
Matthew Hodgson
40d2018c17
fix checkbox css
2016-01-17 12:26:54 +00:00
Matthew Hodgson
a61afa0f31
fix css thinko
2016-01-17 02:46:22 +00:00
Matthew Hodgson
4e7c58e242
fix broken icon
2016-01-17 02:46:15 +00:00
Matthew Hodgson
8771369937
more layout
2016-01-15 20:29:44 +00:00
Matthew Hodgson
394fb2373b
more layout tweaks for RoomSettings
2016-01-15 16:50:12 +00:00
Matthew Hodgson
eb8064f961
fix cursors for changeavatar
2016-01-15 16:32:39 +00:00
Matthew Hodgson
531aa153bb
no more textarea in roomsettings
2016-01-15 16:32:23 +00:00
manuroe
d7ffe70d44
PushRules settings: Applied Amandine's review comments
2016-01-15 17:28:57 +01:00
Kegan Dougal
17489ae350
s/MemberAvatar/BaseAvatar/ and rename classes
2016-01-15 16:12:28 +00:00
Matthew Hodgson
762dd69f0a
more bottom margin on editable roomheader
2016-01-15 15:48:29 +00:00
manuroe
cb8b052dc0
PushRules settings: Show unmanaged rules into an "advanced section"
2016-01-15 16:45:27 +01:00
Matthew Hodgson
1fcb4ba94f
droptarget and usersettings and roomsettings layout tweaks
2016-01-15 15:26:00 +00:00
manuroe
2dd2acd4e0
PushRules settings: BF adding a keyword when the keywords rule is OFF
2016-01-15 14:28:50 +01:00
Matthew Hodgson
41ae851df4
fix up user settings CSS somewhat
2016-01-15 12:34:01 +00:00
manuroe
c3469b5b51
PushRules settings: coding: separate UI and data management
2016-01-15 11:33:54 +01:00
manuroe
7412fc7f97
PushRules settings: changed wordings
2016-01-15 10:51:42 +01:00
Matthew Hodgson
d1f26e3911
camera icon
2016-01-14 17:26:16 +00:00
Matthew Hodgson
c1aac1aaca
roomsetting icons
2016-01-14 17:25:21 +00:00
Matthew Hodgson
f2fa9fe398
Merge branch 'develop' into matthew/roomsettings2
2016-01-14 16:49:48 +00:00
David Baker
a65a15e9bb
Shift read marker down by 5px
2016-01-14 16:45:13 +00:00
Matthew Hodgson
9ada5f7ddd
CSS for tab complete slashcommands
2016-01-14 16:29:03 +00:00
Matthew Hodgson
17e540d372
fix line wrapping of code blocks in multiline msgs
2016-01-14 11:57:07 +00:00
Kegsay
db2d7fdbff
Merge pull request #622 from vector-im/kegan/3pid-invite-memberlist
...
CSS for email invite memberlist fix
2016-01-14 10:45:50 +00:00
Kegan Dougal
927ac5fe64
2016 only
2016-01-14 10:45:38 +00:00
manuroe
378f4bb85c
PushRules settings: Display keywords in alphabetical order
2016-01-14 11:15:59 +01:00
manuroe
0577edb055
PushRules settings: Added master push rule
2016-01-14 11:03:51 +01:00
Matthew Hodgson
56718650b9
fix comedy double-margin caused by killing off MessageTiles
2016-01-13 17:39:57 +00:00
Matthew Hodgson
e3eef45684
fix comedy double-margin caused by killing off MessageTiles
2016-01-13 17:39:49 +00:00
Matthew Hodgson
68f846e129
Merge branch 'develop' into matthew/roomsettings2
2016-01-13 17:33:32 +00:00
Matthew Hodgson
f2171c11f0
uncommitted WIP roomsetting CSS
2016-01-13 17:33:03 +00:00
manuroe
629883731e
PushRules settings: BF when adding a new keyword with the keywords rule in Off
2016-01-13 17:56:59 +01:00
manuroe
0475bcd9de
PushRules settings: BF when changing state of the keywords rule with such a sequence: on -> off -> loud.
2016-01-13 17:10:26 +01:00
Kegan Dougal
1d5e661bd0
Split out css for new PresenceLabel
2016-01-13 15:56:44 +00:00
manuroe
ac87830e4e
PushRules settings: Applied new wordings: On, Loud, Off
2016-01-13 16:48:22 +01:00
manuroe
7fc5ab3c6e
PushRules settings: Use the new TextInputDialog to display keywords list. We earn the focus at the end of the keywords list and the management of enter and esc keys
2016-01-13 16:36:57 +01:00
manuroe
c4cb37606b
PushRules settings: Added sanity checks on new keywords
2016-01-13 15:47:00 +01:00
manuroe
e5b7a47fee
PushRules settings: if a newly typed keyword was part of a push rule not managed by the Vector UI, delete the rule and create it compliant with Vector parameters
2016-01-13 12:00:04 +01:00
manuroe
1c03c208e1
PushRules settings: update keywords list hs side
2016-01-13 11:46:13 +01:00
Kegsay
7232659195
Merge pull request #612 from vector-im/kegan/guest-peek-then-join
...
Add css for room preview bar.
2016-01-13 10:37:13 +00:00
manuroe
10d3076d6b
PushRules settings: Display keywords modal dialog
2016-01-13 09:11:56 +01:00
David Baker
cae3ab410f
Merge pull request #603 from vector-im/read_marker_animate
...
New CSS for read markers
2016-01-12 17:58:36 +00:00
Kegan Dougal
2bada93fdc
CSS for forgot password link
2016-01-12 16:39:29 +00:00
manuroe
9fb8c9f67a
PushRules settings: Use a workaround for SYN-590 (Push rule update fails)
2016-01-12 17:33:57 +01:00
manuroe
b9080c770d
PushRules settings: Fixed triage of matrix content rules into the unique Vector rule
2016-01-12 16:46:27 +01:00
David Baker
977b223929
Hopefully working CSS that doesn't cause the messages to jump about when a read marker disappears.
2016-01-12 14:20:05 +00:00
manuroe
7f95362dd2
PushRules settings: Translate matrix per-word rules into the global Vector rule for a list of keywords
2016-01-12 15:12:58 +01:00
Kegan Dougal
f706f75a6e
Add css for room preview bar.
2016-01-12 14:11:00 +00:00
Matthew Hodgson
fc3f356dc0
GA
2016-01-12 01:23:39 +00:00
manuroe
6d510db2db
PPushRules settings: Fixed React warnings
2016-01-11 17:32:37 +01:00
manuroe
ee13dd7b6c
PushRules settings: Added a dedicated component to display them
2016-01-11 17:24:04 +01:00
Kegsay
f898986c73
Merge pull request #594 from vector-im/kegan/guest-access
...
Enable guest access
2016-01-11 15:21:57 +00:00
David Baker
6cd0aeb607
Revert 4px offset: it ends up in the middle of the line above
2016-01-11 10:56:08 +00:00
David Baker
1e57aa8c78
Make read up to line 2px and position relative so we can shift it up a little
2016-01-11 10:52:29 +00:00
Matthew Hodgson
93c4fc8785
switch EditableText to contentEditable; fix auxPanel layout bug in the general case (not just for video)
2016-01-10 13:04:15 +00:00
Matthew Hodgson
d49f8721ce
fix leave.svg so that it can be tinted
2016-01-09 00:56:10 +00:00
David Baker
c02d9890c5
New CSS for read markers
2016-01-09 00:09:11 +00:00
Matthew Hodgson
ccd518cc4c
CSS and imagery for fixed up RoomSettings
2016-01-08 03:26:07 +00:00
Kegan Dougal
a369c862a0
Hit MatrixClient.peekInRoom on rooms we can only peek into.
2016-01-07 14:57:26 +00:00
Kegan Dougal
1a8a4728cd
Enable guest access. Show r/w icons on room directory.
2016-01-07 14:43:12 +00:00
Matthew Hodgson
d2635373f0
Merge pull request #585 from vector-im/matthew/dynamic-svg
...
Make SVGs and CSS dynamically recolourable
2016-01-07 11:41:46 +00:00
David Baker
36e5ac3d7f
Add CSS for the green read-up-to marker.
2016-01-07 11:22:41 +00:00
Matthew Hodgson
df111223fc
copyrights for 2016
2016-01-07 04:17:56 +00:00
David Baker
c0f1ae0133
Use Unread to compute unread status of a room (which uses read receipts).
2016-01-06 18:29:27 +00:00
Matthew Hodgson
eacadbff40
remove stale onSvgLoad
2016-01-06 02:29:20 +00:00
Matthew Hodgson
cb29a04674
use factored out TintableSvg component for dynamic SVGs
2016-01-06 02:11:34 +00:00
Matthew Hodgson
bb313d1f3c
vertical-align room messages to the bottom of the page
2016-01-05 18:49:47 +00:00
Matthew Hodgson
a1bdfaa8a2
vertical-align room messages to the bottom of the page
2016-01-05 18:49:21 +00:00
Matthew Hodgson
1df4f2d556
fix hyperlink position for image downloads
2016-01-05 03:38:53 +00:00
Matthew Hodgson
b996022db2
fix up dynamically loaded svgs, and fix bottomleftmenu
2016-01-05 03:34:25 +00:00
Matthew Hodgson
bbf08d99cc
tinterize more svg
2016-01-05 00:47:26 +00:00
Matthew Hodgson
17b8982c75
move title attributes to the div
2016-01-03 22:35:07 +00:00
Matthew Hodgson
3abdcbf806
switch SVGs from imgs to objects, fixing CSS to make onClicks work
2016-01-03 22:30:14 +00:00
Matthew Hodgson
b9a0b82537
shuffle around all the CSS to de-atomify it and make it match the react components
2016-01-03 00:10:17 +00:00
Matthew Hodgson
fa4bd09f0c
fix room header height
2015-12-28 02:27:47 +00:00
Matthew Hodgson
8dd90980d8
add cancel button for lightbox and pare down pointer-events stuff a bit
2015-12-28 02:15:23 +00:00
Matthew Hodgson
e9db7b1dcc
doh
2015-12-28 01:41:51 +00:00
Matthew Hodgson
388eb1ff4c
use Open Sans, and fix duplication
2015-12-28 01:38:14 +00:00
Matthew Hodgson
0ab8466a3b
make tabcomplete items clickable
2015-12-24 15:12:24 +00:00
Kegan Dougal
94609db3a6
Wrangle CSS to get avatar on UserSettings in the right place
2015-12-24 09:21:02 +00:00
Kegan Dougal
f9f85ec542
More user settings CSS
2015-12-23 16:53:19 +00:00
Kegan Dougal
d3938220cf
Duplicate css for applying to mx_EditableText classes so it works with ChangeDisplayName
2015-12-23 14:13:24 +00:00
Kegsay
73d9ef54c3
Merge pull request #384 from vector-im/matthew/settings
...
WIP experiment of turning UserSettings into a controller-less component
2015-12-23 10:23:39 +00:00
David Baker
755ea0dfb8
Merge remote-tracking branch 'origin/develop' into notif_sync
2015-12-22 14:46:57 +00:00
Matthew Hodgson
f681ce5cdb
add CSS for TabCompleteBar
2015-12-22 00:47:33 +00:00
Matthew Hodgson
ceadfef942
fix missing webkit prefixes for flexbox
2015-12-21 23:20:44 +00:00
Matthew Hodgson
f665848c5e
speed up search anim
2015-12-21 23:20:10 +00:00
Matthew Hodgson
031b048c07
fix missing webkit prefixes for flexbox
2015-12-21 23:19:53 +00:00
Matthew Hodgson
d82c4c5ef3
fix safari flexbox bug
2015-12-21 23:16:44 +00:00
Matthew Hodgson
ae02d8d30a
Merge branch 'develop' into matthew/settings
2015-12-21 13:10:34 +00:00
Matthew Hodgson
67aff6b9f2
adopt MacOS style chevrons
2015-12-21 12:37:51 +00:00
Matthew Hodgson
50aa988a34
fix layout
2015-12-21 12:37:50 +00:00
Matthew Hodgson
fdc94ccf98
ensure even hyperlinks are highlighted
2015-12-21 12:37:50 +00:00
David Baker
cb1fabc578
Highlight status is now the room's unread notif count
2015-12-18 17:53:31 +00:00
Kegan Dougal
dcea0dd601
Move min-height to RoomList; remove bottommost prop
2015-12-18 17:13:57 +00:00
Kegan Dougal
dc1e2010a6
Merge branch 'develop' into kegan/archived-rooms
2015-12-18 17:00:20 +00:00
Matthew Hodgson
d7b87743f3
Merge pull request #533 from vector-im/matthew/inbound-calls
...
position the inbound call box correctly
2015-12-18 15:59:05 +00:00
Kegan Dougal
7cc1573f33
Add startAsHidden and showSpinner props to RoomSubList
...
startAsHidden: Previously we never started in the hidden state and all was well.
But with archived rooms you DO want to start hidden as you haven't fetched the
room list yet. Without this, you need to click twice (close/open) before the
archived room list will load.
showSpinner: If true, will show a spinner iff there are 0 elements being displayed.
Used when fetching the archived room list in RoomList.
2015-12-18 15:17:18 +00:00
Kegan Dougal
f7c4cca675
Add TODO after spending 15 mins trying to figure out the difference between props.collapsed and state.hidden
2015-12-18 13:32:22 +00:00
Kegan Dougal
869c08a790
Add onHeaderClick and alwaysShowHeader props to RoomSubList for archived room clicking
2015-12-18 11:56:22 +00:00
Matthew Hodgson
a7b9e54594
Merge branch 'develop' into matthew/settings
2015-12-18 00:36:46 +00:00
Kegan Dougal
63d0477223
Pass through the starting query params from the URL
2015-12-17 15:01:07 +00:00
Matthew Hodgson
1a90a2c426
position the inbound call box correctly, and fix various issues with when the video preview and callview are shown
2015-12-17 02:53:53 +00:00
Kegsay
856156ef5c
Merge pull request #527 from vector-im/kegan/hide-fs-user
...
Pass a userId rather than a RoomMember to isConferenceUser
2015-12-16 13:56:50 +00:00
Kegan Dougal
c8ca1dd8d0
Pass a userId rather than a RoomMember to isConferenceUser
...
Because invites do not have RoomMembers because we don't have an m.room.member
event for them, just a user ID, and we want to detect conf users at invite
time.
2015-12-16 11:55:13 +00:00