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
Kegan Dougal
fef02f2fd1
s/MemberTile/EntityTile/
2016-01-18 16:43:00 +00: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
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
Matthew Hodgson
41ae851df4
fix up user settings CSS somewhat
2016-01-15 12:34:01 +00: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
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
Kegan Dougal
1d5e661bd0
Split out css for new PresenceLabel
2016-01-13 15:56:44 +00: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
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
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
Kegan Dougal
f706f75a6e
Add css for room preview bar.
2016-01-12 14:11:00 +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
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
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
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
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
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
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
Kegan Dougal
dcea0dd601
Move min-height to RoomList; remove bottommost prop
2015-12-18 17:13:57 +00:00
Matthew Hodgson
a7b9e54594
Merge branch 'develop' into matthew/settings
2015-12-18 00:36:46 +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
Matthew Hodgson
d945050de6
fix typing notifs
2015-12-15 15:59:40 +00:00
Matthew Hodgson
d3ecce2d2e
add fullscreen button
2015-12-15 00:01:32 +00:00
Matthew Hodgson
a495aecdd8
assets for VoIP and DnD file upload
2015-12-14 23:38:24 +00:00
Matthew Hodgson
c553258aff
add dedicated leave button to header
2015-12-13 13:49:54 +00:00
Matthew Hodgson
9c8984b308
fix vertical alignment of voip buttons
2015-12-13 04:14:20 +00:00
Matthew Hodgson
c2061ed439
revert dd08f53756
- do this in JS instead
2015-12-13 04:08:35 +00:00
Matthew Hodgson
96cddc5ca8
fix layout for long room names & topics
2015-12-12 17:30:08 +00:00
Matthew Hodgson
dd08f53756
don't let auxpanel push out the height of the roomview
2015-12-12 17:15:45 +00:00
Matthew Hodgson
056017007a
improve look and feel of upload cancel
2015-12-12 16:41:32 +00:00
Richard van der Hoff
c36d1df417
Add a 'muted' icon for voip calls
...
... because even a crappy one is better than nothing
2015-12-11 15:00:25 +00:00
Matthew Hodgson
762281cd96
fix vertical spacing of roomheader
2015-12-11 03:39:13 +00:00
Matthew Hodgson
898cb399a3
show results
2015-12-11 02:58:47 +00:00
Matthew Hodgson
fea3fed460
animate the search button whilst searching
2015-12-11 02:24:58 +00:00
Matthew Hodgson
4c82d86092
nice green highlights
2015-12-11 01:35:05 +00:00
Matthew Hodgson
1c9d61d731
dedicated search button
2015-12-11 01:19:48 +00:00
Matthew Hodgson
7b702c4594
don't grey out invites randomly
2015-12-11 00:40:40 +00:00
Matthew Hodgson
d6bcf80431
make the settings button more discoverable by having the whole leftRow be a hover target
2015-12-10 19:48:05 +00:00
Matthew Hodgson
4b8d7a612a
make the mx_RoomView_statusAreaBox_line full width as per the ribot design
2015-12-08 19:45:30 +00:00
Matthew Hodgson
b532fd046a
actually use SVGs - oops
2015-12-08 10:28:00 +00:00
Kegan Dougal
1af1297afc
Allow queued events to be cancelled. Make not sent events appear differently to sending events.
2015-12-07 11:38:34 +00:00
Matthew Hodgson
da5c687320
svgize coloured icons
2015-12-06 22:06:21 +00:00
David Baker
db5d9e2f6e
Merge pull request #465 from vector-im/file_uploads
...
Move upload bar CSS to new classes
2015-12-03 10:58:03 +00:00
David Baker
547f59b1bc
Oops, don't re-add these.
2015-12-03 10:00:29 +00:00
David Baker
2d2386ace5
Move upload bar CSS to new classes, and move into new, temporary place (since there is no new-style structure yet).
2015-12-02 18:19:03 +00:00
Matthew Hodgson
c603c1e37f
dezalgo typing notigs on chrome
2015-12-02 17:37:19 +00:00
David Baker
939733b736
Merge branch 'develop' into require-css
2015-12-02 10:26:26 +00:00
Matthew Hodgson
349a88d640
stop clobbering our font colours
2015-12-01 21:44:22 +00:00
David Baker
d2c6e2195e
Merge pull request #447 from vector-im/skindex-nextgen
...
Update skindexing for new world order
2015-12-01 18:12:47 +00:00
David Baker
a63bf7cb35
Merge branch 'develop' into skindex-nextgen
2015-12-01 18:10:57 +00:00
David Baker
7ff5e42f3e
Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions.
2015-12-01 18:05:43 +00:00
Matthew Hodgson
2c12b9128b
highlight binged rooms more clearly
2015-12-01 16:57:49 +00:00
David Baker
c281fe785a
Merge branch 'develop' into skindex-nextgen
2015-12-01 15:53:11 +00:00
Kegan Dougal
8083e7f118
Move vector-only components to src/components.
2015-12-01 15:45:38 +00:00
David Baker
5098c7d16f
Merge branch 'develop' into skindex-nextgen
2015-12-01 15:44:45 +00:00
Kegan Dougal
e07c03a7bb
Merge branch 'develop' into kegan/vector-components
2015-12-01 15:39:02 +00:00
Kegsay
e7f6e09def
Merge pull request #448 from vector-im/kegan/controller-merging4
...
Phase 4 controller merging
2015-12-01 15:34:25 +00:00
Matthew Hodgson
075d2b508d
fix highlights on markdown
2015-12-01 13:13:51 +00:00
Kegan Dougal
e55e2bdd0d
Remove unused class
2015-12-01 11:22:19 +00:00
Kegan Dougal
2a025201b1
Move remaining vector molecules to be components in vector (for now)
2015-12-01 11:19:54 +00:00
Matthew Hodgson
f89dcacf07
fix bottomleftmenu layout a bit
2015-12-01 11:11:32 +00:00
Matthew Hodgson
99f47b8601
match design spacing correctly
2015-12-01 11:07:12 +00:00
Matthew Hodgson
1896ab67d1
fix room avatar offset
2015-12-01 11:05:11 +00:00
Kegan Dougal
8f5f71ec80
Move MatrixChat to react-sdk. Move all login stuff to react SDK.
...
Removed Modulator stuff.
2015-11-30 18:10:09 +00:00
David Baker
021056cfd1
Move copyright header
2015-11-30 18:00:54 +00:00
David Baker
cadfbcbed3
Merge branch 'develop' into skindex-nextgen
2015-11-30 17:56:40 +00:00
David Baker
6f646260aa
WIP of component indexing update
2015-11-30 17:31:32 +00:00
Matthew Hodgson
badfdb5e3e
actually, seems FF is happy with this again now
2015-11-30 17:24:38 +00:00
Matthew Hodgson
2345624d31
switch to Open Sans, juggling font-size appropriately (as Open Sans is physically larger for the same point size as Myriad Pro, irritatingly), and fix some really weird baseline CSS bugs in read receipts that were introduced. Hopefully this doesn't re-introduce the intermittent baseline offset bug for the initials on Chrome & FF
2015-11-30 17:17:09 +00:00
Kegan Dougal
ddc4f30bb6
Remove RoomView and port it to react-sdk. Move Resend.js to react-sdk
2015-11-30 17:16:31 +00:00
Kegan Dougal
4e7aa78ed7
Move RoomList to react-sdk. Inject a ConferenceHandler.
2015-11-30 16:56:05 +00:00
Kegan Dougal
e792ebb837
Move and merge UserSettings to react-sdk
2015-11-30 15:53:13 +00:00
Kegan Dougal
b89bd35cad
Merge branch 'develop' into kegan/controller-merging4
2015-11-30 15:42:32 +00:00
Matthew Hodgson
7636645efc
rename message components as per RL discussion this morning
2015-11-30 15:25:21 +00:00
Kegan Dougal
bd906cbc69
Move and merge LogoutPrompt to react-sdk
2015-11-30 15:23:37 +00:00
Kegan Dougal
cb30cbb09a
Remove MemberList and put it in react-sdk
2015-11-30 15:14:04 +00:00
Kegan Dougal
2b37e5334a
Remove Notifier and put it in react-sdk
2015-11-30 15:05:00 +00:00
Matthew Hodgson
f947400131
Open Sans
2015-11-30 14:17:33 +00:00
Kegan Dougal
fd4d7eba12
Remove ErrorDialog and QuestionDialog to react-sdk
2015-11-30 14:11:28 +00:00
Matthew Hodgson
8a00e71139
remove spurious Vector layer Avatar helper class
2015-11-30 13:56:53 +00:00
Kegan Dougal
83b3702769
Merge branch 'develop' into kegan/controller-merging4
2015-11-30 10:56:14 +00:00
Kegan Dougal
450b2d4d67
Move CreateRoom to react-sdk
2015-11-30 10:55:52 +00:00
Matthew Hodgson
cd040ae0dd
fix zalgo properly! remove ugly regexp hacks for detecting combining diacritics and instead set the right font ordering, as Arial combines nicely with Myriad Pro whilst Helvetica doesn't. (Myriad Pro itself has no combining diacritic characters)
2015-11-30 01:13:59 +00:00
Matthew Hodgson
9a64dc27fc
improve layout for search results, fix syntax highlighting quirks in sublime, and don't crash on zero results
2015-11-29 13:32:13 +00:00
Matthew Hodgson
af6bd53d38
revert 23d45d7f33
and apply a better fix which works for both chrome & FF
2015-11-29 13:18:37 +00:00
Matthew Hodgson
01f0e61d6e
fix search ordering; add room labels; hide input areas if searching
2015-11-29 04:41:17 +00:00
Matthew Hodgson
fc02331cd3
fix CSS for search timestamps
2015-11-29 03:20:19 +00:00
Matthew Hodgson
8de94d45b1
swim like a salmon and manually update skindex for a generic TextualMessage type
2015-11-28 21:11:37 +00:00
Matthew Hodgson
9e97160c85
fix inline <code/> blocks
2015-11-27 16:20:37 +00:00
Kegan Dougal
07001ae35e
Remove unused files
2015-11-27 16:11:58 +00:00
Kegan Dougal
df86e85492
Move ContextualMenu to React SDK
2015-11-27 15:37:00 +00:00
Kegan Dougal
40b974f22d
Move all Event/Message Tiles to React SDK.
2015-11-27 14:35:16 +00:00
Kegan Dougal
f969ccb50c
Move and merge RoomTile/MemberTile to react SDK. Keep DND stuff in vector as RoomDNDView.
2015-11-27 11:52:29 +00:00
Kegan Dougal
b007edca63
Merge and move RoomHeader/RoomSettings into React SDK
2015-11-27 10:42:25 +00:00
Kegan Dougal
3ce29622ed
Move and merge MemberInfo to React SDK
2015-11-26 17:49:55 +00:00
Kegan Dougal
1a6afc2ef0
Move and merge UserSelector
2015-11-26 17:38:01 +00:00
Kegan Dougal
6dea8e7256
Move and merge MessageComposer
2015-11-26 17:31:37 +00:00
Kegan Dougal
7595071e6a
Move and merge ProgressBar
2015-11-26 17:21:35 +00:00
Kegan Dougal
fdad00790e
Move and merge Change* components to React SDK. Update references.
2015-11-26 17:11:26 +00:00
Kegan Dougal
ff9608c914
Move and merge voip molecules. Inject the ConferenceHandler as a prop
...
This keeps the vector conf logic munge separate from react SDK.
2015-11-26 16:39:58 +00:00
Kegan Dougal
49e5f18f62
Move and merge create_room atoms to react SDK
2015-11-26 15:43:57 +00:00
Kegan Dougal
c5b0ea7e9f
Move VideoFeed to React SDK
2015-11-26 15:24:32 +00:00
Kegan Dougal
83eae1b64a
Move and merge EditableText into React SDK
2015-11-26 15:15:45 +00:00
Kegan Dougal
35ee9c9ddd
Move and merge EnableNotificationsButton to react SDK
2015-11-26 15:10:49 +00:00
Kegan Dougal
0a8f5b6223
Move ImageView
2015-11-26 14:51:30 +00:00
Kegan Dougal
3f120c7027
Nuke LogoutButton; nothing used it.
2015-11-26 14:47:11 +00:00
Kegan Dougal
343670c5c4
Move MessageTimestamp
2015-11-26 14:38:48 +00:00
Kegan Dougal
f21b6203ed
Merge branch 'kegan/controller-merging' into kegan/controller-merging2
2015-11-26 14:31:31 +00:00
Kegan Dougal
8517f9f2bf
Missed one
2015-11-26 14:29:26 +00:00
Kegan Dougal
3c12191cb7
Move Spinner
2015-11-26 14:25:20 +00:00
Kegan Dougal
ab22ca6a28
Also move the existing login components to the new structure
2015-11-26 14:11:45 +00:00
Kegan Dougal
8898b444af
Point things at the right places
2015-11-26 13:48:37 +00:00
Kegan Dougal
d079617ce2
Nuke MemberAvatar/RoomAvatar; moved to react SDK
2015-11-26 13:25:56 +00:00
Matthew Hodgson
f9040e08ce
fix conflicts
2015-11-24 16:05:58 +00:00
Matthew Hodgson
841c790337
naughty override to stop RoomList panel scrolling horizontally
2015-11-22 15:47:50 +00:00
Matthew Hodgson
324c3e7dcf
override more GFM css
2015-11-22 15:47:10 +00:00
Matthew Hodgson
01641543da
only try to syntax highlight html
2015-11-21 12:33:45 +00:00
Matthew Hodgson
9038b984ff
fix css link
2015-11-21 12:15:38 +00:00
Matthew Hodgson
da97185fcd
highlight <code/> blocks via highlight.js
2015-11-21 12:14:56 +00:00
Matthew Hodgson
b6e9c1eaab
oops, forgot gfm.css
2015-11-20 20:20:30 +00:00
Matthew Hodgson
76c6d6d4d6
add target=_blank onto all HTML links, and apply GFM.css for CSS for markdown
2015-11-20 20:12:23 +00:00
Matthew Hodgson
4c11de787e
make h2 layout specific to the list
2015-11-20 20:11:06 +00:00
Matthew Hodgson
96c825b89f
wrap whitespace on notices
2015-11-20 20:10:49 +00:00
Matthew Hodgson
29af81e827
Refactor HTML markup stuff into its own class, and whitelist h1 and h2
2015-11-20 18:58:13 +00:00
David Baker
3cf9f5248b
Fix the ref we keep to be the react element and make velociraptor correctly track what nodes it had at the start (c.key not c.props.key)
2015-11-20 18:22:38 +00:00
Kegan Dougal
06427d663d
Add support for playing gifs on mouse enter/leave
2015-11-20 16:36:58 +00:00
David Baker
2c51a5c199
Bugfix: don't cache the read avatar rect as it's relative to the viewport and it will move when we scroll!
2015-11-20 16:01:51 +00:00
Kegan Dougal
29ee7d2b13
Remove useless logging
2015-11-20 14:34:26 +00:00
Kegan Dougal
2e376b1eb9
Clear the 'screen' to load the main left/middle/right panels, then show the settings after post-reg is done
2015-11-20 14:27:39 +00:00
Kegan Dougal
1edea2a62c
Add a PostRegistration component; hook it up to MatrixChat.
2015-11-20 12:02:23 +00:00
Kegsay
99ccff098c
Merge pull request #399 from vector-im/kegan/reg-refactor
...
Refactor registration
2015-11-20 10:28:26 +00:00
Kegan Dougal
f62312fbf3
Remove old registration files. Move CaptchaForm to React SDK.
2015-11-20 10:18:04 +00:00
Matthew Hodgson
02d5154aaf
more alt tags
2015-11-19 17:45:03 +00:00
Matthew Hodgson
41eaf18470
add hoverover test for edit button
2015-11-19 17:43:55 +00:00
Kegan Dougal
d372018e61
Minor tweaks
2015-11-19 16:47:14 +00:00
Kegan Dougal
3cf9f786aa
Instantiate Signup.Register in Registration component
...
This has to be done rather than in MatrixChat because the render() calls
will create new instances otherwise. Pass in all the strings the logic class
requires to the Registration wire component. This isn't the "best" solution
because unloading/reloading the Registration component will lose registration
state which should be persisted. Ideally we'd DI from the top to ensure this
can't happen (as opposed to relying on module globals...)
2015-11-19 15:44:17 +00:00
Kegan Dougal
2d481a6302
Recheck registration state since we may be able to immediately do an HTTP hit if we've been given good QPs
2015-11-19 14:17:18 +00:00
Matthew Hodgson
f7127ab701
Merge pull request #397 from vector-im/z_indices
...
Sort out dialog z index so read receipts avatars are behind the dialog background
2015-11-19 13:53:51 +00:00
Kegan Dougal
eaafc11064
Factor out Captcha UI
2015-11-19 13:44:11 +00:00
David Baker
f7fe871fee
If read receipts avatar isn't on screen, animate it from the top of the screen.
2015-11-19 11:33:15 +00:00
David Baker
ed3d3a9e23
Shift css around a bit so it more closely matches DOM order
2015-11-19 10:49:24 +00:00
David Baker
eb1c6b347d
Move z-index to the dialog wrapper because that's the shallowest positioned element in the DOM and therefore what creates the first stacking context
2015-11-19 10:46:49 +00:00
Kegan Dougal
5f57cd9559
Merge branch 'develop' into kegan/reg-refactor
2015-11-19 09:50:08 +00:00
David Baker
0dd85d9adf
Hidden localstorage option to enable bouncy read receipts :p
2015-11-19 09:44:24 +00:00
Matthew Hodgson
23d45d7f33
fix initials behaviour on FF
2015-11-18 23:46:43 +00:00
Matthew Hodgson
69fdd485e6
general faff to make the new edit button position interact properly with dave's 'click to show all read receipts'
2015-11-18 23:41:38 +00:00
Matthew Hodgson
bf3e90bb47
dirty hack to fix the uneven spacing
2015-11-18 23:04:12 +00:00
Matthew Hodgson
68a005bf1f
stop edit option from colliding with scrollbar again
2015-11-18 22:24:54 +00:00
Matthew Hodgson
6e3afcde53
dodgy fudge to put the edit button alongside the read receipts. in future I think we should turn it into a chevron next to the timestamp
2015-11-18 22:19:21 +00:00
Matthew Hodgson
8fed464cf6
and the new voice icon
2015-11-18 21:18:16 +00:00
Matthew Hodgson
08ba0457e8
add a temporary voice call button
2015-11-18 21:17:58 +00:00
Matthew Hodgson
098491e350
avoid hoverover artefacts on avatar initials
2015-11-18 20:56:43 +00:00
Matthew Hodgson
46541a3f2e
logout button on splashscreen to avoid wedging users whose server has gone awol
2015-11-18 20:47:14 +00:00
Matthew Hodgson
742ae354e5
clicking anywhere in the composer pane should focus on the textarea
2015-11-18 20:15:15 +00:00
Kegan Dougal
5424567a66
Hook up onFormSubmit to make registration (dummy only) work again.
2015-11-18 17:15:20 +00:00
David Baker
f0df3f29b9
Show all read avatars on click
2015-11-18 17:12:17 +00:00
Kegan Dougal
b4c0625961
Show validation errors
2015-11-18 15:32:44 +00:00
David Baker
1099892784
Merge pull request #379 from vector-im/read_receipts
...
Read receipts
2015-11-18 14:53:29 +00:00
Kegan Dougal
ed3527e243
Merge branch 'develop' into kegan/reg-refactor
2015-11-17 17:43:22 +00:00
Kegan Dougal
8e8b27c893
Add RegistrationForm UI component and new Registration wire component
...
Hook it up to MatrixChat instead of the existing logic (this breaks reg). WIP.
2015-11-17 17:40:31 +00:00
David Baker
c63dd376d8
Fix member avatar initials (I failed at git conflict merging)
2015-11-17 17:31:03 +00:00
David Baker
da55081c68
Add member name to avatars as the title since if displayed without accompanying text (as with read receipts) they can be somewhat unhelpful. May as well have them all the time I think.
2015-11-17 15:59:44 +00:00
David Baker
80c2bd0c7f
Remove bouncing, set animation time to be constant (prevents temporary overalpping) and exclude ourselves.
2015-11-17 15:51:00 +00:00
Kegan Dougal
714c96283e
Setting defaults from config.json got lost
2015-11-17 15:12:55 +00:00
Kegan Dougal
8602e0665d
PR feedback from #355
2015-11-17 10:57:44 +00:00
Kegsay
af1e3373ea
Merge pull request #355 from vector-im/kegan/login-refactor
...
Refactor login page
2015-11-17 10:47:56 +00:00
Matthew Hodgson
79e39429b7
add todo
2015-11-17 02:40:19 +00:00
Matthew Hodgson
7b3eea0b58
experiment with trying to turn UserSettings into a controller-less 'wiring component' which wires together a series of smaller components (in this case, so small they're mainly <input/s>
2015-11-17 02:15:55 +00:00
David Baker
7f61a0252f
remove logging
2015-11-16 16:45:28 +00:00
David Baker
bb59e9276b
Merge remote-tracking branch 'origin/develop' into read_receipts
2015-11-16 16:33:39 +00:00
David Baker
d6b86598e5
Bouncy bouncy!
2015-11-16 16:13:21 +00:00
Matthew Hodgson
bf91155e60
implement multiline input
2015-11-15 03:36:10 +00:00
Matthew Hodgson
ef181f55d5
make modal dialogs higher in z-index
2015-11-14 00:14:41 +00:00
Matthew Hodgson
1c7e7cd111
kill stale z-index param
2015-11-14 00:13:13 +00:00
Matthew Hodgson
063e387a65
turn off the placeholder drag & drop function to get an opinion from folks
2015-11-13 23:51:48 +00:00
Matthew Hodgson
ca07c8f429
Merge pull request #365 from vector-im/avatar_initial_a11y
...
Mark up the avatar initials so they're not read out by screen readers
2015-11-13 18:37:10 +00:00
Matthew Hodgson
2fd7196cdd
also handle a11y on room avatars
2015-11-13 18:36:46 +00:00
Matthew Hodgson
ff59fc84c5
don't bold the selected room just because, as it bold = new msgs
2015-11-13 18:25:10 +00:00
David Baker
9d620dfb1d
Hopefully now mostly complete animations: we iterate through zero or more start states and then settle on the final place.
2015-11-13 16:43:54 +00:00
David Baker
bc2c744bed
more bits of read receipt animation implemented
2015-11-13 11:42:51 +00:00
David Baker
2fabf69ce3
Mark up the avatar initials so they're not read out by screen readers
2015-11-13 09:28:56 +00:00
Matthew Hodgson
f8d628d336
fix composer avatar
2015-11-13 02:44:46 +00:00
Matthew Hodgson
20f84ce322
override gemini-scrollbar CSS to stop the scrollview from pushing out the container, causing FF's flexbox to adapt and keep growing infinitely
2015-11-13 02:29:59 +00:00
Matthew Hodgson
2cf0ceb260
back out previous bodges to flexbox to make geminiscrollbar work in FF
2015-11-13 02:29:18 +00:00
Matthew Hodgson
04305460db
make firefox slightly happier
2015-11-13 01:19:40 +00:00
Matthew Hodgson
caa2fd97d1
sacrifice dead goats to make gemini-scrollbars work on firefox 42 and chrome 48 and later. the problem is that flexbox interacts badly with gemini-scrollbars, as gemini looks at the offsetWidth of the container in order to make the width of its enclosed scrollable view = width+scrollbarwidth. The problem is that flexbox then sees that the scrollable view has expanded, and unhelpfully flexes the container to fit it. This fixes the problem by providing more explicit widths for the containers to stop them flexing. I'm not sure I want to know why we don't also see the same problem with heights.
2015-11-13 00:46:50 +00:00
David Baker
e0efb6862e
Merge pull request #354 from vector-im/ignore-non-mxc
...
Display some sensible UI for non-mxc content URLs.
2015-11-12 17:43:20 +00:00
David Baker
1ac47f32fe
Fix scrolling on browsers where gemini scrollbars don't kick in.
2015-11-12 17:18:22 +00:00
Kegan Dougal
b1438355e2
Github and Sublime don't like this not being escaped. Displays fine though in React like this.
2015-11-12 15:58:12 +00:00
Kegan Dougal
021eaf5c29
Vector is the default IS in Vector
2015-11-12 15:54:07 +00:00
Kegan Dougal
726afd30bb
Swap old login for new
2015-11-12 15:49:32 +00:00
Kegan Dougal
58472b8251
Move Cas/PasswordLogin to react-sdk. Use them as normal components.
2015-11-12 15:38:04 +00:00
Kegan Dougal
8826eb60cc
Call through to password login
2015-11-12 15:16:29 +00:00
David Baker
c8a8306165
Display some sensible UI for non-mxc content URLs.
2015-11-12 14:16:57 +00:00
Matthew Hodgson
c12c716dc0
fix URLs on image
2015-11-12 13:34:00 +00:00
Kegan Dougal
05eda88ea2
Split out logic/UI for logging in
...
- Add 'PasswordLogin' UI component
- Add 'LoginPage' wire component which, along with Signup from react SDK,
replaces the 'Login' page.
- Move UI code (state/props) from ServerConfig which was lobotomoised in the
React SDK.
Unfinished.
2015-11-12 11:57:33 +00:00
Matthew Hodgson
2fff6f4d5f
fix spinner layout yet more
2015-11-11 02:31:17 +01:00
Matthew Hodgson
dd3427d8d0
remove unused component
2015-11-11 02:01:11 +01:00
Matthew Hodgson
bc3ee949f5
fix warning about missing thead
2015-11-11 02:00:18 +01:00
Matthew Hodgson
5aa468f1e3
skin simpleheader
2015-11-11 01:59:56 +01:00
Matthew Hodgson
c2af09fbaa
fix Spinner CSS a bit
2015-11-11 00:57:31 +01:00
Matthew Hodgson
bbd7124ac7
improve comment on how our dynamic height CSS works
2015-11-11 00:57:16 +01:00
Matthew Hodgson
adb7915b3e
suppress warning
2015-11-11 00:56:51 +01:00
Matthew Hodgson
5c92b09da1
improve spacing on login screen
2015-11-11 00:56:44 +01:00
Matthew Hodgson
2e9e03bd45
oops, refresh the login options on mount. make autofocus work too.
2015-11-11 00:39:48 +01:00
Matthew Hodgson
19b31ff30d
oops, make this actually work.
2015-11-11 00:06:49 +01:00
Matthew Hodgson
801154fd8a
apply jsx
2015-11-11 00:05:35 +01:00
Matthew Hodgson
f628591e27
fix login page vertical scroll and centering
2015-11-10 19:19:23 +00:00
Matthew Hodgson
9cbd4ae2e4
fix raging typos
2015-11-10 19:15:14 +00:00
Matthew Hodgson
0825e0a2e2
retrieve last used HS/IS URL from local storage, and associated tweaks
2015-11-10 19:09:24 +00:00
Matthew Hodgson
68c1ddd5d2
replace react-loader with Spinner everywhere
2015-11-10 18:12:26 +00:00
David Baker
9a6624d1c7
Do read receipt avatars with absolute positioning: this should be a lot easier to animate. Also mess around with the MemberAvatar a bit so it's easier to style.
2015-11-10 17:44:59 +00:00
David Baker
c9823d07fd
Limit number of read avatars, lay them out as per the design & order them.
2015-11-10 13:51:11 +00:00
David Baker
450036a6ed
Merge remote-tracking branch 'origin/develop' into read_receipts
2015-11-10 11:26:42 +00:00
Matthew Hodgson
ef7a38e558
gemini scrollbar on the memberlist too
2015-11-10 02:26:46 +00:00
Matthew Hodgson
2ca64d9c15
add gemini-scrollbar to the main roomview
2015-11-10 02:04:21 +00:00
Matthew Hodgson
cb887c699e
use gemini-scrollbar to provide fake scrollbars for the room list
2015-11-10 01:40:08 +00:00
Matthew Hodgson
2ccd881665
port to react 0.14, removing getDOMNode()s for DOM components and turning them into ReactDOM.findDOMNode()s for React components
2015-11-09 23:54:10 +00:00
Matthew Hodgson
87bb7c9b7b
upgrade to react 0.14
2015-11-09 23:13:46 +00:00
Matthew Hodgson
6d9817e5e7
Merge pull request #342 from vector-im/matthew/orderable-roomlist
...
Implement reorderable rooms via room tagging.
2015-11-09 16:05:00 +00:00
Matthew Hodgson
23c93de82e
Merge branch 'develop' into matthew/orderable-roomlist
2015-11-09 16:04:20 +00:00
Matthew Hodgson
bea64082a9
put the DragDropContext on LeftPanel rather than MatrixChat to allow index.js to continue to abuse MatrixChat by directly invoking the showScreen method on it
2015-11-09 15:44:08 +00:00
Kegsay
c3385d597a
Merge pull request #332 from vector-im/kegan/syncing
...
Implement connection lost bar + resend all
2015-11-09 15:35:38 +00:00
Matthew Hodgson
752f8bdbb8
remove random bold initials
2015-11-09 14:04:43 +00:00
Matthew Hodgson
1f69760173
fix comedy scrolling parallax avatar initial bug
2015-11-09 12:41:23 +00:00
Matthew Hodgson
66add5673b
de-hash rooms
2015-11-09 11:53:50 +00:00
Matthew Hodgson
a3082753ef
shove initials onto default room & member avatars as per the design
2015-11-09 02:12:26 +00:00
Matthew Hodgson
eaa2f94327
warning png
2015-11-09 00:13:40 +00:00
Matthew Hodgson
615879ffdd
skin to match CSS (spacing will need to be fixed once matthew/ordered-roomlist lands)
2015-11-09 00:13:25 +00:00
Matthew Hodgson
05d921256f
re-skin the notification bar
2015-11-08 23:37:14 +00:00
Matthew Hodgson
567176ea6c
put a load of margin on the bottommost sublist to increase its hit target size and avoid problems when toggling its hiddenness
2015-11-08 14:08:17 +00:00
Matthew Hodgson
5494a4ea6c
s/deprioritize/demote/
2015-11-08 13:50:36 +00:00
Matthew Hodgson
827c0da33c
commented out debug
2015-11-08 13:42:45 +00:00
Matthew Hodgson
f0dbb422f6
update the actual target list, which may not be the same as the one we dropped on
2015-11-08 13:13:01 +00:00
Matthew Hodgson
5c406856ed
adjust column widths to match design
2015-11-08 12:59:19 +00:00
Matthew Hodgson
b15def84bc
fix spacing of the layout to match latest designs
2015-11-08 12:48:23 +00:00
Matthew Hodgson
bbbe074d92
hide all the debugging behind if (debug)
2015-11-08 12:24:32 +00:00
Matthew Hodgson
36da1accca
click on CallView preview to jump to call
2015-11-08 12:14:10 +00:00
Matthew Hodgson
e289235e17
fix tooltip positioning when collapsed
2015-11-08 12:02:26 +00:00
Matthew Hodgson
c60e8736c1
handle collapsed drop-targets better
2015-11-08 11:50:15 +00:00
Matthew Hodgson
69899e3718
position sublist chevron better when collapsed
2015-11-08 11:44:13 +00:00
Matthew Hodgson
ed4c5b9f73
switch initial spinner to mx_Spinner
2015-11-07 20:16:44 +00:00
Matthew Hodgson
07200d7953
Merge branch 'develop' into matthew/orderable-roomlist
2015-11-07 17:29:18 +00:00
Matthew Hodgson
4a195dd3f0
sacrifice a small mountainside of goats to make placeholder-based work correctly
2015-11-07 02:57:56 +00:00
Matthew Hodgson
fe442f5c24
fix various edge cases when dragging stuff back to the conversations list
2015-11-06 23:30:57 +01:00
Matthew Hodgson
89327bd38f
precedence fail :(
2015-11-06 21:33:28 +01:00
Matthew Hodgson
f102e3b3b7
collapsible sublist graphics
2015-11-06 21:25:35 +01:00
Matthew Hodgson
1150e22190
collapsible sublists
2015-11-06 21:25:20 +01:00
Matthew Hodgson
886ffbf158
switch to m.* prefixes for tags before it's too late
2015-11-06 21:00:34 +01:00
Matthew Hodgson
c884c5fc33
actually manage manual ordering; support arbitrary tags; bug fixes
2015-11-06 20:54:07 +01:00
Kegan Dougal
3a8c263e8e
Add resending bar (and resend all option)
...
Factor out resend logic which was in the context menu into a separate
Resend file (it shouldn't be in the skin, but it also isn't really
suitable for a controller given 2 different views invoke it..)
2015-11-05 15:59:03 +00:00
Kegan Dougal
804af341ac
Add a 'connection lost' bar.
2015-11-05 14:52:44 +00:00
David Baker
4bf6992398
Don't send read receipts for our own events and null check in a few places.
2015-11-05 14:16:15 +00:00
Matthew Hodgson
8842147ec3
skin RoomDropTarget correctly
2015-11-05 11:21:45 +00:00
David Baker
942659df0d
Work around the bug where some channels have no name from the js sdk which was causing vector to exception and never load.
2015-11-04 14:15:57 +00:00
Matthew Hodgson
61e55b3ca3
implement most of drag & drop.
2015-11-04 02:25:08 +00:00
Matthew Hodgson
7fe7af6026
refactor out the sections of the RoomList into RoomSubLists. Start wiring up tags
2015-11-04 00:19:37 +00:00
Erik Johnston
7dc5f91fad
Remove unused code
2015-11-03 18:59:45 +00:00
Erik Johnston
5b773b99c0
Add basic m.video view support
2015-11-03 18:56:55 +00:00
Matthew Hodgson
27cf9cf561
put invites above recents
2015-11-03 14:35:48 +00:00
Matthew Hodgson
b1b2704bed
avoid racey NPE on first login
2015-11-03 14:35:39 +00:00
David Baker
2a4a02f36e
More on read receipts: listen for events, add keys & class / very minimal css.
2015-11-03 13:44:40 +00:00
David Baker
11c38014e5
Sort of display read avatars but without live updating
2015-11-02 18:55:28 +00:00
Kegan Dougal
6e63153d83
Add unsupported suffix on Ongoing conf notification if conf calls are unsupported in the browser
2015-11-02 18:01:20 +00:00
David Baker
e869814f2d
Don't display anything if TextForEvent doesn't give us any text. Fixes #253 (catapillar of doom).
2015-11-02 14:14:47 +00:00
Kegan Dougal
38780ad492
Merge branch 'develop' into kegan/reject-invites
2015-11-02 09:47:51 +00:00
Matthew Hodgson
e25d31a9fe
Merge pull request #296 from vector-im/matthew/redesign
...
Matthew/redesign
2015-10-30 18:30:13 +00:00
Matthew Hodgson
56d00c2ec7
make onFinished required prop for modal contents
2015-10-30 18:26:22 +00:00
Matthew Hodgson
79af89fd1b
fix missing decl
2015-10-30 18:26:05 +00:00
Matthew Hodgson
11e176df66
comment for the hidden collapse button
2015-10-30 18:23:08 +00:00
Matthew Hodgson
75bc878657
comment what a CR is
2015-10-30 18:22:21 +00:00
Matthew Hodgson
ddbc8dffb3
switch from enums to string literals for SearchBar.Scope
2015-10-30 18:21:54 +00:00
Matthew Hodgson
6aad99a505
comment \u200b
2015-10-30 18:20:29 +00:00
Matthew Hodgson
35cebc56d3
rewrite the HTML message stuff to fix XSS and improve clarity
2015-10-30 18:19:20 +00:00
Kegan Dougal
668234be4c
Add reject button and impl
2015-10-30 17:18:25 +00:00
Kegsay
626e8bab1a
Merge pull request #283 from vector-im/kegan/blocking
...
Add feature-based browser blocking
2015-10-30 14:59:06 +00:00
Kegan Dougal
633bbd8f29
Review comments: add chrome blurb.
2015-10-30 14:58:47 +00:00
David Baker
ffb9ce89c7
Merge branch 'develop' into matthew/redesign
2015-10-30 11:50:34 +00:00
Matthew Hodgson
fdfa0cbd0e
display search results correct; support HTML markup
2015-10-30 04:10:37 +00:00
Matthew Hodgson
d315e4afcd
show m.room.names
2015-10-30 02:06:34 +00:00
Matthew Hodgson
80c04048d0
cancel viewsource dialog with escape
2015-10-29 21:30:29 +00:00
Matthew Hodgson
8239e57fa1
more lightbox tweaks
2015-10-29 18:28:30 +00:00
David Baker
f4ca30bb38
Throw exception if EventTile is instantiated with an event type it doesn't support.
2015-10-29 18:12:42 +00:00
Kegan Dougal
cc313f350c
Merge branch 'develop' into kegan/blocking
2015-10-29 16:03:26 +00:00
Erik Johnston
ae2768af9c
Remove left/right padding from ongoing call notification, so that we don't get scrollbars in chrome
2015-10-29 15:57:31 +00:00
Matthew Hodgson
9fd2bf0989
remove transparent background for now; specify image width & height; punt the label over to the far RHS; to get around various layout problems in Chrome 44 and Safari 8
2015-10-29 11:01:23 +00:00
Matthew Hodgson
2ee840922d
basic implementation of search
2015-10-29 02:03:04 +00:00
Matthew Hodgson
0ade5ff640
lightbox buttons
2015-10-29 00:39:12 +00:00
Matthew Hodgson
dc401075a7
try to make the edit button more reliable
2015-10-29 00:38:51 +00:00
Matthew Hodgson
de1e8e9f93
implement redact and links
2015-10-29 00:38:26 +00:00
Matthew Hodgson
dbac2e299e
tweak spacing of label on lightbox
2015-10-28 22:49:20 +00:00
Matthew Hodgson
8eaa96b0b3
black magic fixes to the lightbox
2015-10-28 19:41:49 +00:00
Matthew Hodgson
cb095ba5a0
WIP search stuff
2015-10-28 19:41:23 +00:00
Matthew Hodgson
0bfb1416c1
WIP search stuff
2015-10-28 19:39:45 +00:00
Kegan Dougal
59d8cbe742
Use Modernizr to check for browser compatibility
...
Add a CompatibilityPage which is shown for incompatible clients. If they
continue on regardless, proceed as if it never happened.
2015-10-28 17:39:50 +00:00
Matthew Hodgson
00a7ea994a
kill random grey backgrounds for transparent avatars
2015-10-28 16:52:50 +00:00
David Baker
4118c05d15
Unused variables
2015-10-28 16:23:48 +00:00
Matthew Hodgson
7fbe38e74d
fix padding feckup
2015-10-28 16:02:59 +00:00
Kegsay
4175dcd102
Merge pull request #260 from vector-im/inbound-audio
...
Fix inbound audio
2015-10-28 11:43:52 +00:00
Kegan Dougal
35862e0c66
Explicitly make React use the same audio element.. Use a 'key' and comment why it is required.
2015-10-28 11:43:13 +00:00
Kegsay
424d1b84db
Merge pull request #264 from vector-im/246-start-chat-ui-feedback
...
Show a spinner if creating a room on "Start chat" click
2015-10-28 11:38:52 +00:00
Matthew Hodgson
a25207960c
search bar
2015-10-28 01:05:28 +00:00
Matthew Hodgson
04aff6aab7
unhide labels on recents menu for Amandine
2015-10-27 23:51:40 +00:00
Matthew Hodgson
cbaf134625
merge develop
2015-10-27 23:28:34 +00:00
Kegan Dougal
731ad26be4
Exit full screen programatically when the remote side hangs up
2015-10-27 17:45:47 +00:00
Kegan Dougal
9dfd0bc3bb
Show a spinner if creating a room on "Start chat" click
...
Use a gif instead of 'orrible CSS spinners which are CPU hungry. Encapsulate
it in a very basic Spinner atom.
2015-10-27 16:56:37 +00:00
Kegan Dougal
05dba9c2d4
Fix inbound audio
...
This was caused by an <img> being the first thing in the <div> rather than
the <audio>. This caused a conflict because the "not in call" render was just
<div><audio /></div> and "in call" render was <div><img /> <audio /></div>
React can't tell in this case that the <audio> tags are the "same" so was
clobbering it (which meant that on inbound calls we would call play() on an
audio tag which would then immediately be clobbered by another audio tag).
2015-10-27 12:59:04 +00:00
Kegsay
ed52bc37b2
Merge pull request #259 from vector-im/linkify-userids
...
Add linkify handlers
2015-10-27 12:25:26 +00:00
Kegan Dougal
99e8a54a27
Add linkify handlers
2015-10-27 10:46:18 +00:00
Kegan Dougal
c98f7f926a
Remove stuff that was merged from working space
2015-10-27 10:18:43 +00:00
Kegan Dougal
c91b642a8b
Merge branch 'develop' into kegan/delete-empty-files
...
Conflicts:
src/skins/vector/views/molecules/EventAsTextTile.js
2015-10-27 09:19:08 +00:00
Matthew Hodgson
aac00db16b
WIP for new lightbox viewer
2015-10-27 01:39:19 +00:00
Matthew Hodgson
7c445cc108
fix error when joining rooms
2015-10-27 01:17:42 +00:00
Kegan Dougal
58bac0fbdc
Add a tag to notifications so they can clobber. Fixes #159 .
...
This is the same fix we applied to angular to fix this problem in SYWEB-21.
2015-10-26 16:56:44 +00:00
Matthew Hodgson
363e3f4e21
image viewing tweaks
2015-10-25 23:33:28 +00:00
Matthew Hodgson
78cff9f20d
fix upload drop target
2015-10-25 23:13:03 +00:00
Matthew Hodgson
86fb313b9b
fix upload drop target
2015-10-25 23:12:57 +00:00
Matthew Hodgson
8840895e70
fix progressbar
2015-10-25 23:08:21 +00:00
Matthew Hodgson
ed76a46739
list power like this for now
2015-10-25 23:01:16 +00:00
Matthew Hodgson
7fdb82d87f
memberinfo look & feel
2015-10-25 22:55:30 +00:00
Matthew Hodgson
729babae4f
quick implementation of all new MemberInfo
2015-10-25 19:09:38 +00:00
Matthew Hodgson
8257f325c4
s/getMembersWithMemership/getMembersWithMembership/
2015-10-25 11:51:17 +00:00
Matthew Hodgson
379fed813e
actually use the config file for default HS and IS URLs...
2015-10-25 02:44:57 +00:00
Matthew Hodgson
435a9cd9e4
actually use the config file for default HS and IS URLs...
2015-10-25 02:42:41 +00:00
Matthew Hodgson
8cd6d70c0a
fix voip buttons header
2015-10-25 02:36:27 +00:00
Matthew Hodgson
1d3c821672
improve spacing a bit
2015-10-25 02:26:24 +00:00
Matthew Hodgson
6d6e1366dc
s/Delete/Redact/
2015-10-25 02:13:01 +00:00
Matthew Hodgson
19d272b171
Merge branch 'develop' of git+ssh://github.com/vector-im/vector-web into matthew/redesign
2015-10-25 02:12:35 +00:00
Matthew Hodgson
1188c4c69f
Merge pull request #243 from vector-im/kegan/reg-errors-176
...
Fix #176 Password complexity error message
2015-10-25 02:12:21 +00:00
Matthew Hodgson
88dd135b5a
Merge pull request #241 from vector-im/kegan/redact-messages
...
Hook up delete button on contextual menu (#56 )
2015-10-25 02:12:11 +00:00
Matthew Hodgson
8ebb8ba427
fix up new message layout
2015-10-25 02:09:16 +00:00
Matthew Hodgson
9c215efcbf
fix up header layout some more
2015-10-25 02:09:06 +00:00
Matthew Hodgson
6e3e0a1447
implement new roomheader
2015-10-25 01:52:28 +00:00
Matthew Hodgson
d16968d528
update badge count in realtime
2015-10-25 01:16:41 +00:00
Matthew Hodgson
28c3787fb3
implement bottom-right call button
2015-10-25 01:03:22 +00:00
Matthew Hodgson
d8bc362a89
fix invites
2015-10-25 00:59:33 +01:00
Matthew Hodgson
13f3548057
fix badge pos
2015-10-24 20:58:00 +01:00
Matthew Hodgson
39871e52df
fix NPE
2015-10-24 20:57:05 +01:00
Matthew Hodgson
0cffd8dd84
sort out files button & NPE
2015-10-24 20:56:27 +01:00
Matthew Hodgson
f4d21f883a
Add on a membership badge
2015-10-24 20:47:48 +01:00
Matthew Hodgson
a74cef0d64
fix stupid typing warnings
2015-10-24 20:28:42 +01:00
Matthew Hodgson
e59bfe16dc
sort out the membership list
2015-10-24 20:19:54 +01:00
Matthew Hodgson
e718cad053
invites section
2015-10-24 02:02:33 +01:00
Matthew Hodgson
b6cac2bc89
Merge branch 'develop' of git+ssh://github.com/vector-im/vector-web into matthew/redesign
2015-10-23 18:03:49 +01:00
Matthew Hodgson
a86861e9b9
make badges work again
2015-10-23 18:03:35 +01:00
Matthew Hodgson
6e2362e8a9
reskin file upload UI
2015-10-23 17:43:40 +01:00
Matthew Hodgson
300005243c
only bold current room if it has unread msgs
2015-10-23 17:43:30 +01:00
David Baker
5392afdec4
Add UI for changing room avatars and update UI when room avatars change
2015-10-23 17:36:02 +01:00
David Baker
e844b7aa21
UI to set Room Avatars
2015-10-23 13:47:32 +01:00
Matthew Hodgson
4019e359ca
fix visibility during contextual window
2015-10-23 12:46:08 +01:00
Matthew Hodgson
185efb00fb
new buttons
2015-10-23 12:41:59 +01:00
Matthew Hodgson
d946b39671
stop annoying popping and fix layout of hoverover tile stuff
2015-10-23 12:41:51 +01:00
Matthew Hodgson
c74dc8ef47
slightly prettier source view
2015-10-23 12:41:32 +01:00
Matthew Hodgson
7292a2ced5
kill blue lozenges
2015-10-23 12:40:28 +01:00
Matthew Hodgson
baf777a418
Merge branch 'develop' into matthew/redesign
2015-10-23 11:25:20 +01:00
Matthew Hodgson
30b2156278
fix typing notifs
2015-10-23 11:19:13 +01:00
David Baker
f618585bd6
Merge branch 'develop' of github.com:vector-im/vector-web into develop
2015-10-23 09:25:15 +01:00
David Baker
7c6fb36520
Let the tile contents specify whether it requires a sender profile or not. Fixes #250 .
2015-10-23 09:24:25 +01:00
Matthew Hodgson
7f65ba506b
WIP of new CSS
2015-10-23 02:39:56 +01:00
Matthew Hodgson
351a94b4a1
oops - wrong branch
...
Revert "WIP of new CSS"
This reverts commit ad4e3418ff
.
2015-10-23 02:38:32 +01:00
Matthew Hodgson
ad4e3418ff
WIP of new CSS
2015-10-23 02:32:49 +01:00
Matthew Hodgson
82affac438
oops, typo
2015-10-22 16:33:53 +01:00
David Baker
08270b26ee
Do room avatars properly.
2015-10-22 13:10:02 +01:00
David Baker
4b645bcd66
Make context menus point the right way
2015-10-21 19:02:02 +01:00
David Baker
1f3a6e408c
Factor out stuff commnon to all timeline events into EventTile: makes timestamp & edit button etc appear on everything, not just messages.
2015-10-21 17:52:34 +01:00
Kegan Dougal
3779ff7691
Handle Length case. Add default case and whine loudly.
2015-10-21 17:45:53 +01:00
Kegan Dougal
3d3680e42f
NPE fix when accessing event.sender
2015-10-21 16:11:47 +01:00
Kegan Dougal
af67df4c4a
Hook up delete button on contextual menu ( #56 )
2015-10-21 15:52:35 +01:00
Matthew Hodgson
bf40011815
prettier file upload
2015-10-21 15:30:18 +01:00
Kegan Dougal
a9b093b7f5
Remove empty controllers
2015-10-21 15:30:04 +01:00
Kegan Dougal
5e7bd1e51f
Remove empty files
2015-10-21 15:17:03 +01:00
David Baker
7142ea8f1e
Redundant onclick
2015-10-21 11:15:27 +01:00
Matthew Hodgson
c8f6d46c8b
add remoteAudioElement
2015-10-21 01:23:15 +01:00
Matthew Hodgson
5d1ad4d259
only show the zoom button on video calls
2015-10-21 01:23:15 +01:00
David Baker
006f0b00c6
Try refing the container using a functiob as it currently seems to be endinh up with no refs some of the time
2015-10-20 18:23:27 +01:00
David Baker
fe0707535c
binding makes no difference - put a null check in to catch the rogue exception
2015-10-20 17:46:11 +01:00
David Baker
da6c5653b1
Try binding actin handler
2015-10-20 12:13:31 +01:00
Matthew Hodgson
79eda12656
doh
2015-10-20 12:10:31 +01:00
Matthew Hodgson
137439243a
fix layout
2015-10-20 11:49:08 +01:00
Matthew Hodgson
bb5895c157
move mute state into the existing voice/video buttons for now. move zoom button to that set for now
2015-10-20 11:30:54 +01:00
David Baker
34ad48a5d3
Wire up fullscreen button. Requires react-sdk with sync flag to dispatcher.
2015-10-20 11:03:32 +01:00
David Baker
078134d481
Add fullscreen button (not wired up to anything)
2015-10-20 10:48:08 +01:00
Kegan Dougal
f882ecc31b
'center' the buttons just like the cog/video/voice buttons are.
2015-10-20 10:22:23 +01:00
Kegan Dougal
d302f3eebb
Add in voip mute video/audio skin. Needs a bit more CSS tweaks.
2015-10-20 09:55:41 +01:00
David Baker
bdbfc2b6e0
Add the little edit widgets and make those the things that bring up the message context menus. Still need to add them to all event tiles and make the context menus point the right way.
2015-10-19 19:30:04 +01:00
Matthew Hodgson
f256f79418
accidental regression that was causing the room list to scroll horizontally
2015-10-19 18:27:21 +01:00
Matthew Hodgson
d1cda75c8b
Date refinements. Show more detailed timestamps for older messages, and try to show a separator as the first message in every room
2015-10-19 18:19:26 +01:00
David Baker
e3e49daddb
Make 'view source' work
2015-10-15 14:41:12 +01:00
David Baker
48924a6106
Change resend buttons to a context menu with working resending and non-working 'view source'
2015-10-15 14:14:33 +01:00
David Baker
c0938f270e
Unused code
2015-10-13 16:03:07 +01:00
David Baker
47c1bb35db
Un-break member hovering
2015-10-13 15:17:20 +01:00
David Baker
7598be684c
Merge pull request #198 from stevenhammerton/sh-cas-auth
...
Add support for CAS auth
2015-10-13 14:26:03 +01:00
David Baker
1dd707775a
Use new js-sdk modified time to avoid unnecessary member tile updates. Also avoid double-updating since we were setting state and then forcing an update which is redundant.
2015-10-13 11:10:43 +01:00
Steven Hammerton
b5357d3298
Remove whitespace
2015-10-12 10:28:39 +01:00
Steven Hammerton
c561647460
Add missing comma
2015-10-12 10:27:45 +01:00
Steven Hammerton
353af6c647
Move CasLogin logic to controller class and logic object in react-sdk
2015-10-12 10:27:16 +01:00
Matthew Hodgson
17c81c1101
icons
2015-10-11 22:51:00 +01:00
Matthew Hodgson
50ebce69b7
make file upload look slightly less crap
2015-10-11 18:42:54 +01:00
Matthew Hodgson
191d56673b
fix message spacing on Safari caused by switching back to <li/>s...
2015-10-11 18:21:36 +01:00
Matthew Hodgson
5d962e1feb
improve horizontal flexing of timeline
2015-10-11 18:04:01 +01:00
Matthew Hodgson
201caed773
fix rubberband bounce on OSX and iOS
2015-10-11 17:50:24 +01:00
Matthew Hodgson
9be98058b7
fix horizontal overscroll
2015-10-11 17:50:16 +01:00
Matthew Hodgson
ba0ae5ba59
various cosmetic fixes based on design feedback
2015-10-11 17:28:36 +01:00
Matthew Hodgson
9a8a9a4ce4
track RHS collapse state, and implement a basic responsive design
2015-10-11 16:09:46 +01:00
Matthew Hodgson
b05f3343e2
tooltipize BottomLeftMenu too for consistency
2015-10-11 15:00:43 +01:00
Matthew Hodgson
ae506b5b1f
fix cursor for unhide LHS button
2015-10-11 13:56:25 +01:00
Matthew Hodgson
93de2307c1
improve collapsed LHS implementation - split the tooltip into its own component; position it with javascript as overflow-y + position absolute = clipping hell; preserve the collapse state between MatrixChat re-renders; fix positioning of the 'show' button; switch to dispatcher for show/hide LHS; remove errant scrollbars
2015-10-11 13:54:38 +01:00
Matthew Hodgson
8bdb5c0745
implement right panel collapsing more correctly too
2015-10-11 02:25:26 +01:00
Matthew Hodgson
47ed8971e3
implement collapsible leftpanel at last
2015-10-11 02:09:14 +01:00
Steven Hammerton
a8d51cdf58
Add support for CAS auth
2015-10-10 18:52:44 +01:00
David Baker
93f266a4fa
Update to new memberlist api and hopefully sort out presence (list wasn't being re-sorted at the right time)
...
Hopefully fix #11
2015-10-09 17:26:28 +01:00
David Baker
aed1fe9bf1
Merge branch 'master' into develop
2015-10-09 16:40:27 +01:00
David Baker
7296cbfd5b
Spellig
2015-10-09 16:38:37 +01:00
David Baker
023034ce4f
Check for existence of content.size. Fixes #201 .
2015-10-09 16:28:51 +01:00
David Baker
c68ef38399
Use ChangeDisplayNname / ChangeAvatar widgets to prompt for display name & avatar at signup.
...
Fixes #7 .
2015-10-09 11:56:16 +01:00
David Baker
ccc5f30c9b
Get the vector 'ongoing conference' bar back (vector now needs a custom RoomView for this: it would be nice it it didn't)
2015-10-08 15:22:16 +01:00
David Baker
c22442f6d1
Add ChangeDisplayName component and use it
2015-10-07 18:44:07 +01:00
David Baker
fca65a8cdb
Show invited members separately.
...
May not be the final look.
Fixes #6
2015-10-06 15:09:42 +01:00
David Baker
807e947146
Add spinner for inviting. Fixes #13 .
2015-10-06 14:12:45 +01:00
David Baker
85636ccdad
Show end call button in states other than connected and ringback: it's perfectly valid to want to end the call at other times.
...
Fixes #9
2015-10-05 16:29:07 +01:00
David Baker
df39c3a281
Changes from PR feedback
2015-10-02 16:44:35 +01:00
David Baker
2247d951d6
Add config file for default hs/is urls
2015-10-02 11:48:52 +01:00
David Baker
c687f32f39
Port over custom vector roomlist controller with mini callview
2015-10-01 10:46:42 +01:00
David Baker
3845a989f6
Get conf calling working, apart from the end call button showing in the right room.
2015-09-30 18:22:15 +01:00
David Baker
94a6f856d1
Use the new interface for providing conf call functionality. Doesn't shoe it in the right room yet.
2015-09-30 16:52:45 +01:00
David Baker
7d540572fd
Update for new default avatar API.
2015-09-28 17:06:39 +01:00
David Baker
c3f32b74e4
Some missed '/' / '.' replacemement
2015-09-28 14:48:07 +01:00
David Baker
588dbf5693
reskindex
2015-09-28 11:34:11 +01:00
David Baker
91c0df4450
Merge branch 'master' into reactsdk-unfork
2015-09-28 11:32:40 +01:00
David Baker
f778f6adf9
Remove unused stuff
2015-09-25 15:33:38 +01:00
David Baker
409697b35b
Oops, these were just at the wrong scope
2015-09-25 11:46:06 +01:00
David Baker
b11abae8e8
More fixing up of paths, requires etc
2015-09-22 19:09:23 +01:00
David Baker
7e72ee891a
More fixing up of vector skin
2015-09-22 18:49:04 +01:00
David Baker
40594fc5fa
Fix up controller requires
2015-09-22 18:17:19 +01:00
David Baker
148dbc23ed
Rename base skin to vector
2015-09-22 18:05:55 +01:00