gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,136 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

434 Commits

Author SHA1 Message Date
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