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

1062 Commits

Author SHA1 Message Date
David Baker 25eeaaf1e5 Use UnreadStatus to determine whether an event affects a room;s unread status. Unify rooms going bold with their sort order and don't go bold for m.notify. 2015-12-04 16:24:17 +00:00
Kegan Dougal ac8fcbb264 Force update the RightPanel when the member in MemberInfo is updated. 2015-12-04 16:16:41 +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
Matthew Hodgson de144cf4cd uh, actually include Open Sans webfont :-/ 2015-12-02 15:13:41 +00:00
David Baker 8df62e3b02 Merge pull request #454 from vector-im/require-css 
Build CSS with webpack
 2015-12-02 10:26:41 +00:00
David Baker 939733b736 Merge branch 'develop' into require-css 2015-12-02 10:26:26 +00:00
Kegsay 6db1151699 Merge pull request #453 from vector-im/kegan/vector-references 
Add vector-specific branded components
 2015-12-02 09:38:39 +00:00
Kegan Dougal 0210670e91 Merge branch 'develop' into kegan/vector-references 
Conflicts:
	src/component-index.js
 2015-12-02 09:37:28 +00:00
Kegan Dougal d837d02ac9 Still add highlight.js as an import as we symlink directly to the node_module for github.css :/ - Fixes ENOENT 2015-12-02 09:26:12 +00:00
Matthew Hodgson cba27a7488 erm, surely we need to actually run reskindex after all that? 2015-12-02 01:37:26 +00:00
Matthew Hodgson 349a88d640 stop clobbering our font colours 2015-12-01 21:44:22 +00:00
David Baker 95e71a531e Merge branch 'develop' into kegan/vector-references 
Update having merged skindexing PR
 2015-12-01 18:31:13 +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
Kegan Dougal e21d435d84 Remove debug logging 2015-12-01 16:57:40 +00:00
Kegan Dougal a2b28b826c Add CustomServerDialog for vector 2015-12-01 16:48:51 +00:00
Kegan Dougal 8d31f72f83 Add VectorLoginHeader 2015-12-01 16:27:23 +00:00
Kegan Dougal e304a1925d Add VectorLoginFooter with vector references 2015-12-01 16:12:38 +00:00
Kegsay 819b80d30f Merge pull request #450 from vector-im/kegan/vector-components 
Move remaining Vector-only components to src/components
 2015-12-01 15:58:55 +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
Matthew Hodgson 2bc3b665d2 Merge pull request #445 from vector-im/matthew/new-font 
switch to Open Sans
 2015-12-01 10:59:05 +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 6a4038daeb Add 'replaces' tag to mark that the RoomDNDView is a RoomTile 2015-11-30 17:56:55 +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
Matthew Hodgson 4409f07c2e oops, don't try to delete nonexistent tags when moving a room from conversations to favs or similar 2015-11-30 15:49:27 +00:00
Kegan Dougal b89bd35cad Merge branch 'develop' into kegan/controller-merging4 2015-11-30 15:42:32 +00:00
Matthew Hodgson 4614017b8f Merge pull request #443 from vector-im/matthew/rename-message-components 
Matthew/rename message components
 2015-11-30 15:36:50 +00:00
Matthew Hodgson 7636645efc rename message components as per RL discussion this morning 2015-11-30 15:25:21 +00:00