Aviral Dasgupta
b2459b2dc6
Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte
2016-06-10 04:43:06 +05:30
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
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
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
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
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
8a9c85c97d
fix wording
2016-05-16 23:00:17 +01:00
Matthew Hodgson
8fb521c83c
302 android to play store
2016-05-13 17:14:01 +01:00
Matthew Hodgson
8467d5d760
302 to iTunes if you don't have the app installed
2016-05-11 01:48:02 +02:00
Richard van der Hoff
a0b460b084
Include react-addons-perf for non-production builds
...
This makes it possible to gather a few performance stats
2016-04-19 15:01:24 +01:00
Richard van der Hoff
035b15f330
Moar debug for ff session restore issue
2016-04-13 22:18:26 +01:00
Richard van der Hoff
77355cbeb4
Add some debug to help with FF restore bug
...
(https://github.com/vector-im/vector-web/issues/1354 )
2016-04-13 21:01:24 +01:00
Richard van der Hoff
090db5490b
URI-decode the hash-fragment
...
It looks like % characters in the hash-fragment are meant to be interpreted as
a URI-encoding, so we should decode them.
2016-03-23 15:58:00 +00:00
Mark Haines
31915db6f6
Remove trailing whitespace
2016-03-15 18:38:24 +00:00
David Baker
a063efe250
Remove no-longer accurate comment.
2016-02-23 10:57:50 +00:00
David Baker
45c8500f28
Pass through params for other URLs (in this case, for keypair invite signing urls)
2016-02-23 10:22:22 +00:00
Matthew Hodgson
155728b136
make babel actually do full ES6 emulation for Safari 8
2016-02-10 14:54:55 +00:00
David Baker
1732805f31
Always parse the hash of a URL as we do elsewhere by looking for a query string part, otherwise we end up passing the query into showscreen which then spreads havok.
2016-02-10 13:45:24 +00:00
Kegan Dougal
b307a6d64e
Invoke onVersion when we know the current version even if there is no new version (for settings)
2016-02-03 16:50:05 +00:00
Kegan Dougal
5eed734325
Add a version update checker and NewVersionBar to show on the UI.
2016-02-03 16:16:14 +00:00
Matthew Hodgson
68f846e129
Merge branch 'develop' into matthew/roomsettings2
2016-01-13 17:33:32 +00:00
Matthew Hodgson
fc3f356dc0
GA
2016-01-12 01:23:39 +00:00
Kegan Dougal
1a8a4728cd
Enable guest access. Show r/w icons on room directory.
2016-01-07 14:43:12 +00:00
Matthew Hodgson
df111223fc
copyrights for 2016
2016-01-07 04:17:56 +00:00
Kegan Dougal
63d0477223
Pass through the starting query params from the URL
2015-12-17 15:01:07 +00:00
David Baker
939733b736
Merge branch 'develop' into require-css
2015-12-02 10:26:26 +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
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
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
6f646260aa
WIP of component indexing update
2015-11-30 17:31:32 +00:00
Matthew Hodgson
2cae5e7a00
revert bad fix to managing history
2015-11-11 02:31:37 +01:00
Matthew Hodgson
2c9273a86c
avoid the initial sync from clobbering the location bar
2015-11-11 02:00:51 +01:00
Matthew Hodgson
87bb7c9b7b
upgrade to react 0.14
2015-11-09 23:13:46 +00:00
Steven Hammerton
fdf79d709e
Replace CAS login with token login
2015-11-06 11:22:59 +00:00
Kegan Dougal
511b1f409c
Add objectfit and localstorage to browser features
2015-10-29 15:56:03 +00:00
Kegan Dougal
22369729f9
Remove test feature
2015-10-28 17:42:19 +00:00
Kegan Dougal
59d8cbe742
Use Modernizr to check for browser compatibility
...
Add a CompatibilityPage which is shown for incompatible clients. If they
continue on regardless, proceed as if it never happened.
2015-10-28 17:39:50 +00:00
Steven Hammerton
293ee1bbcb
Fix typo in comment and remove console.log leftover from debugging
2015-10-12 17:41:56 +01:00
Steven Hammerton
f5039ac9af
Use node querystring module to parse query string like name value pairs from fragment
2015-10-12 10:27:21 +01:00
Steven Hammerton
a8d51cdf58
Add support for CAS auth
2015-10-10 18:52:44 +01:00
David Baker
490e56bfbb
Improved url / hash change handling
2015-10-05 15:32:34 +01:00
David Baker
94a6f856d1
Use the new interface for providing conf call functionality. Doesn't shoe it in the right room yet.
2015-09-30 16:52:45 +01:00
David Baker
f020f4397c
Switch to webpack
...
Webapck actually supports loading input source maps and generally seems a lot
more solid then browserify (even if their website has an annoying animated
logo).
2015-09-25 11:43:28 +01:00