OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
1,077 Commits
219 Branches
563 Tags
474 MiB
Commit Graph

1077 Commits (8ecf70dda0fbbaf21e07a9c10edc2aab0c685872)

Author SHA1 Message Date
Matthew Hodgson 8ecf70dda0 show images with unknown height - fixes issue 475 hopefully 2015-12-09 13:24:15 +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
Richard van der Hoff 1d97a5f06b Merge pull request #470 from vector-im/rav/olm 
HOWTO encryption
 2015-12-08 16:03:54 +00:00
Richard van der Hoff f8e5bbef0b Add a link to E2E bug in the README 2015-12-08 16:03:12 +00:00
Matthew Hodgson b532fd046a actually use SVGs - oops 2015-12-08 10:28:00 +00:00
Matthew Hodgson a8e24802ab rename icons to avoid namespace clash with /icons 2015-12-08 10:27:42 +00:00
Kegsay 862ab0c115 Merge pull request #477 from vector-im/kegan/resending 
Make unsent messages behave better
 2015-12-07 17:00:30 +00:00
Kegan Dougal 2f905e13e1 Invoke onFinished so the context menu doesn't hang around 2015-12-07 16:04:46 +00:00
Kegan Dougal 39778330b5 Also allow not_sent messages to be cancelled entirely. 2015-12-07 13:55:10 +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 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
Richard van der Hoff 759e35003b Put some warnings on the crypto stuff 2015-12-04 15:39:39 +00:00
Richard van der Hoff 97dd4e2e6b Merge branch 'develop' into rav/olm 
Conflicts:
	webpack.config.js
 2015-12-03 18:28:50 +00:00
Richard van der Hoff 56b7b65920 Notes on building a crypto-enabled version 2015-12-03 18:25:20 +00:00
Richard van der Hoff 782174069c Include olm in the webpack if it's been installed 
.. to make it easy to build a crypto-enabled vector
 2015-12-03 18:24:34 +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