OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,266 Commits
206 Branches
552 Tags
439 MiB
Commit Graph

155 Commits (93e4a041181fb26449e41e7cffb9a7b046b78ddc)

Author SHA1 Message Date
David Baker 99b0f9eb7c Back to develop 2016-09-21 17:33:27 +01:00
David Baker 5248bdd974 0.8.1 2016-09-21 17:30:41 +01:00
David Baker 2639d10f97 Pin to released js-sdk & react-sdk 2016-09-21 17:29:44 +01:00
David Baker cc5c636fa5 Back to develop versions 2016-09-21 12:03:59 +01:00
David Baker c4a2df75eb 0.8.0 2016-09-21 12:02:41 +01:00
David Baker 3eed711b34 Use released versions 2016-09-21 12:01:59 +01:00
Mark Haines f6fb1561d7 Update the version of olm to 1.3.0 2016-09-15 11:33:37 +01:00
Aviral Dasgupta d65b791b2b bump draft-js to 0.8.1 (as with matrix-react-sdk) 2016-09-12 18:31:22 +05:30
Richard van der Hoff 31dd49ffd7 Bump to olm 1.2.0 2016-09-06 22:33:21 +01:00
Matthew Hodgson 0494dff545 Merge branch 'master' into develop 2016-09-02 17:23:02 +01:00
Matthew Hodgson e63e6e7016 0.7.5-r3 2016-09-02 17:21:30 +01:00
Matthew Hodgson dec62ab92c bump react-sdk 2016-09-02 17:20:23 +01:00
Richard van der Hoff 6c8a492637 Bump to olm 1.1.0 
Olm 1.0.0 made broken OlmAccounts.
 2016-09-02 12:01:27 +01:00
Matthew Hodgson 9709a38250 merge master 2016-09-01 22:38:40 +01:00
Matthew Hodgson 06ca94c1e6 0.7.5-r2 2016-09-01 22:29:36 +01:00
Matthew Hodgson a20962ac14 bump to react-sdk v0.6.5-r1 2016-09-01 22:28:39 +01:00
Richard van der Hoff a2694113d3 Merge pull request #2009 from vector-im/rav/enable_react_checks 
Turn react consistency checks back on in develop builds
 2016-08-30 14:57:49 +01:00
Matthew Hodgson c7eba0f292 repin deps to dev 2016-08-30 13:52:35 +01:00
Matthew Hodgson 5f233d75f2 0.7.5-r1 2016-08-28 18:09:20 +01:00
Matthew Hodgson 45c013f2f2 0.7.5 2016-08-28 18:07:33 +01:00
Matthew Hodgson ef8f9ecbf3 pin matrix-js-sdk and matrix-react-sdk deps for release 2016-08-28 17:36:57 +01:00
Matthew Hodgson abca5faf78 pin linkifyjs to precisely 2.0.0-beta4, as 2.0.0-beta9 breaks links as per https://github.com/vector-im/vector-web/issues/2010 2016-08-25 18:30:35 +01:00
Richard van der Hoff 21ffe22375 Turn react consistency checks back on in develop builds 
The react checks are useful on /develop, to catch programming errors earlier,
and the original reason for turning them off (so that we could meaningfully
compare performance between /develop and /beta) is no longer so
relevant.

This reverts commit b5f029d10e.
 2016-08-25 17:06:12 +01:00
Richard van der Hoff 4c9ade5ecb Use cpx to copy olm.js, and add watcher 
We are now using `cpx` to copy the emojione files, so we might as well use it
for olm.js, rather than rolling our own - particularly since that makes it easy
to add a watcher for `npm start`.

We have to add a `-L` to the `cpx` invocation, otherwise, if olm is a
symlink (as is useful for development), cpx ends up watching the symlink, which
obviously never changes.
 2016-08-15 12:16:08 +01:00
Richard van der Hoff 1d435890af Unpin react-sdk and js-sdk 2016-08-15 12:15:24 +01:00
Richard van der Hoff 8a2b2daad7 Revert "Unpin react-sdk and js-sdk" 
I messed this up and removed staticfiles.js by accident

This reverts commit 21334cab28.
 2016-08-15 12:13:58 +01:00
Richard van der Hoff 21334cab28 Unpin react-sdk and js-sdk 2016-08-15 12:11:35 +01:00
David Baker 0afdf5d8e4 Merge pull request #1959 from vector-im/rav/device_display_name 
Make up a device display name
 2016-08-12 11:48:12 +01:00
Richard van der Hoff 3a819a29b7 Make up a device display name 
Pass a default device name into react-sdk
 2016-08-12 11:01:39 +01:00
David Baker 9d77fab18f 0.7.4-r1 2016-08-12 10:11:40 +01:00
David Baker 5512fd4220 Bump to matrix-react-sdk 0.6.4-r1 2016-08-12 10:09:53 +01:00
David Baker 25d8a7999f 0.7.4 2016-08-11 17:47:17 +01:00
David Baker 2b671fcafc js-sdk & react sdk released 2016-08-11 17:45:10 +01:00
Aviral Dasgupta 19d5063814 Merge branch 'develop' into fix-emoji 2016-08-11 14:51:17 +05:30
Aviral Dasgupta bd9f5d3e06 Various fixes and improvements to emojification. 
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
 2016-08-09 21:44:09 +05:30
Richard van der Hoff 51b74251f9 Exclude olm from the webpack 
Olm takes *ages* to webpack, and it doesn't compress well. So, serve it as a
separate asset to the browser.
 2016-08-02 12:44:23 +01:00
Richard van der Hoff 4b33164ab6 Remove relayoutOnUpdate prop on gemini-scrollbar 
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
 2016-07-27 11:41:27 +01:00
Richard van der Hoff 53fe372a0c Bump to react 15.2.1 
This should also stop npm complaining about invalid peerDependencies.
 2016-07-22 10:47:09 +01:00
Richard van der Hoff 4cb04d1e40 Bump to latest react-gemini-scrollbar 
I've updated our forks of the gemini-scrollbar project to latest upstream.
 2016-07-22 10:46:38 +01:00
Richard van der Hoff 3e53879adc Bump to olm 1.0.0 
Fixes https://github.com/vector-im/vector-web/issues/1719
 2016-07-11 14:53:51 +01:00
Richard van der Hoff 4c6fa740f3 package.json: add olm as optionalDependency 
Add olm as an optionalDependency to vector, so that the webpack config can find
it and include it in the bundle.
 2016-06-20 15:10:19 +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
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 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
Matthew Hodgson c672919d1e 0.7.3 2016-06-03 12:20:05 +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 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