Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,659 Commits 206 Branches 552 Tags 518 MiB
ab1f37b0bb
Commit Graph

1659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aviral Dasgupta
ab1f37b0bb Merge pull request #1 from pferreir/pr/1553 
Basic Markdown highlighting
 2016-06-12 04:55:05 +05:30
Pedro Ferreira
eb37032d8a Markdown: styles for bold/italics 2016-06-12 01:04:22 +02:00
Aviral Dasgupta
f6ed21559a RTE mode switch styling & cleanup 2016-06-11 15:54:43 +05:30
Aviral Dasgupta
b2459b2dc6 Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte 2016-06-10 04:43:06 +05:30
Aviral Dasgupta
819e06e2cd MessageComposer styling for Draft 2016-06-10 04:41:59 +05:30
David Baker
b7f1a3db57 gitignore config.json now it isn't versioned 2016-06-09 18:51:25 +01:00
Richard van der Hoff
c4b7571c45 Merge pull request #1612 from vector-im/dbkr/optional_config 
Make the config optional
 2016-06-09 10:40:58 +01:00
Richard van der Hoff
4dd477e064 index.js: fix comment typo 
Fix dave's typo for him
 2016-06-09 10:38:51 +01:00
David Baker
f595f6f141 This check shouldn't be here with the || 2016-06-09 10:25:49 +01:00
David Baker
24602119c5 This doesn't actually need to be global 
(because the rendering isn't in a render method here)
 2016-06-09 09:59:37 +01:00
David Baker
3040d0a474 Comment typo 2016-06-09 09:57:44 +01:00
David Baker
e4ea00ca23 Return here, else we'll call resolve too 2016-06-09 09:56:57 +01:00
David Baker
4fc311da90 Style fix 2016-06-09 09:56:11 +01:00
Richard van der Hoff
7894e52529 Merge pull request #1610 from vector-im/rav/device_verification 
CSS support for device verification
 2016-06-08 21:37:35 +01:00
Richard van der Hoff
7999a70cab Switch to dev versions of react-sdk and js-sdk 2016-06-08 21:36:45 +01:00
David Baker
f6aa9a7ea4 Make the config optional 
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
 2016-06-08 18:46:21 +01:00
David Baker
b3ae9cc9d4 Merge pull request #1609 from vector-im/dbkr/SdkConfig 
Don't use SdkConfig
 2016-06-08 17:34:18 +01:00
Richard van der Hoff
5f29729e82 Make unverified encrypted events red and verified ones green 2016-06-08 17:03:54 +01:00
Richard van der Hoff
e24851456a CSS for the MemberDeviceInfo view 2016-06-08 17:03:28 +01:00
David Baker
1e40fd750f Don't use SdkConfig 
instead take brand from a prop
 2016-06-08 14:55:47 +01:00
Richard van der Hoff
ed1554f4af index.js: fix wording in android popup 2016-06-07 22:01:56 +01:00
David Baker
c6cf5febd5 Merge pull request #1516 from vith/static-config-json 
serve config.json statically instead of bundling it
 2016-06-06 19:15:35 +01:00
David Baker
f9aaf7d903 Use the SdkConfig interface 
rather than pulling in config.json directly.

json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
 2016-06-06 19:13:30 +01:00
Matthew Hodgson
c672919d1e 0.7.3 2016-06-03 12:20:05 +01:00
Matthew Hodgson
7ab2449ac1 Prepare changelog for v0.7.3 2016-06-03 12:20:04 +01:00
Matthew Hodgson
e68a2b5e1d pin to react sdk 0.6.3 for release 2016-06-03 12:19:04 +01:00
Matthew Hodgson
ddc4ac187c dep on react-sdk develop 2016-06-02 23:32:47 +01:00
Matthew Hodgson
ded66bbdfc 0.7.2 2016-06-02 19:05:50 +01:00
Matthew Hodgson
1a11c402fa Prepare changelog for v0.7.2 2016-06-02 19:05:50 +01:00
Matthew Hodgson
4ec77eeca7 correctly bump dep on js-sdk and react-sdk 2016-06-02 19:04:22 +01:00
Matthew Hodgson
635fd927cd 0.7.1 2016-06-02 18:41:20 +01:00
Matthew Hodgson
481a7b160d Prepare changelog for v0.7.1 2016-06-02 18:41:20 +01:00
David Baker
cadedd2919 Revert presumably accidentally comitted config.json 2016-06-02 14:24:36 +01:00
Richard van der Hoff
e0bf23fa7c 0.7.0 2016-06-02 13:42:25 +01:00
Richard van der Hoff
a53acb3b58 Prepare changelog for v0.7.0 2016-06-02 13:42:24 +01:00
Richard van der Hoff
f6ec858ac9 Bump js-sdk and react-sdk for new releases 
js-sdk 0.5.3
react-sdk 0.6.0
 2016-06-02 13:40:15 +01:00
Matthew Hodgson
d976046e6a set email branding whenever emails are added from vector 2016-06-02 13:15:13 +01:00
Matthew Hodgson
1902b631c7 add default branding parameter for email notifs 2016-06-02 11:45:23 +01:00
Matthew Hodgson
dda2129354 Merge pull request #1557 from aviraldg/feature-style-selection 
Style selection color.
 2016-05-28 16:30:53 +01:00
Aviral Dasgupta
12157edd62 Style selection color 2016-05-28 12:20:21 +05:30
Aviral Dasgupta
7e563b89c7 initial version of rich text editor 2016-05-27 10:17:01 +05:30
Jason Papakostas
6a6118e136 serve config.json statically instead of bundling it 
issue #1344
 2016-05-24 19:08:09 -05:00
Matthew Hodgson
bede9a814b remove spurious top border; fix #1472 2016-05-24 00:30:36 +01:00
Matthew Hodgson
d70842c3c7 fix padding of badges 2016-05-24 00:29:48 +01:00
Matthew Hodgson
d8c32db14b typos 2016-05-17 20:24:01 +01:00
Matthew Hodgson
2b3606d44d switch to lozenges, and improve overlap behaviour 2016-05-17 19:52:56 +01:00
Matthew Hodgson
5feb31911a better collapsed look & feel 2016-05-17 11:19:04 +01:00
Matthew Hodgson
9483e42508 switch from dots to per-room badges 2016-05-17 11:14:30 +01:00
Matthew Hodgson
e640f65640 add close button to room search filter 2016-05-16 23:36:52 +01:00
Matthew Hodgson
8a9c85c97d fix wording 2016-05-16 23:00:17 +01:00