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

3217 Commits

Author SHA1 Message Date
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
Kegsay ce33c8cdf6 Merge pull request #258 from vector-im/desktop-notification-spam 
Add a tag to notifications so they can clobber.
 2015-10-27 09:17:45 +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
David Baker 9217ae8fbb Fix event listener leak 2015-10-26 10:30:12 +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 731881ee7b fix language 2015-10-25 12:35:52 +00:00
Matthew Hodgson e580cb809d spell out how to set up the deps when developing 2015-10-25 12:33:23 +00:00
Matthew Hodgson 47dca51c38 spell out how to set up the deps when developing 2015-10-25 12:33:13 +00:00
Matthew Hodgson 1ecf0f0183 Merge branch 'develop' of git+ssh://github.com/vector-im/vector-web into matthew/redesign 2015-10-25 11:57:35 +00:00
Matthew Hodgson 5844fb4020 spell out that developers need to use npm link 2015-10-25 11:56:29 +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