63695 Commits

Author SHA1 Message Date
David Baker 735c298de3 Merge branch 'release-v0.8.4' into develop 2016-11-02 12:01:30 +00:00
David Baker db07ef7899 Update readme to point to github releases
not /packages
2016-11-02 12:01:01 +00:00
David Baker 03caaeef07 Back to develop js-sdk & react-sdk 2016-11-02 11:47:30 +00:00
David Baker 91793a7a8e v0.8.4-rc.2 2016-11-02 11:40:04 +00:00
David Baker 7323ae5bf5 Prepare changelog for v0.8.4-rc.2 2016-11-02 11:40:04 +00:00
David Baker d04cc03c1c Take version from first arg, if given 2016-11-02 11:38:11 +00:00
David Baker 4fb273284d v0.8.4-rc.1 2016-11-02 11:17:36 +00:00
David Baker 3bfdbad5ba Prepare changelog for v0.8.4-rc.1 2016-11-02 11:17:36 +00:00
David Baker 890751951c Released js-sdk & react-sdk 2016-11-02 11:11:40 +00:00
David Baker f2e59f1bd3 matrix-js-sdk dep back to develop 2016-11-02 11:10:20 +00:00
David Baker a8a6a9d73d v0.7.5-rc.1 2016-11-02 11:08:02 +00:00
David Baker 6cd55e0811 Prepare changelog for v0.7.5-rc.1 2016-11-02 11:08:02 +00:00
David Baker 2cb9e606be Use released js-sdk 2016-11-02 11:03:52 +00:00
David Baker ba7e02c3b1 Merge pull request #2528 from vector-im/dbkr/package_is_now_dist
Rename the package script/output dir to 'dist'
2016-11-01 15:48:06 +00:00
David Baker 622ab27254 gitignore dist 2016-11-01 15:35:41 +00:00
Richard van der Hoff a6417c287f Merge pull request #530 from matrix-org/dbkr/no_pack_world
Explicitly list files in package.json
2016-11-01 15:27:21 +00:00
David Baker f17e851435 Rename the package script/output dir to 'dist'
To match conventions from other projects and match the release
script which expects releasde artefacts in dist/
2016-11-01 15:22:06 +00:00
David Baker ce19739899 Remove .npmignore as it's superseeded by 'files'
And also seems to be out of date anyway
2016-11-01 15:16:49 +00:00
David Baker 3e8fcac303 Explicitly list file sin package.json
To avoid publishing whatever happens to be in the working copy.

Equivalent of https://github.com/vector-im/vector-web/pull/2516
for react-sdk.
2016-11-01 15:15:31 +00:00
David Baker 9e69b48762 Merge pull request #529 from matrix-org/rav/fix_codestyle_quoting
Fix some markdown in the code style doc
2016-11-01 13:13:22 +00:00
Richard van der Hoff 86a24fb5de Fix some markdown ih the code style doc 2016-11-01 11:33:06 +00:00
Matthew Hodgson 8349ea4b0e fix code style for ES6 classes 2016-11-01 10:58:56 +00:00
Richard van der Hoff 5e84a6c39e Merge pull request #2518 from vector-im/rav/ignore_olm_if_missing
Avoid errors if olm is missing
2016-10-27 10:28:27 +01:00
Richard van der Hoff a86f2720bc Avoid errors if olm is missing
If olm isn't installed, webpack prints out scary warnings (though it still
actually succeeds). Let's avoid scaring people by quietly removing it from the
list of things to process.
2016-10-27 10:16:10 +01:00
David Baker a53c1958eb Merge pull request #527 from matrix-org/dbkr/highlight_async
Run highlight.js asynchronously
2016-10-27 09:57:23 +01:00
David Baker 974e4c05c8 Merge pull request #528 from matrix-org/rav/fix_tinting
Fix room tinting
2016-10-27 09:57:00 +01:00
Richard van der Hoff 6246fdee7c Fix room tinting
Looks like the cachebuster stuff in
https://github.com/vector-im/vector-web/pull/2515 broke room tinting. Add a
fix, along with some ranting.
2016-10-26 23:11:34 +01:00
David Baker 8cf273a460 Run highlight.js asynchronously
Move the very minimal logic of highlightDOM into TextualBody
because then we can avoid scheduling a lot of timeouts which
would ultimately do nothing (ie. any messages that don't have code
blocks).
2016-10-26 18:41:28 +01:00
Richard van der Hoff b174d49f9d Merge pull request #2515 from vector-im/rav/cache_busting
Put a cachebuster in the names of CSS and JS files
2016-10-26 16:58:27 +01:00
Richard van der Hoff 31ed719df1 webpack: Improve comment on HtmlWebpackPlugin 2016-10-26 16:52:26 +01:00
Richard van der Hoff c19538d6ce Merge branch 'develop' into rav/cache_busting 2016-10-26 16:50:45 +01:00
Richard van der Hoff 3adf5fe3fd Merge pull request #2517 from vector-im/rav/upgrade_olm
Bump to olm 2.0.0
2016-10-26 16:50:22 +01:00
Richard van der Hoff bd0e121f0e Merge pull request #2516 from vector-im/rav/no_pack_world
Don't include the world in the published packages
2016-10-26 16:48:22 +01:00
Richard van der Hoff de1f7861d6 Bump to olm 2.0.0 2016-10-26 16:20:42 +01:00
David Baker 8395717f9b Merge pull request #525 from matrix-org/dbkr/fix_spin_on_join
Fix CPU spin on joining rooms
2016-10-26 15:46:42 +01:00
Richard van der Hoff 5a58c8bda4 Don't include the world in the published packages
We ended up including all sorts of stuff in our published packages. Let's take
the opposite approach and include useful stuff rather than exclude unuseful
stuff.
2016-10-26 15:35:54 +01:00
David Baker 32ebd8083b Stray comma 2016-10-26 15:32:09 +01:00
Richard van der Hoff 6396c60645 Put a cachebuster in the names of CSS and JS files
This means that clients can do better caching of assets, as it will mean we are
no longer reliant on etags to ensure that clients get a fresh version.

We inhibit the cachebuster for `npm start`, so that we don't get millions of
copies of the bundles on dev boxes.
2016-10-26 15:20:59 +01:00
Richard van der Hoff f700bb4efa Merge pull request #2514 from vector-im/rav/webpack_olm
Use webpack to copy olm.js
2016-10-26 15:18:27 +01:00
Richard van der Hoff 53e5894759 Merge branch 'develop' into rav/webpack_olm 2016-10-26 15:13:57 +01:00
Richard van der Hoff 8fe05fdff3 Correct path to components.css
Fix failure to find components.css which was introduced in e1919c5
(https://github.com/vector-im/vector-web/pull/2513)
2016-10-26 15:02:34 +01:00
David Baker e002575eae Merge pull request #2513 from vector-im/rav/no_bundle_components_css
Don't include two copies of the CSS in the tarball
2016-10-26 14:52:29 +01:00
Richard van der Hoff b37ba90a38 Merge pull request #526 from matrix-org/dbkr/prevent_read_receipt_exception_logout
Don't send read receipt if user has logged out
2016-10-26 14:46:43 +01:00
Richard van der Hoff e1919c5ea3 Don't include two copies of the CSS in the tarball
Aggregate our CSS into build/components.css instead of vector/components.css, so
that it isn't included in the tarball.
2016-10-26 14:43:42 +01:00
Richard van der Hoff fcf683c8a7 Use webpack to copy olm.js
Rather than copying olm.js ourselves in package.json, get webpack to do it for
us by declaring it as a second entry point.
2016-10-26 14:29:21 +01:00
David Baker e5a770a373 Don't send read receipt if user has logged out 2016-10-26 13:19:36 +01:00
David Baker a2eb0a9cf0 Fix CPU spin on joining rooms
Ratelimit roomheader's updates and move some other things into
rate limited functions.
2016-10-26 13:09:53 +01:00
Richard van der Hoff e564d34ca8 Merge pull request #2512 from vector-im/dbkr/firefox_roomdir_align
Correct text alignment on room directory search
2016-10-26 10:49:59 +01:00
David Baker 61d7db6eb6 Correct text alignment on room directory search
Seemed to only be broken on firefox
2016-10-26 10:35:46 +01:00
Richard van der Hoff 5768f73bbd Merge pull request #2510 from vector-im/dbkr/ref-is-not-rel
Correct spelling of 'rel'
2016-10-25 14:51:30 +01:00