Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,581 Commits 3 Branches 492 Tags 100 MiB
dea012f460
Commit Graph

3581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
42b7410a5d Merge pull request #1652 from vector-im/rav/fix_karma_olm_warning 
Karma: fix warning by ignoring olm
 2016-06-16 11:16:00 +01:00
Richard van der Hoff
4cfcdfa040 Merge pull request #1639 from vector-im/dbkr/fix_peeking 
Update for react-sdk dbkr/fix_peeking branch
 2016-06-16 11:13:29 +01:00
Richard van der Hoff
795986f146 Karma: fix warning by ignoring olm 
If olm is not installed, the webpack build for the karma tests gives an ugly
error. None of the tests currently care if olm is installed or not, so fix this
for now by just ignoring the olm module.
 2016-06-16 07:41:34 +01:00
Richard van der Hoff
d38c338f89 Merge pull request #1641 from vector-im/dbkr/update_readme 
Update README.md
 2016-06-15 17:10:02 +01:00
David Baker
a373849b5b Give better instructions for modifying config. 2016-06-15 11:03:52 +01:00
Richard van der Hoff
8cd4637316 Merge pull request #1643 from vector-im/dbkr/fix_karma 
Fix karma tests
 2016-06-14 16:38:14 +01:00
David Baker
0635a6f562 Fix karma tests 
As we now use draft-js: https://github.com/facebook/fbjs/issues/133#event-617440260
 2016-06-14 16:32:07 +01:00
David Baker
a8cee87c08 js-sdk doesn't have a build step 2016-06-14 15:53:13 +01:00
David Baker
a7598ea815 Mention copying sample file here too 2016-06-14 15:52:03 +01:00
David Baker
22cef7a6a0 Copy config.json first 2016-06-14 15:41:55 +01:00
David Baker
e507339324 Merge pull request #1553 from aviraldg/feature-rte 
Rich Text Editor
 2016-06-14 15:27:35 +01:00
David Baker
b643d8ff6a Update README.md 
To reflect the fact that you can now sensibly deploy from a package (ie. be able to configure the app). Make the first thing be downloading a prebuilt package so people who only read the first part don't end up running npm start in production and complain about needing npm.
 2016-06-14 15:12:35 +01:00
David Baker
3547bd8d00 Update for react-sdk dbkr/fix_peeking branch 
With the react-sdk update, this does nothing functionally since the room ID would just
have been ignored, but update this to correctly supply only one of ID/alias.
 2016-06-14 13:02:34 +01:00
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
Richard van der Hoff
a5986ade51 Merge pull request #1615 from vector-im/dbkr/directory_join_by_alias 
Fix RoomDirectory to join by alias whenever possible.
 2016-06-10 15:23:07 +01:00
David Baker
d7504aeda5 Switch to new view_room 2016-06-10 15:13:41 +01:00
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
David Baker
a030e46c69 Use join_room_by_alias in RoomDirectory 
This still doesn't actually cause the room to be joined by alias though, so still need to fix that
 2016-06-09 17:13:02 +01:00
David Baker
f61cfbc542 Fix RoomDirectory to join by alias whenever possible. 2016-06-09 16:41:01 +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
a2e73cceee Merge branch 'develop' into matthew/scalar 2016-06-06 10:24:39 +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