mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-20 21:52:04 +03:00
Code Issues Projects Releases Packages Wiki Activity
62688 commits 219 branches 562 tags 474 MiB
Commit graph

5074 commits

Author SHA1 Message Date
David Baker
bcb792a412 Released js-sdk 2017-10-16 14:41:23 +01:00
David Baker
f5397acfa1 v0.12.7-rc.3 2017-10-13 16:36:57 +01:00
David Baker
f555f2036e react-sdk rc.3 2017-10-13 16:35:41 +01:00
David Baker
3b2650e5ea Merge remote-tracking branch 'origin/develop' into release-v0.12.7 2017-10-13 16:33:55 +01:00
David Baker
3b515cdebe v0.10.7-rc.3 2017-10-13 16:31:35 +01:00
David Baker
b727944b11 Bump electron version 2017-10-13 16:27:01 +01:00
David Baker
adceda7588 v0.12.7-rc.2 2017-10-13 15:06:18 +01:00
David Baker
b3da206a92 react-sdk rc.2 2017-10-13 15:03:43 +01:00
David Baker
b95c2368a6 v0.10.7-rc.2 2017-10-13 15:02:37 +01:00
David Baker
f8554ca2f2 v0.12.7-rc.1 2017-10-13 11:15:41 +01:00
David Baker
64cfc9b717 js & react sdk rc.1 2017-10-13 11:13:54 +01:00
David Baker
9036f786e7 v0.10.7-rc.1 2017-10-13 11:10:21 +01:00
David Baker
289fc230fe js-sdk rc.1 2017-10-13 11:05:58 +01:00
Luke Barnard
6b9a2909df Add rule to enforce spacing in curly brackets in JSX children 
This required an updated in version of eslint-plugin-react to 7.4.0.
 2017-09-28 11:21:06 +01:00
David Baker
ef503cca11 Merge branch 'master' into develop 2017-09-21 21:56:58 +01:00
David Baker
2b7ee756f8 v0.12.6 2017-09-21 21:53:09 +01:00
David Baker
aaff9133c7 Newer js-sdk & react-sdk for js-sdk build fix 2017-09-21 21:49:43 +01:00
David Baker
78e806f7f9 Merge branch 'master' into develop 2017-09-21 21:48:08 +01:00
David Baker
3552f08aad v0.10.6 2017-09-21 21:47:28 +01:00
David Baker
daac0ebdc0 js-sdk v0.8.4 2017-09-21 21:43:35 +01:00
David Baker
50e6536195 Merge branch 'master' into develop 2017-09-21 18:11:46 +01:00
David Baker
fbccf22e00 v0.12.5 2017-09-21 18:08:17 +01:00
David Baker
dbd4cf8756 Clean on prepublish (#5097) 
Otherwise you can make broken releases on case insensitive file
systems
 2017-09-21 18:06:41 +01:00
David Baker
874e88c4a8 react-sdk v0.10.5 2017-09-21 18:05:22 +01:00
David Baker
c6e4f606f9 Merge branch 'master' into develop 2017-09-21 18:02:16 +01:00
David Baker
99e4221e61 v0.10.5 2017-09-21 18:01:42 +01:00
David Baker
a0b4d8a9f8 Clean on prerelease 
To avoid any further problems where we ship build files with the
wrong capitalisation because npm is dumb
 2017-09-21 17:39:34 +01:00
David Baker
2ea9fc3f9a v0.12.4 2017-09-20 15:19:10 +01:00
David Baker
d957f0cdd7 released js-sdk & react-sdk 2017-09-20 15:16:42 +01:00
David Baker
6c5f4983da v0.10.4 2017-09-20 15:13:20 +01:00
David Baker
22271ced0d released js-sdk 2017-09-20 15:09:14 +01:00
David Baker
ca50d1f04a v0.12.4-rc.1 2017-09-19 10:57:02 +01:00
David Baker
57851cd508 js-sdk & react-sdk rc.1 2017-09-19 10:54:35 +01:00
David Baker
620ca5f211 v0.10.4-rc.1 2017-09-19 10:50:34 +01:00
David Baker
d992d6937e js-sdk rc.1 2017-09-19 10:47:18 +01:00
David Baker
f148844573 Merge pull request #4989 from vector-im/t3chguy/on_copy_tooltip 
generic contextual menu for tooltip/responses
 2017-09-13 14:27:28 +01:00
Michael Telatynski
2316f4230e
install and use prop-types over React.PropTypes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-13 14:23:35 +01:00
David Baker
609d61d53c Revert "Implement sticky date separators" 2017-09-06 17:40:58 +01:00
David Baker
38575a653d Revert "Implement sticky date separators" 2017-09-06 17:36:43 +01:00
David Baker
8b250bda64 Merge branch 'master' into develop 2017-09-06 13:36:11 +01:00
David Baker
92d31a8890 v0.12.3 2017-09-06 13:32:33 +01:00
David Baker
e8dd7be8a3 matrix-react-sdk v0.10.3 2017-09-06 13:31:00 +01:00
David Baker
5dfd35f730 Merge branch 'master' into develop 2017-09-06 13:26:34 +01:00
David Baker
f5cf2aece2 v0.10.3 2017-09-06 13:25:58 +01:00
David Baker
b8d9276f29 Merge pull request #4939 from vector-im/luke/feature-sticky-date-separators 
Implement sticky date separators
 2017-09-05 14:16:21 +01:00
David Baker
c1e2ee8123 v0.12.3-rc.3 2017-09-05 13:43:40 +01:00
David Baker
17bf8cb4ab v0.12.3-rc.2 2017-09-05 13:15:56 +01:00
David Baker
32423654b4 new react-sdk rc 2017-09-05 13:13:58 +01:00
David Baker
c75bc42585 v0.10.3-rc.2 2017-09-05 13:13:02 +01:00
David Baker
3f8564f641 v0.12.3-rc.1 2017-09-01 16:22:24 +01:00
David Baker
c1fe3dff22 react-sdk v0.10.3 2017-09-01 16:19:08 +01:00
David Baker
c07362d7c1 v0.10.3-rc.1 2017-09-01 16:17:22 +01:00
Luke Barnard
88228a5a3f Implement sticky date separators 
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1353
 2017-08-30 14:06:50 +01:00
Luke Barnard
a29e7da06b Merge branch 'develop' into luke/feature-sticky-date-separators 2017-08-30 14:06:06 +01:00
Luke Barnard
d516906b36 Implement sticky date separators 
Use `react-sticky` to implement sticky date separators. This will pin a date separator to the top of the timeline panel when the separator scrolls out of the top of the view.

A known issue of this is that the spinner, which is in line with event tiles in the timeline, will appear to push the stuck date separator down. In reality the first date separator after the spinner is in line with event tiles and is not stuck because the spinner forces the timeline to be scrolled slightly further down than it would be otherwise. But also, date separators in the timeline (not "stuck") have a greater height.

Ideally the date separator would be suppressed whilst back paginating, but this will cause the stuck separator to flicker on and off. This is why the suppression has been removed.
 2017-08-30 13:52:46 +01:00
Richard Lewis
f39f2e525b Update parallelshell version. 2017-08-25 09:52:44 +01:00
Richard Lewis
52717ae486 Update parallelshell version. 2017-08-25 09:51:07 +01:00
David Baker
65f0bd04f2 v0.12.2 2017-08-24 14:53:02 +01:00
David Baker
f69d5d7e3f Released js-sdk & react-sdk 2017-08-24 14:50:44 +01:00
David Baker
0e3ae2fa4f v0.10.2 2017-08-24 14:49:41 +01:00
David Baker
1b75470597 Released js-sdk 2017-08-24 14:48:22 +01:00
David Baker
a65196ee8c Update electron version 2017-08-23 21:17:07 +01:00
David Baker
9e57c9d78f v0.12.1 2017-08-23 15:58:50 +01:00
David Baker
c900b58120 Released js-sdk & react-sdk 2017-08-23 15:57:45 +01:00
David Baker
3581f6edaa v0.10.1 2017-08-23 15:56:09 +01:00
David Baker
b8e351f489 Released js-sdk 2017-08-23 15:54:06 +01:00
David Baker
f523d93720 v0.12.1-rc.1 2017-08-22 18:57:20 +01:00
David Baker
ab2a72a193 Bump version temporarily 
so we get the diff from v0.12.0-rc.2
 2017-08-22 18:55:33 +01:00
David Baker
6bdad8b5f6 Released js-sdk & react-sdk 2017-08-22 18:55:09 +01:00
David Baker
85b609608e v0.10.1-rc.1 2017-08-22 18:53:11 +01:00
David Baker
8312cf6ab2 Temporarily bump version 
so we compare to 0.10.0-rc.2 rather than 0.9.7
 2017-08-22 18:50:33 +01:00
David Baker
3939d948bf js-sdk v0.10.1-rc.1 2017-08-22 18:43:33 +01:00
Luke Barnard
064181731c v0.12.0-rc.1 2017-08-16 10:40:28 +01:00
Luke Barnard
cc8518101b js-sdk 0.8.0 react-sdk 0.10.0-rc.1 2017-08-16 10:10:03 +01:00
Luke Barnard
222aed896f js-sdk #develop 2017-08-16 10:06:50 +01:00
Luke Barnard
8f21ba7f7a js-sdk 0.8.0 2017-08-16 09:37:10 +01:00
Richard van der Hoff
06ef674597 Enable fancy karma reporters 
cargo-cult luke's stuff from react-sdk
 2017-08-08 19:05:58 +01:00
Richard van der Hoff
df33d40285 Enable karma-sourcemap-loader 
This turns (some) stacktraces back into something useful, so that unpicking
test failures is vaguely tractable
 2017-08-08 19:05:49 +01:00
Richard van der Hoff
10ee9f4de4 Merge pull request #4754 from vector-im/rav/fix_crypto_build 
Fix crypto on develop
 2017-08-08 10:13:06 +01:00
Richard van der Hoff
9c3c1b7608 Make webpack exit non-zero on error 
Pass `--bail` to webpack, so that if we can't find a module, we bail out rather
than deploy a broken version to /develop.

https://github.com/webpack/webpack/issues/708 is somewhat relevant.
 2017-08-08 09:50:49 +01:00
Luke Barnard
91c96c1c27 Update draft-js-export-* deps to be compatible with draft-js >0.10.0 2017-08-04 15:08:03 +01:00
Luke Barnard
8ca2af0fe7 Update draft-js from 0.10.1 to 0.11.0-alpha (see https://github.com/matrix-org/matrix-react-sdk/pull/1269) 2017-08-03 15:22:52 +01:00
Luke Barnard
4f0cf7d6ec Update npm dep of draft-js to 0.11.0-alpha 2017-08-03 11:16:32 +01:00
Luke Barnard
2f99a4883f Update draft-js from 0.8.1 to 0.10.1 
Hopefully to fix #4675 and friends
 2017-08-02 11:52:47 +01:00
Luke Barnard
1001c39da9 Upgrade draft-js from 0.8.1 to 0.10.1 
This fixes vector-im/riot-web#4675

Some APIs have become deprecated in this version but are still usable ( see https://draftjs.org/docs/v0-10-api-migration.html )
 2017-08-01 16:02:28 +01:00
Luke Barnard
0118d880ec Attempt to improve test output to be more readable 
- Add "logcapture" reporter to capture logs only for failed tests
 - Add "spec" reporter to show each test status individually
 - Add "summary" reporter to show the total number of successful/failed tests
 2017-07-27 14:47:22 +01:00
Richard van der Hoff
66ddf25977 Deflake the joining test 
Just give the client longer to get started (it seems to be taking a long time
to get started talking to indexeddb)
 2017-07-14 16:14:42 +01:00
Richard van der Hoff
0c31c62a62 build fix: bump to mock-request 1.1 
This should have happened with 32ef273f: now that we are using
flushAllExpected, we nee matrix-mock-request 1.1.0
 2017-07-14 15:41:13 +01:00
Richard van der Hoff
01d954e4ab Bump react to 15.6 to fix build problems 
matrix-react-test-tools requires react 15.6 or later, so make sure we require
it in riot-web too.
 2017-07-14 14:45:44 +01:00
Richard van der Hoff
3ec4b25793 Transform async functions to bluebird promises 
It turns out that the assertion made in
https://github.com/vector-im/riot-web/pull/4565 about `async` functions
returning bluebird promises was only correct when babel used an inline version
of the `asyncToGenerator` helper; in react-sdk we are using
`babel-transform-runtime` which means that we use a separate
`babel-runtime/helpers/asyncToGenerator`, which returns a native (or core-js)
Promise.

This meant that we were still in the situation where some methods returned
native Promises, and some bluebird ones, which is exactly the situation I
wanted to resolve by switching to bluebird in the first place: in short,
unless/until we get rid of all code which assumes Promises have a `done` method
etc, we need to make sure that everything returns a bluebird promise.

(Aside: there was debate over whether in the long term we should be trying to
wean ourselves off bluebird promises by assuming all promises are native. The
conclusion was that the complexity hit involved in doing so outweighed any
benefit of a potential future migration away from bluebird).
 2017-07-13 17:34:47 +01:00
Richard van der Hoff
4d83150855 Transform async functions to bluebird promises 
It turns out that the assertion made in
https://github.com/matrix-org/matrix-react-sdk/pull/1213 about `async`
functions returning bluebird promises was only correct when babel used an
inline version of the `asyncToGenerator` helper; in react-sdk we are using
`babel-transform-runtime` which means that we use a separate
`babel-runtime/helpers/asyncToGenerator`, which returns a native (or core-js)
Promise.

This meant that we were still in the situation where some methods returned
native Promises, and some bluebird ones, which is exactly the situation I
wanted to resolve by switching to bluebird in the first place: in short,
unless/until we get rid of all code which assumes Promises have a `done` method
etc, we need to make sure that everything returns a bluebird promise.

(Aside: there was debate over whether in the long term we should be trying to
wean ourselves off bluebird promises by assuming all promises are native. The
conclusion was that the complexity hit involved in doing so outweighed any
benefit of a potential future migration away from bluebird).
 2017-07-13 17:10:08 +01:00
Richard van der Hoff
76181f4771 Merge remote-tracking branch 'origin/develop' into rav/bluebird 2017-07-13 12:04:54 +01:00
Richard van der Hoff
10decf95f6 replace imports of q with bluebird 
update `package.json`

```
find src test -name '*.js' |
    xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
    xargs perl -i -pe 'if (/import [qQ] /) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
 2017-07-13 00:48:31 +01:00
Richard van der Hoff
b2403d59b7 loading tests: wait for login component 
Rather than a fixed delay, use matrix-react-test-utils to wait for the login
component to appear. Hopefully this will deflakify some tests.
 2017-07-13 00:18:49 +01:00
Richard van der Hoff
0f8a2554dc Enable colours for karma test output 
I don't really know why we disable colours here.
 2017-07-13 00:18:10 +01:00
Richard van der Hoff
a06bd84213 replace imports of q with bluebird 
update `package.json`

```
find src test -name '*.js' |
   xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
   xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
 2017-07-12 18:05:08 +01:00
David Baker
3093f2d6fb Merge pull request #1211 from matrix-org/rav/use_react_test_utils 
Use matrix-react-test-utils rather than our own impl
 2017-07-12 16:44:25 +01:00
Richard van der Hoff
928287b8fc Bump to matrix-react-test-utils 0.1.1 
... because 0.1.0 was broken
 2017-07-12 00:02:52 +01:00
Richard van der Hoff
ab61b6b1b6 Use matrix-react-test-utils rather than our own impl 
waitForRenderedDOMComponentWithTag is now in matrix-react-test-utils.
 2017-07-11 23:14:56 +01:00
Michael Telatynski
7473c654d5
use npm scripts arg passing instead of $KARMAFLAGS to make cross-compat 2017-07-11 22:54:18 +01:00
David Baker
e242e5e714 Merge pull request #1205 from matrix-org/luke/feature-new-emojis 
Bump the dep on emojione to 2.2.7 to add 🦈 and others
 2017-07-11 14:13:13 +01:00
Luke Barnard
4766447e15 Bump the dep on emojione to 2.2.7 to add 🦈 and others 
Also, re-run node scripts/emoji-data-strip.js to update emoji meta data in src/stripped-emoji.json
 2017-07-11 13:48:15 +01:00
Luke Barnard
f9ee89b2f4 Merge branch 'develop' into matthew/whitelist-uri-schemes 2017-07-10 15:42:03 +01:00
Kegsay
e0e321783b Append the scalar_token to the widget URL if the widget URL is a scalar URL (#1182) 2017-07-06 09:28:48 +01:00
Richard van der Hoff
f69033c907 Use headless chrome instead of phantomjs for tests 2017-07-05 14:39:02 +01:00
Richard van der Hoff
9969d6095d Remove phantomjs; add chrome 2017-07-05 09:43:40 +01:00
Richard van der Hoff
38b1ca9b90 Use headless chrome instead of phantomjs for tests 2017-07-05 09:35:51 +01:00
Richard van der Hoff
48889b51b0 Bump to matrix-mock-request 1.0.0 
- for consistency with js-sdk updates
 2017-07-04 16:38:19 +01:00
Richard van der Hoff
bd1196716a Use external mock-request 
mock-request is now factored out to matrix-mock-request; use it
 2017-07-04 15:59:21 +01:00
Luke Barnard
30f80b57f2 Instead of making this part of the build process, let the devs generate stripped-emoji.json 
With the expectation that when the file needs to be regenerated to include other keys, the developer will run this script.
 2017-06-28 13:28:48 +01:00
Luke Barnard
22ddbc63c3 Make lib dir prior to building 
-p option will not error if lib already exists
 2017-06-28 11:54:05 +01:00
Luke Barnard
2b8da85726 Strip the emoji meta-data for the data we need 
This is done at build time by parsing emojione/emoji.json, stripping it and then writing to ./lib/stripped-emoji.json.
 2017-06-28 11:36:19 +01:00
Luke Barnard
8ca3b382ed Use emojione/emoji.json because we don't want two sets of emoji meta 2017-06-28 11:19:16 +01:00
Luke Barnard
9d339b96bd Order emojis by standard ordering, add alternate shortnames 
Also, increase the maximum number of emoji shown to 20.
 2017-06-27 20:13:48 +01:00
David Baker
c0e48c72fc Remove dep on liblevenstein 
While we don't actually use it
 2017-06-23 18:03:32 +01:00
Luke Barnard
87609582c6 Merge branch 'develop' into rte-fixes2 
Conflicts:
	package.json
	src/autocomplete/CommandProvider.js
	src/autocomplete/UserProvider.js
	src/components/structures/RoomView.js
	src/components/structures/UserSettings.js
	src/components/views/rooms/MessageComposerInput.js
 2017-06-23 15:30:06 +01:00
David Baker
cf5cf02529 v0.11.4 2017-06-22 12:04:49 +01:00
David Baker
c380e7566a Released js-sdk & react-sdk 2017-06-22 11:58:57 +01:00
David Baker
f7aad3c422 v0.9.7 2017-06-22 11:57:27 +01:00
David Baker
6881fdf102 js-sdk 0.7.13 2017-06-22 11:52:13 +01:00
David Baker
639b17c663 v0.11.3 2017-06-20 13:15:36 +01:00
David Baker
6ef32f182a react-sdk 0.9.6 2017-06-20 13:13:03 +01:00
David Baker
529e014739 v0.9.6 2017-06-20 13:08:06 +01:00
David Baker
448e33bb65 v0.11.2 2017-06-19 13:20:45 +01:00
David Baker
f420a18696 Released js-sdk & react-sdk 2017-06-19 13:12:40 +01:00
David Baker
66c3a6d9ca v0.9.5 2017-06-19 13:09:41 +01:00
David Baker
faeb40bc0f Released js-sdk v0.7.12 2017-06-19 12:00:53 +01:00
David Baker
8cf6712426 v0.11.2-rc.2 2017-06-16 13:32:57 +01:00
David Baker
1a12528634 react-sdk rc.2 2017-06-16 13:30:27 +01:00
David Baker
12ad9a2c58 v0.9.5-rc.2 2017-06-16 13:28:49 +01:00
David Baker
104cb7b999 v0.11.2-rc.1 2017-06-15 17:21:01 +01:00
David Baker
cb905e9be7 released js-sdk & react-sdk 2017-06-15 17:18:33 +01:00
David Baker
82436758b2 v0.9.5-rc.1 2017-06-15 17:17:17 +01:00
David Baker
198d85a673 js-sdk 0.7.12-rc.1 2017-06-15 17:15:26 +01:00
David Baker
4edd21ba8a v0.11.1 2017-06-14 11:21:27 +01:00
David Baker
f9795232e0 react-sdk 0.9.4 2017-06-14 11:19:43 +01:00
David Baker
a5aa497287 v0.9.4 2017-06-14 11:17:00 +01:00
David Baker
bddb6b7f8f v0.11.0 2017-06-12 16:04:24 +01:00
David Baker
8c541a2702 released js sdk & react sdk 2017-06-12 15:53:46 +01:00
David Baker
aef0a8025c v0.9.3 2017-06-12 15:50:37 +01:00
David Baker
29355a610f js-sdk 0.7.11 2017-06-12 15:19:52 +01:00
David Baker
89e14c1b49 v0.11.0-rc.2 2017-06-09 22:20:38 +01:00
David Baker
f086629fed react-sdk rc.2 2017-06-09 22:17:30 +01:00
David Baker
336b10daf1 v0.9.3-rc.2 2017-06-09 22:13:54 +01:00
David Baker
d108f34390 Change flux version to 2.1.1 
It was previously pinned to 2.0.3 in https://github.com/vector-im/riot-web/commit/5bab440a1
but only here and not in react-sdk, meaning that react-sdk was
still using the latest, at least in develop builds, however
react-sdk now uses utils which requires 2.1, so pin to 2.1.1
everywhere for sanity.
 2017-06-09 21:43:11 +01:00
David Baker
c61942ed5d We now require flux 2.1 because we use utils 2017-06-09 21:42:34 +01:00
David Baker
7237224fc9 v0.11.0-rc.1 2017-06-09 20:31:34 +01:00
David Baker
daf92c59b1 released js-sdk & react-sdk 2017-06-09 20:29:36 +01:00
David Baker
27592728f5 v0.9.3-rc.1 2017-06-09 20:28:09 +01:00
David Baker
0879d796eb released js-sdk 2017-06-09 20:26:41 +01:00
Matthew Hodgson
d8f7262eac Merge branch 'develop' into t3chguy/random_fix_1 2017-06-08 15:58:49 +01:00
David Baker
53bc78429d Merge pull request #4212 from vector-im/t3chguy/package_json_fix 
change electron -> electron_app which was previously missed
 2017-06-07 14:46:54 +01:00
Luke Barnard
a158549a4c Merge pull request #4039 from vector-im/new-guest-access 
New guest access
 2017-06-07 13:40:00 +01:00
Luke Barnard
53ea41e8a5 Merge branch 'develop' into new-guest-access 2017-06-07 12:08:37 +01:00
Michael Telatynski
79d6ced201
change electron -> electron_app which was previously missed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-06 18:39:54 +01:00
David Baker
968e21a67d Merge branch 'master' into develop 2017-06-06 17:48:32 +01:00
David Baker
26bb962a3c v0.10.2 2017-06-06 17:45:07 +01:00
David Baker
a62ed0eb03 reatc-sdk 0.9.2 2017-06-06 17:41:26 +01:00
David Baker
31f1e421f2 v0.9.2 2017-06-06 17:40:30 +01:00
David Baker
d06934c5f6 Add velocity as a dep 
As we now use it from vector, so we shouldn't rely on it being
pulled in via react-sdk
 2017-06-06 14:00:36 +01:00
Luke Barnard
619830617a Merge branch 'develop' into luke/ilag-i18n 
In order to get ILAG internationalised

Conflicts:
	src/components/structures/LoggedInView.js
	src/components/structures/MatrixChat.js
	src/components/views/dialogs/ChatCreateOrReuseDialog.js
	src/components/views/dialogs/SetDisplayNameDialog.js
	src/createRoom.js
	src/i18n/strings/en_EN.json
 2017-06-05 16:08:03 +01:00
Michael Telatynski
f24c6de245
provide react devtools in electron dev builds 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-04 15:30:44 +01:00
Matthew Hodgson
ed6709ec6c rename WMClass as riot rather than confusing riot-web 2017-06-03 18:43:06 +01:00
Matthew Hodgson
5add4a1b95 v0.10.1 2017-06-02 22:48:18 +01:00
Matthew Hodgson
dea012f460 bump to 0.9.1 2017-06-02 22:45:59 +01:00
Matthew Hodgson
0d5ad06ac1 v0.9.1 2017-06-02 22:39:32 +01:00
Michael Telatynski
cb3fa16cd0 install text-encoding-utf-8 so we're not relying on it from react-sdk 
implicitly/transitively (not nice)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 22:04:01 +01:00
David Baker
24a5297fc8 v0.10.0 2017-06-02 14:37:10 +01:00
David Baker
b4a0e85d90 released react-sdk 2017-06-02 14:25:12 +01:00
David Baker
9e0aca534c v0.9.0 2017-06-02 14:23:30 +01:00
Matthew Hodgson
921ffc3762 v0.10.0-rc.2 2017-06-02 01:21:19 +01:00
Matthew Hodgson
ce4a2e48d6 bump deps 2017-06-02 01:18:37 +01:00
Matthew Hodgson
8add074dbf v0.9.0-rc.2 2017-06-02 01:14:13 +01:00
Matthew Hodgson
943c9d931e v0.10.0-rc.1 2017-06-02 01:12:19 +01:00
Matthew Hodgson
7e097d8d74 Merge branch 'release-v0.9.0-rc.1' into develop 2017-06-02 01:07:08 +01:00
Matthew Hodgson
73f97b4661 bump js-sdk for webrtc 2017-06-02 01:05:09 +01:00
Matthew Hodgson
0fbd73a3c9 bump js & react sdk 2017-06-01 02:16:57 +01:00
Matthew Hodgson
bceef2db91 v0.9.0-rc.1 2017-06-01 02:15:49 +01:00
Matthew Hodgson
b1475cb309 bump js-sdk 2017-06-01 02:04:46 +01:00
Michael Telatynski
0e96968c4e explicitly call install:electron in case electron-builder is silly 
(which has hit me once)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 12:35:57 +01:00
Matthew Hodgson
5c885922d9 Merge branch 'develop' into new-guest-access 2017-05-28 22:58:18 +01:00
David Baker
d0395b939a Add babel eslint plugin 
As our linter has been failing because it needs it
 2017-05-26 22:59:40 +01:00
Matthew Hodgson
32207bd058 use develop js-sdk 2017-05-26 19:51:47 +01:00
Matthew Hodgson
963c90c833 switch to develop deps... 2017-05-26 19:51:04 +01:00
Michael Telatynski
9cd04509bf Add Chat to Linux app categories 
most dists inc Arch have Chat and IRCClient,
though the latter isn't exactly correct so missing it
 2017-05-25 13:22:01 +01:00
David Baker
99efbbee5e Depend on prop-types module 
So we can start writing code compatible with new React
 2017-05-25 12:04:53 +01:00
David Baker
ec146c7f45 Switch to stock counterpart 
We no longer need the custom counterpart. The things that were
changed in it and reasosn we no lomger need them are:

 1. set separator - this can be done with standard counterpart
 2. ES6 port: this was done to allow importing as _t, but is
    unnecessary with the _t wrapper function in react-sdk
    (although also seems to work fine with
    `import _t from 'counterpart';`)
 3. Fallback to key name: unnecessary with
    `setMissingEntryGenerator` in 0.18, but we've changed to just
    using a fallback locale anyway since No code missing en
    translations should ever make it to the devbelop branch.
 4. Logging on missing translations. Unnecessary with
    `onTranslationNotFound`, but now not used anyway because we
    let missing translations show up in the UI as
    'missing translation'

Bulk changes to imports coming in separate commit for easy reading.
 2017-05-25 11:24:17 +01:00
David Baker
d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00
David Baker
7d59742a22 Merge pull request #3975 from vector-im/t3chguy/riot-desktopt-linux-cat 
add menu category for linux build of app
 2017-05-22 16:59:27 +01:00
Michael Telatynski
6e8516e537 fiiine! 2017-05-22 16:53:46 +01:00
David Baker
86bce146e8 v0.9.10 2017-05-22 11:41:10 +01:00
David Baker
c03d12238a Released js-sdk & react-sdk 2017-05-22 11:39:25 +01:00
David Baker
eadd6192e8 v0.8.9 2017-05-22 11:36:56 +01:00
David Baker
3a0ee385b8 Released js-sdk 2017-05-22 11:35:02 +01:00
Michael Telatynski
90ab4a02f2 add category so it doesn't get dropped into Default/Lost+Found 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-20 13:11:31 +01:00
David Baker
da14d7eb8c v0.9.10-rc.1 2017-05-19 10:43:11 +01:00
David Baker
c0c1972d56 Released js-sdk & react-sdk 2017-05-19 10:40:44 +01:00
David Baker
1addd6e304 v0.8.9-rc.1 2017-05-19 10:39:14 +01:00
David Baker
f615bc129f Released js-sdk 2017-05-19 10:37:33 +01:00
David Baker
16899d3b1f Bump electron version to 1.6.8 2017-05-18 11:38:03 +01:00
David Baker
9fc9de3af5 Revert "Merge pull request #3654 from vector-im/matthew/quick-search" 
This reverts commit 8f20fcfa6b, reversing
changes made to 751f715e77.
 2017-05-16 17:21:49 +01:00
David Baker
ebfafb3639 Revert "Merge pull request #807 from matrix-org/matthew/quick-search" 
This reverts commit 0ad1d8caf3, reversing
changes made to 1189368aab.
 2017-05-16 16:11:01 +01:00
David Baker
387529d130 Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" 
This reverts commit 3366d3bbae, reversing
changes made to ceb71a4ef6.
 2017-05-16 14:49:55 +01:00
Luke Barnard
6d94f35c33 Automatically update component-index 
Following changes to the react-sdk, reskindex can now be updated using the "-w" (watch) equivalent of the reskindex script.

-Alter npm scripts so that reskindex is run when building once and so that reskindex:start is runwhen developing
-Remove and stop tracking component-index, this will now only be created at build-time
 2017-05-11 10:37:13 +01:00
Michael Telatynski
c607b1bc89 npm is "smart" enough to try and install our electron wrapper as a module 
instead of the actual electron package. With no way to ignore directories.
I'd like to think of this as temporary, until I get to rip apart riot-web
and riot-electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-10 13:36:27 +01:00
Michael Telatynski
fdf48def00 make reskindex windows friendly 
makes #871 windows friendly
 2017-05-09 17:13:27 +01:00
Luke Barnard
fe121126f5 Merge branch 'develop' into rte-fixes 
Conflicts:
	src/UserSettingsStore.js
	src/autocomplete/EmojiProvider.js
	src/components/views/rooms/MessageComposerInput.js
 2017-05-08 17:08:59 +01:00
Luke Barnard
574c836941 Move chokidar to devDeps 2017-05-08 16:24:13 +01:00
Luke Barnard
7d1940620d Add (watching) reskindex to npm start 
also add reskindex in non-watching mode to `npm run build`
 2017-05-08 15:07:58 +01:00
Luke Barnard
2eaaa97451 Give reskindex.js a watch mode (-w) 
`scripts/reskindex.js -w` will run reskindex in watch mode whereby FS events will cause a reskindex to occur.

This depends on `chokidar`
 2017-05-08 15:07:05 +01:00
David Baker
3366d3bbae Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2 
Make left panel better for new users (mk II)
 2017-05-08 10:37:55 +01:00
Matthew Hodgson
f056360f70 merge master post release 2017-05-07 20:01:11 +01:00
Matthew Hodgson
8e94d5240f merge master into develop post 0.9.9 2017-05-07 19:58:42 +01:00
Michael Telatynski
309afdb813 no point installing deps here, builder will do it for us 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:08:50 +01:00
Michael Telatynski
a09f890619 Merge package.json, match version in electron/package.json 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:03:28 +01:00
Michael Telatynski
499b04c254 Only install electron deps when we're bundling/running electron 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:01:32 +01:00
Michael Telatynski
f54708227e Proper two package.json format, release.sh bumps 2nd json ver too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 16:54:55 +01:00
David Baker
7b320f8fbb Remove babelcheck 
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
 2017-05-04 16:51:36 +01:00
David Baker
396b38512c Remove babelcheck 
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
 2017-05-04 16:50:47 +01:00
David Baker
909cdb6e9a Depend on prop-types module 
So we can start writing code compatible with new React
 2017-05-04 16:22:06 +01:00
Michael Telatynski
4a8ad53bd9 Pin filesize ver to fix break upstream 
https://travis-ci.org/vector-im/riot-web/builds/227340622
avoidwork/filesize.js#87
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us
 2017-04-30 13:11:01 +01:00
Michael Telatynski
c8fb18dc93 Pin filesize ver to fix break upstream 
https://travis-ci.org/vector-im/riot-web/builds/227340622
https://github.com/avoidwork/filesize.js/issues/87
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us
 2017-04-30 13:00:47 +01:00
David Baker
aa482bae28 v0.9.9 2017-04-25 11:08:08 +01:00
David Baker
2d311ddbf4 Released js-sdk & react-sdk 2017-04-25 11:04:03 +01:00
David Baker
d81adb234a v0.8.8 2017-04-25 10:53:59 +01:00
David Baker
74dabb2087 Released js-sdk 2017-04-25 10:52:44 +01:00
David Baker
5326faa0b8 v0.9.9-rc.2 2017-04-24 18:26:20 +01:00
David Baker
b6435502fc New version of react-sdk 2017-04-24 18:25:13 +01:00
David Baker
e569144d6f v0.8.8-rc.2 2017-04-24 18:24:29 +01:00
Michael Telatynski
9e2324fb69 don't hook on postinstall, current dev cycle uses (abuses) npm i to build 
so no point making it take longer than it has to for the devs only testing
webapp

build:electron - hook npm run install:electron
install:electron - run npm i for the electron deps
electron - start the app locally for testing

add to README

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-23 22:50:58 +01:00
David Baker
141aafd18e v0.9.9-rc.1 2017-04-21 18:40:25 +01:00
David Baker
ce5a7ba48a Rewind version to try again, again 2017-04-21 18:39:11 +01:00
David Baker
95647fb7a1 v0.9.9-rc.1 2017-04-21 18:35:15 +01:00
David Baker
f25612198e 0.9.8, not 0.9.9 2017-04-21 18:33:53 +01:00
David Baker
ca6d9063fd Back up release version to try again 2017-04-21 18:32:55 +01:00
David Baker
eec0c274d2 v0.9.9-rc.1 2017-04-21 18:26:29 +01:00
David Baker
9747836a4d Update react-sdk and js-sdk dependencies 2017-04-21 18:24:29 +01:00
David Baker
a55eb00dad v0.8.8-rc.1 2017-04-21 18:22:39 +01:00
David Baker
665f507537 Update js-sdk dependency 2017-04-21 18:18:35 +01:00
Michael Telatynski
60b280f166 Add cross-env into the mix 
this way `npm run build` will work on Windows too :D

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 17:16:53 +01:00
Matthew Hodgson
8f20fcfa6b Merge pull request #3654 from vector-im/matthew/quick-search 
Optimise RoomList and implement quick-search functionality on it.
 2017-04-20 11:26:08 +01:00
Matthew Hodgson
a5bd8bd034 bump react-gemini-scrollbar 2017-04-19 23:35:06 +01:00
Matthew Hodgson
8da07740d1 bump react-gemini-scrollbar 2017-04-19 23:34:29 +01:00
Richard van der Hoff
ccc33db9dd Compress uploaded rageshakes. (#3647) 2017-04-18 17:23:34 +01:00
Luke Barnard
ec2a5cce74 Merge branch 'develop' into matthew/whitelist-uri-schemes 2017-04-13 14:08:19 +01:00
Michael Telatynski
3fb54029d7 Fix packaged functionality 
Improve dependency management for Electron main process deps

Dependencies in /electron/package.json will be installed through a script in /package.json and will be bundled via electron-builder

Does not affect standard webapp whatsoever

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-13 13:39:15 +01:00
Michael Telatynski
76008e8abd Remember and Recall window layout so that position+size persist 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-12 18:13:25 +01:00
David Baker
76f140c62c Back to develop js & react sdks 2017-04-12 10:14:58 +01:00
David Baker
ba8745cb42 v0.9.8 2017-04-12 10:10:53 +01:00
David Baker
1d836c7d02 Back to js-sdk develop 2017-04-12 10:04:25 +01:00
David Baker
6a5d0dda2f Use release versions of js-sdk & react-sdk 2017-04-12 10:03:43 +01:00
David Baker
1ff4439566 v0.8.7 2017-04-12 10:02:21 +01:00
David Baker
73888ea616 js-sdk 0.7.6 2017-04-12 10:00:35 +01:00
David Baker
4ead2f338d v0.9.8-rc.3 2017-04-11 18:50:21 +01:00
David Baker
8587df1dd9 React SDK rc.4 2017-04-11 18:49:27 +01:00
David Baker
25665a81ae v0.8.7-rc.4 2017-04-11 18:47:45 +01:00
David Baker
0b266d2e83 v0.9.8-rc.2 2017-04-10 16:56:41 +01:00
David Baker
32c6482dcf Bump js-sdk & react-sdk versions 2017-04-10 16:55:27 +01:00
David Baker
ea0c41a9f8 Merge remote-tracking branch 'origin/develop' into release-v0.9.8 2017-04-10 16:55:02 +01:00
David Baker
46b362b20c v0.8.7-rc.3 2017-04-10 16:52:30 +01:00
David Baker
a77fdd0383 js-sdk rc.2 2017-04-10 16:47:45 +01:00
David Baker
966dc3a071 v0.8.7-rc.2 2017-04-10 16:46:14 +01:00
David Baker
a1cb566761 Bump electron version 2017-04-10 16:01:21 +01:00
David Baker
08ee93a57b v0.9.8-rc.1 2017-04-07 17:29:12 +01:00
David Baker
bced608c48 Roll back version number to try again 2017-04-07 17:28:32 +01:00
David Baker
c576e07c85 v0.9.8-rc.1 2017-04-07 17:19:08 +01:00
David Baker
a63eb2621b Prerelease js-sdk & react-sdk 2017-04-07 17:12:48 +01:00
David Baker
440307bd39 v0.8.7-rc.1 2017-04-07 17:04:03 +01:00
David Baker
2285239428 js-sdk prerelease 2017-04-07 17:02:47 +01:00
Matthew Hodgson
546e2ab30b bump emojione 2017-04-01 01:28:44 +01:00
Aviral Dasgupta
78641a80dd
autocomplete: replace Fuse.js with liblevenshtein 2017-03-07 04:09:25 +05:30
Aviral Dasgupta
f4c0baaa2f
refactor MessageComposerInput: bind -> class props 2017-03-07 04:09:25 +05:30
Matthew Hodgson
2db53c2284 whitelist data & mxc URIs on img tags: readds PR #333 now that punkave/sanitize-html#137 has landed 2017-02-19 03:04:42 +02:00
Aviral Dasgupta
0e66b370d4
fix eslint's no-invalid-this rule for class properties 2017-02-16 16:49:00 +05:30
Richard van der Hoff
af765c7522 Merge branch 'master' into develop 
(Keep react-sdk and js-sdk on develop)
 2017-02-04 11:04:25 +00:00
Richard van der Hoff
dc1a0c554f v0.9.7 2017-02-04 10:55:46 +00:00
Richard van der Hoff
cd7bc3bfd3 Bump to js-sdk 0.7.5 and react-sdk 0.8.6 2017-02-04 10:52:41 +00:00
Richard van der Hoff
6d8dcd97af Merge branch 'master' into develop 
(Keep js-sdk on develop)
 2017-02-04 10:42:31 +00:00
Richard van der Hoff
a9cd1bfd4b v0.8.6 2017-02-04 10:30:16 +00:00
Richard van der Hoff
39488f294b bump to js-sdk 0.7.5 2017-02-04 10:23:56 +00:00
Richard van der Hoff
dea557619c v0.9.7-rc.3 2017-02-03 15:44:37 +00:00
David Baker
e0be012737 Bump olm version 
Looks like this is causing pickle errors on packaged builds.
 2017-02-03 15:35:20 +00:00
Richard van der Hoff
d176e83e94 Bump matrix-js-sdk and react-sdk 2017-02-03 15:34:15 +00:00
Richard van der Hoff
19b0f956d2 v0.8.6-rc.3 2017-02-03 15:32:37 +00:00
Richard van der Hoff
c52ae8ff01 Bump to js-sdk 0.7.5-rc.3 2017-02-03 15:28:03 +00:00
Richard van der Hoff
53e5c7eebe Unpin js-sdk & react-sdk 2017-02-03 14:39:11 +00:00
Richard van der Hoff
fd0a66ab99 Unpin js-sdk 2017-02-03 14:37:58 +00:00
David Baker
5285d56a45 Bump olm version 
Looks like this is causing pickle errors on packaged builds.
 2017-02-03 13:51:02 +00:00
David Baker
c2d2287541 v0.9.7-rc.2 2017-02-03 13:19:22 +00:00
David Baker
51de4a3347 Bump js-sdk & react-sdk 2017-02-03 13:08:20 +00:00
David Baker
41936a957f v0.8.6-rc.2 2017-02-03 13:07:11 +00:00
David Baker
66e22d1d26 Bump js-sdk 2017-02-03 13:04:42 +00:00
David Baker
3d45aa7455 v0.9.7-rc.1 2017-02-03 12:17:28 +00:00
David Baker
cad2d72bfe Release js-sdk & react-sdk 2017-02-03 12:15:36 +00:00
David Baker
bded0a7e8e v0.8.6-rc.1 2017-02-03 12:13:42 +00:00
David Baker
25876837f5 released js-sdk 2017-02-03 12:11:24 +00:00
Richard van der Hoff
1c2de1e483 Refactor karma config 
- rename test:multi npm target to test-multi, for consistency with react-sdk
- base karma webpack config on the distribution one
- include Olm if we have it
- don't use the karma source loader - it's pointless given we webpack
  everything.
- turn off module listing in the webpack stats to shorten the console output
 2017-02-02 23:33:12 +00:00
David Baker
1c926941d3 Add --output-chunk-file too 2017-01-25 11:28:59 +00:00
Richard van der Hoff
e23deac1bb Implement e2e export 2017-01-24 21:50:24 +00:00
David Baker
2ca871a028 Don't use hash-named directory for dev server 
Otherwise Chrome thinks you're working on a new file every time
you refresh and therefore closes source tabs and removes
breakpoints which is very annoying. It also allegedly makes
webpack-dev-server run out of memory because it has to remember
all the different files.
 2017-01-24 18:18:56 +00:00
David Baker
31878d8a44 Also need eslint-config-google 2017-01-24 13:07:34 +00:00
David Baker
1e77b2eba3 Bundle eslint config 2017-01-23 16:19:29 +00:00
David Baker
bc714ba3a0 Add eslint config 
An early start that gets some linting in place.
 2017-01-23 14:22:54 +00:00
David Baker
4ba224aac3 Use eslint config from the js sdk 
Extend the js sdk's eslint config to give as consistent a code
style as possible. Add react/jsx/flow stuff that we use here.
 2017-01-20 14:08:14 +00:00
David Baker
f5d7f3ca9f Add StartupWMClass 
so GNOME doesn't get confused by the hidden windows
 2017-01-19 16:21:43 +00:00
Richard van der Hoff
bb7d589287 Merge pull request #617 from matrix-org/rav/megolm_backup 
Megolm session import and export
 2017-01-19 16:14:18 +00:00
Richard van der Hoff
c3fa6ff805 Use the postcss-webpack-loader 
Use postcss-webpack-loader instead of webpack-cli to process the scss. Doing so
mostly means that we avoid the problem that webpack-dev-server fails to start
if we haven't already built the CSS. (It also simplifies package.json somewhat,
which is no bad thing)
 2017-01-19 02:48:17 +00:00
Matthew Hodgson
14eec6d982 Merge branch 'develop' into matthew/postcss 2017-01-18 12:44:42 +00:00
Matthew Hodgson
69bedf0d37 review feedback 2017-01-18 12:42:48 +00:00
Richard van der Hoff
31df78f946 Use text-encoding-utf-8 as a TextEncoder polyfill 
Somebody else seems to have done a good job of polyfilling TextEncoder, so
let's use that.
 2017-01-18 11:39:44 +00:00
Kegsay
fcb1d7a664 Merge pull request #575 from kyrias/commonmark 
Replace marked with commonmark
 2017-01-17 11:57:08 +00:00
David Baker
205676a97d Back to develop js-sdk & react-sdk 2017-01-17 11:30:59 +00:00
David Baker
ae7820e8f2 Fix merge 2017-01-16 13:37:18 +00:00
David Baker
3023ea5335 Merge branch 'release-v0.9.6' 2017-01-16 13:34:41 +00:00
David Baker
22060ac5a4 v0.9.6 2017-01-16 13:26:22 +00:00
David Baker
231306ea7c Update js-sdk & react-sdk 2017-01-16 13:24:44 +00:00
David Baker
1d5112db5d Back to develop js-sdk 2017-01-16 13:22:57 +00:00
David Baker
a9256b0ab1 v0.8.5 2017-01-16 13:21:34 +00:00
David Baker
3679e47002 js-sdk 0.7.4 2017-01-16 13:19:24 +00:00
Matthew Hodgson
8b38a326cb merge package.json 2017-01-16 00:20:18 +00:00
David Baker
e1c1937855 v0.9.6-rc.1 2017-01-13 11:21:08 +00:00
David Baker
40545bd48e Released react-sdk & js-sdk 2017-01-13 11:15:55 +00:00
David Baker
3ac9ed7f8f v0.8.5-rc.1 2017-01-13 11:14:26 +00:00
David Baker
57652c06e3 released js-sdk 2017-01-13 11:13:17 +00:00
David Baker
717aa94ba9 Merge pull request #2917 from vector-im/dbkr/fix_windows_shortcuts 
Hopefully fix Windows shortcuts
 2017-01-12 10:43:26 +00:00
David Baker
97fc92b1bb Update to electron 1.4.14 
This pulls in the chrome change that broke geotrust ssl when the
build hit 10 weeks old, so let's get this one out before we hit
more disasters.
 2017-01-11 16:53:01 +00:00
David Baker
06718c580e Hopefully fix Windows shortcuts 
* Revert 79d164309f
   as it seems to break shortcuts altogether
 * Update electron-builder (and add the squirrel windows package
   that the newer version now requires: it's been split out). This
   uses a newer version of squirrel which has some fixes for
   shortcuts.

I'm unsure exactly what was going wrong originally in
https://github.com/vector-im/riot-web/issues/2775 but #79d1643
seems to break shortcut creation as far as I can see.
 2017-01-11 16:27:40 +00:00
Matthew Hodgson
691fe611d6 experimental postcss 2017-01-10 11:06:09 +00:00
Richard van der Hoff
6a1af891b7 Use a custom script to copy resources (#2893) 
All of those cpx invocations were getting unwieldy, and I suspect the exotic
quoting needed to run them under parallelshell was breaking things on windows.

Replace the unwieldy cpx invocations with an unwieldy custom script.
 2017-01-06 10:43:13 +00:00
Matthew Hodgson
bacb284415 basic jig for SASS-based themed CSS (one bundle per theme) 2016-12-28 02:01:28 +00:00
Matthew Hodgson
b0319ec0f1 merge 2016-12-24 19:32:29 +00:00
Matthew Hodgson
747408871d v0.9.5 2016-12-24 19:07:31 +00:00
Matthew Hodgson
3f3772463b bump react dep 2016-12-24 19:04:00 +00:00
Matthew Hodgson
97514cf80e Merge branch 'master' into develop 2016-12-24 19:03:42 +00:00
Matthew Hodgson
45bfb93f17 v0.8.4 2016-12-24 19:03:08 +00:00
Matthew Hodgson
cbf105f2a0 Revert "bump to dep on react-sdk 0.8.3-electron" 
This reverts commit bba6664b1c.
 2016-12-24 18:59:41 +00:00
Matthew Hodgson
bba6664b1c bump to dep on react-sdk 0.8.3-electron 2016-12-24 18:58:42 +00:00
Matthew Hodgson
223caae842 Merge branch 'master' into develop 2016-12-24 18:54:00 +00:00
Matthew Hodgson
1976bb70bd v0.8.3-electron 2016-12-24 18:53:24 +00:00
Richard van der Hoff
1678a25fd6 Merge branch 'master' into develop 2016-12-22 18:33:37 +00:00
Richard van der Hoff
ff70b0a2c8 v0.9.4 2016-12-22 18:24:04 +00:00
Richard van der Hoff
35a541c824 Bump to olm 2.1.0 2016-12-22 17:23:27 +00:00
Richard van der Hoff
ab8420f5a9 Bump to olm 2.1.0 2016-12-22 16:30:14 +00:00
David Baker
ed35a90cfb Back to develop js & react sdk 2016-12-22 14:36:05 +00:00
David Baker
d8bce0f202 v0.9.3 2016-12-22 14:18:23 +00:00
David Baker
519af6a5d0 Bump to matrix-react-sdk 0.8.3 2016-12-22 14:14:44 +00:00
David Baker
9cbe401866 Back to js-sdk develop 2016-12-22 14:13:48 +00:00
David Baker
9bf98161a2 v0.8.3 2016-12-22 14:09:42 +00:00
David Baker
57412b3315 released matrix-js-sdk 2016-12-22 14:06:42 +00:00
David Baker
1e7e9d6101 v0.9.2 2016-12-16 17:44:22 +00:00
David Baker
4745b3efeb released js-sdk & react-sdk 2016-12-16 17:40:37 +00:00
David Baker
70c7facb6f matrix-js-sdk dev 2016-12-16 17:30:43 +00:00
David Baker
29a05dda20 v0.8.2 2016-12-16 17:26:13 +00:00
David Baker
03d9d28205 matrix-js-sdk 0.7.2 2016-12-16 17:24:17 +00:00
David Baker
c80d1c15d2 dev js-sdk & react-sdk 2016-12-09 20:12:37 +00:00
David Baker
b9ba795cb0 v0.9.1 2016-12-09 20:05:41 +00:00
David Baker
93b3857a9b Merge branch 'develop' into release-v0.9.1 2016-12-09 20:03:10 +00:00
David Baker
5414b5d189 Released js-sdk & react-sdk 2016-12-09 19:58:33 +00:00
David Baker
1fbc938f87 js-sdk develop 2016-12-09 19:57:44 +00:00
David Baker
57c56992f1 v0.8.1 2016-12-09 19:53:27 +00:00
David Baker
fc39b35369 One more, one more try 2016-12-09 19:52:40 +00:00
David Baker
8ea299bcea v0.8.1 2016-12-09 19:51:27 +00:00
David Baker
15f556406f One more try... 2016-12-09 19:50:02 +00:00
David Baker
fb95b71f7b v0.8.1 2016-12-09 19:48:27 +00:00
David Baker
3ddeece619 Back to rc temporarily 2016-12-09 19:47:28 +00:00
David Baker
56d51687f9 v0.8.1 2016-12-09 19:34:21 +00:00
David Baker
d0850d67cd js-sdk 0.7.1 2016-12-09 19:32:27 +00:00
David Baker
b4e362d700 Bump to electron 1.4.11 2016-12-09 19:14:59 +00:00
David Baker
a9fcf106ab v0.9.1-rc.2 2016-12-06 16:06:15 +00:00
David Baker
d4ac5f829f react-sdk rc.2 2016-12-06 16:04:46 +00:00
David Baker
a297015d27 v0.8.1-rc.2 2016-12-06 16:04:05 +00:00
David Baker
df5143c818 v0.9.1-rc.1 2016-12-05 18:02:03 +00:00
David Baker
6934b7ed56 released js-sdk & react-sdk 2016-12-05 17:53:06 +00:00
David Baker
66f72e674b v0.8.1-rc.1 2016-12-05 17:51:04 +00:00
David Baker
6693817cdb released js-sdk 2016-12-05 17:47:54 +00:00
David Baker
b6aa7f430c Merge pull request #2653 from vector-im/dbkr/electron_dist_tweaks 
Final bits to prepare electron distribtion:
 2016-12-05 16:22:44 +00:00
David Baker
ec959f0052 Update name & repo to reflect renamed repository 
Unsure whether we want to go through doing a complete
s/vector/riot/ - I'm not sure there's a whole lot of point.
 2016-12-05 14:40:06 +00:00
David Baker
72de35a2a1 Switch back to Squirrel installer 
which it turns out is by far the lesser of two evils.

 * Auto-update works with a proxy
 * The update process is reasonably atomic & faster, rather than
   running the uninstaller then the installer, leaving you with a
   broken install if you shut down your machine at the wrong time
 * Gets the update URL the same way as on mac, rather than baking
   it into the app at build time from package.json. We don't want
   it in package.json because only our builds want our update URL.
 2016-12-05 14:08:27 +00:00
David Baker
7871a3edb5 Just rm dist in the clean step 2016-12-01 19:43:04 +00:00
David Baker
9f51e2c407 Auto-update & build process with NSIS for windows 
Amalgamate the electron build packaging into one script.
Use update_base_url so we can compute the actual URL in the
script for windows (because we need to put it in the build) and
at runtime for mac os.
 2016-12-01 19:33:42 +00:00
Mark Haines
3aa1e0dd9e Update browser-encrypt-attachment to v0.3.0 (#570) 2016-12-01 13:12:22 +00:00
David Baker
e3290c1117 Switch to new auto-update & add linux build 
* Remove squirrel hooks (the installing & uninstalling is now
   done by the, er, installer)
 * Switch to electron-auto-update
 * Shorten initial update delay because we no longer need to wait
   for squirrel to release a lock file
 * Change update URLs because windows is now one installer for
   both 32 & 64 bit.
 * Update electron-builder to 10 where NSIS is now the default
   target for Windows.
 * Add linux to the target list, building a deb.
 * Remove sqirrel-specific installation spinner
 * Remove redundant !**/*  from files
 2016-12-01 11:35:26 +00:00
David Baker
4988f0603f Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks 2016-11-30 18:13:14 +00:00
Johannes Löthberg
4d2926485b Replace marked with commonmark 
Marked has some annoying bugs, and the author is inactive, so replace it
with commonmark.js, which is the reference JavaScript implementation of
CommonMark.  CommonMark is also preferable since it has a specification,
and a conformance test suite to make sure that parsers are correct.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2016-11-29 23:14:04 +01:00
David Baker
55062c7ec5 Update to electron 1.4.8 
Which uses a new enough build of chromium that it accepts our SSL
certs.
 2016-11-28 16:37:43 +00:00
David Baker
c7635a362f Don't copy config, check update url 2016-11-25 20:08:45 +00:00
David Baker
a870ea2389 Add electron config 
Which has the update URL in it
 2016-11-24 17:24:11 +00:00
Richard van der Hoff
10650d2cd1 Unpin js-sdk and react-sdk 2016-11-22 22:14:05 +00:00
Richard van der Hoff
6842544cd7 Unpin js-sdk 2016-11-22 22:12:50 +00:00
Mark Haines
b67fcf8109 Bump browser-encrypt-attachment to v0.2.0 2016-11-22 18:18:16 +00:00
Matthew Hodgson
5cd4f88b8c v0.9.0 2016-11-19 02:04:32 +02:00
Matthew Hodgson
09105608ab v0.8.0 2016-11-19 02:01:43 +02:00
Richard van der Hoff
5d02c72687 Bump to react 15.4 
Add dependencies on react 15.4. Some of the things we pull in from
matrix-react-sdk won't work properly against 15.2 / 15.0.
 2016-11-17 10:34:12 +00:00
Richard van der Hoff
d3c9792126 Remove pin on react 15.3 and bump draft-js-export-html instead 
draft-js-export-html have fixed the incompatibility with react 15.4, so we can
now update.
 2016-11-17 10:15:10 +00:00
Kegan Dougal
3ef0a08493 Pin to 15.3.2 because 15.4.0 is broken and fails with missing CSSProperty file 2016-11-16 17:58:43 +00:00
Mark Haines
13f28e53e1 Generate thumbnails when sending m.image and m.video messages. (#555) 
* Send a thumbnail when sending a m.image

* Use the 'thumbnail_file' when displaying encrypted images

* Whitespace

* Generate thumbnails for m.video

* Fix docstring, remove unused vars, use const

* Don't change the upload promise behaviour

* Polyfill for Canvas.toBlob to support older browsers

* Lowercase for integer types in jsdoc
 2016-11-15 11:22:39 +00:00
David Baker
68a3505091 Fix packaging 
* Package images & config in bundle:dev
 * Don't include two vector- prefixes
 2016-11-11 18:18:51 +00:00
David Baker
062cb7a52e Add isomorphic fetch 
because the attachment crypto uses it
 2016-11-11 17:22:44 +00:00
Mark Haines
0bfcb38879 Add dependency on browser-encrypted-attachment 2016-11-11 14:42:33 +00:00
Mark Haines
23e764604c Merge remote-tracking branch 'origin/master' into develop 2016-11-11 12:00:53 +00:00
Mark Haines
61921327c2 Merge remote-tracking branch 'origin/master' into develop 2016-11-11 12:00:30 +00:00
David Baker
1e163eabf0 Revert "Encrypt attachments in encrypted rooms," 2016-11-11 11:59:08 +00:00
David Baker
3e9414b21e Merge pull request #533 from matrix-org/markjh/encrypted-attachments 
Encrypt attachments in encrypted rooms,
 2016-11-09 09:45:01 +00:00
David Baker
5b7f629996 Build to the 'webapp' directory instead 
People may have config files in vector/ so it would be nonideal
if we started overwriting them / blowing them away.
 2016-11-08 15:46:21 +00:00
David Baker
d150ee0d05 Missed a -w 2016-11-08 15:30:19 +00:00
David Baker
1e2cd9c2d1 Build all of the vector dir in the build process 
So the whole vector/ directory can now be removed during the build
process and we don't ship random files that end up in the vector
directory.
 2016-11-08 14:30:12 +00:00
David Baker
6681205337 Slight grab-bag of fixes for electron on Windows 
* Implement the squirrel install / uninstall hooks (so we have
   a start menu entry / desktop shortcut)
 * Wait longer before checking for update
 * Set the window icon
 * Add a 'file' menu
 * Bump electron-builder
 * Add the icon url for the control panel entry
 2016-11-07 11:41:41 +00:00
David Baker
6da1a1077d 0.8.4 has been released 2016-11-04 13:03:11 +00:00
David Baker
c973dbf1c4 0.7.5 has been released 2016-11-04 13:02:12 +00:00
David Baker
1368d90e66 v0.7.5 2016-11-04 10:09:11 +00:00
David Baker
fa967da2a9 matrix-js-sdk 0.6.4 2016-11-04 10:07:50 +00:00
David Baker
46301727c3 Actually add isomorphic-fetch 2016-11-03 15:53:52 +00:00
David Baker
527c390152 Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-03 15:35:45 +00:00
Richard van der Hoff
ff462580b0 Use webpack-dev-server instead of http-server 
Advantages:
 * blocks while a rebuild is in progress so you're less likely to reload the
   old version

 * serves from memory rather than disk, so we no longer need to turn off the
   cachebuster to avoid filling the disk with bundles. Empirically, seems to
   last a plausible amount of time without OOMing; there's no real reason to
   believe it would use any more memory than webpack itself.

 * That in turn means we no longer need the hack to stop chrome caching old
   sourcemaps (because the sourcemap now has a cachebuster in its name).

 * one fewer process for parallelshell to (fail to) manage.

 * in future, we could consider the fancy hot-reload functionality.
 2016-11-03 15:08:55 +00:00
David Baker
caa3cb7d89 Electron support 
From https://github.com/vector-im/vector-web/pull/2511 but with
just the actual electron changes
 2016-11-02 18:49:28 +00:00
Mark Haines
e0cea74c7e Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them 2016-11-02 16:26:10 +00:00
David Baker
a714edbf2b Implement Platforms 
Provide WebPlatform for functionality specific to the web version of vector.
 2016-11-02 15:12:51 +00:00
David Baker
f433f9ca32 Move platform-specific functionality into Platform 
Platform classes are provided by the application via
PlatformPeg.set().
 2016-11-02 15:10:21 +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
4fb273284d 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
2cb9e606be Use released js-sdk 2016-11-02 11:03:52 +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
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
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
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
de1f7861d6 Bump to olm 2.0.0 2016-10-26 16:20: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
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
53e5894759 Merge branch 'develop' into rav/webpack_olm 2016-10-26 15:13:57 +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
e02e0219a7 Add plugin that makes babel 6 not break everything 2016-10-17 16:28:14 +01:00
David Baker
d04201d069 Replace stage & es2017 with specific plugins 
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
 2016-10-17 16:28:14 +01:00
David Baker
82de2ca4ec Remove transform-runtime 
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
 2016-10-17 16:28:14 +01:00
David Baker
f20b2593bc move babelcheck.js to scripts/ 2016-10-17 16:28:14 +01:00
David Baker
8e0b61ca35 Reminder to restore links + stage2, not stage 0 2016-10-17 16:28:13 +01:00
David Baker
61a543a694 Add babelcheck.js 
As per 4bea0c0818
 2016-10-17 16:28:13 +01:00
David Baker
5608e97719 Remove babel-polyfill 
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
 2016-10-17 16:28:13 +01:00
Aviral Dasgupta
d6f27add66 Upgrade to babel6 and enable some presets. 2016-10-17 16:28:13 +01:00
David Baker
2faf5702c9 Add plugin that makes babel 6 not break everything 
Also transform-runtime here because we seem to need it here too
 2016-10-17 16:24:19 +01:00
David Baker
f9ef6ba871 Replace stage & es2017 with the specific plugins 2016-10-17 16:24:19 +01:00
David Baker
0931f746d8 Move scripts into scripts/ 2016-10-17 16:23:27 +01:00
David Baker
c0973940de Remove accidentally comitted babel updgrade hack 
Was trying to force it to upgrade babel to the stub babel 6
package rather than leaving the babel 5 ones, but it's too hacky.

Also remove the outdated comment.
 2016-10-17 16:23:26 +01:00
David Baker
eb9f884b53 Stage 0 is a little much 2016-10-17 16:23:26 +01:00
David Baker
9434feb009 Add a script to check the version of babel cli 
Because the package has changed so npm can't just auto-upgrade,
so this at least tells people how to fix it when the upgrade
breaks it for everybody.
 2016-10-17 16:23:26 +01:00
Aviral Dasgupta
022eb575d9 Upgrade to babel6 and enable some presets. 2016-10-17 16:23:25 +01:00
David Baker
ea09a25563 Revert "Switch to babel 6" 2016-10-14 18:50:22 +01:00
David Baker
5b4b81f7dc Revert "Switch to babel 6" 2016-10-14 18:49:52 +01:00
David Baker
8a0f6a0c6e Revert 09d2b2a36c 
as babel 6 appears to break sending messages with the non RTE
editor
 2016-10-14 18:48:41 +01:00
David Baker
09d2b2a36c Try adding transform-runtime in react-sdk 
as it seems the runtime is undefined on the /develop, even though
it works just fine for me locally.
 2016-10-14 18:32:52 +01:00
David Baker
40ac80a3e9 Replace stage & es2017 with specific plugins 
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
 2016-10-14 18:03:22 +01:00
David Baker
4f261a0e96 Replace stage & es2017 with the specific plugins 2016-10-14 18:02:26 +01:00
David Baker
5f747e1a90 Remove transform-runtime 
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
 2016-10-13 10:57:10 +01:00
David Baker
e6caf9ece4 move babelcheck.js to scripts/ 2016-10-13 09:50:40 +01:00
David Baker
89ca18b556 Move scripts into scripts/ 2016-10-13 09:45:07 +01:00
David Baker
445230526f Remove accidentally comitted babel updgrade hack 
Was trying to force it to upgrade babel to the stub babel 6
package rather than leaving the babel 5 ones, but it's too hacky.

Also remove the outdated comment.
 2016-10-13 09:39:12 +01:00
David Baker
5ff915476a Reminder to restore links + stage2, not stage 0 2016-10-12 18:08:52 +01:00
David Baker
e5d2ebc57c Add babelcheck.js 
As per 4bea0c0818
 2016-10-12 17:46:11 +01:00
David Baker
5801bf60aa Stage 0 is a little much 2016-10-12 17:26:43 +01:00
David Baker
64815b1b0b Remove babel-polyfill 
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
 2016-10-12 17:23:01 +01:00
David Baker
59120d3019 Merge branch 'babelrc' of https://github.com/aviraldg/vector-web into aviraldg-babelrc 2016-10-12 17:17:10 +01:00
David Baker
4bea0c0818 Add a script to check the version of babel cli 
Because the package has changed so npm can't just auto-upgrade,
so this at least tells people how to fix it when the upgrade
breaks it for everybody.
 2016-10-12 16:53:07 +01:00
David Baker
eadb55c6b0 Merge branch 'babelrc' of https://github.com/aviraldg/matrix-react-sdk into aviraldg-babelrc 2016-10-12 14:03:21 +01:00
David Baker
9245ab01f1 js-sdk & react-sdk develop 2016-10-12 11:52:18 +01:00
David Baker
59fe9279d1 0.8.3 2016-10-12 11:49:58 +01:00
David Baker
bca22f26c5 js-sdk & react-sdk release versions 2016-10-12 11:49:21 +01:00
David Baker
b186c8db6b js-sdk develop 2016-10-12 11:48:15 +01:00
David Baker
ff806c3bc3 0.7.4 2016-10-12 11:47:22 +01:00
David Baker
a62f565bb9 js-sdk 0.6.3 2016-10-12 11:45:59 +01:00
David Baker
cd7adfed0a Back to develop react & js sdk 2016-10-05 16:59:25 +01:00
David Baker
902bf3a0a6 0.8.2 2016-10-05 16:55:45 +01:00
David Baker
fb2c2ed09a Use released version of react-sdk & js-sdk 2016-10-05 16:54:24 +01:00
David Baker
79011886a8 Set js-sdk dep back to develop 2016-10-05 16:53:26 +01:00
David Baker
b5cd540e27 0.7.3 2016-10-05 16:51:15 +01:00
David Baker
17a57b13a9 Bump js-sdk to released 2016-10-05 16:49:54 +01:00
David Baker
7785797be0 Update to linkify 2.1.3 
To pull in https://github.com/SoapBox/linkifyjs/pull/166
 2016-10-04 11:29:13 +01:00
David Baker
52cae92dd7 Update to linkify 2.1.3 
To pull in https://github.com/SoapBox/linkifyjs/pull/166
 2016-10-04 11:28:28 +01:00
Aviral Dasgupta
9174b32ef1 Upgrade to babel6 and enable some presets. 2016-10-02 17:28:24 +05:30
Aviral Dasgupta
2d173d83b9 Upgrade to babel6 and enable some presets. 2016-10-02 17:27:45 +05:30
David Baker
f4a6a3c4b2 Update linkify version 
Fixes https://github.com/vector-im/vector-web/issues/2357
In addition, https://github.com/matrix-org/matrix-react-sdk/pull/500 will make sure failures like this are obvious.
 2016-09-27 10:40:02 +01:00
David Baker
898d792336 Update to linkifyjs 2.1.1 2016-09-23 14:05:31 +01:00
David Baker
77c4cd337e Merge branch 'develop' into dbkr/irc_links 2016-09-22 09:50:18 +01:00
David Baker
99b0f9eb7c Back to develop 2016-09-21 17:33:27 +01:00
David Baker
fedc0f2ec6 Back to develop 2016-09-21 17:32:54 +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
be232bc1da 0.7.2 2016-09-21 17:28:08 +01:00
David Baker
58de14a4c6 Pin to released js-sdk 2016-09-21 17:26:15 +01:00
David Baker
59117f1905 Fix linkifying rooms with underscores, try 2 
Fixes https://github.com/vector-im/vector-web/issues/500
 2016-09-21 14:11:43 +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
David Baker
765ae3a715 Move back to js-sdk develop 2016-09-21 12:00:37 +01:00
David Baker
041b10539a 0.7.1 2016-09-21 11:57:51 +01:00
David Baker
681b45230e Pin to js-sdk 0.6.0 2016-09-21 11:50:17 +01:00
David Baker
c34108eab5 0.7.0 2016-09-21 11:43:15 +01:00
Mark Haines
f6fb1561d7 Update the version of olm to 1.3.0 2016-09-15 11:33:37 +01:00
Matthew Hodgson
eadcc5e2b9 repin linkify 2016-09-13 19:02:44 +01:00
Matthew Hodgson
91b90aa1fd Merge pull request #460 from aviraldg/fix-linkify 
Fix linkification and bump linkifyjs dep
 2016-09-13 19:01:56 +01:00
Aviral Dasgupta
b62622a814 Improve autocomplete behaviour 
Fixes vector-im/vector-web#1761
 2016-09-13 15:46:02 +05:30
Aviral Dasgupta
d65b791b2b bump draft-js to 0.8.1 (as with matrix-react-sdk) 2016-09-12 18:31:22 +05:30
Aviral Dasgupta
8db2a4d46f Fix linkification and bump linkifyjs dep 2016-09-12 03:30:00 +05:30
Matthew Hodgson
b0a4b017c3 Merge pull request #440 from aviraldg/feature-rte-formatbar 
Formatting toolbar for RTE message composer.
 2016-09-08 13:54:26 +01:00
Aviral Dasgupta
71251293e4 RTE formatbar (wip) 
Fixes vector-im/vector-web#2024
 2016-09-08 00:02:16 +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
Matthew Hodgson
b5f9c2a5ac Merge branch 'master' into develop 2016-09-02 17:17:24 +01:00
Matthew Hodgson
14227b5718 0.6.5-r3 2016-09-02 17:17:01 +01:00
Matthew Hodgson
fd664e893f Merge branch 'master' into develop 2016-09-02 17:14:24 +01:00
Matthew Hodgson
c2ca261085 0.6.5-r2 2016-09-02 17:13:59 +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
Matthew Hodgson
1a4e236a50 Merge branch 'master' into develop 2016-09-01 22:18:32 +01:00
Matthew Hodgson
b9d98f918e 0.6.5-r1 2016-09-01 22:18:11 +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
3b2faa4cf9 pin to dev 2016-08-30 13:54:35 +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
90cfb06ba3 0.6.5 2016-08-28 16:55:04 +01:00
Matthew Hodgson
3dd337b553 dep on 0.5.6 of matrix-js-sdk 2016-08-28 16:51:51 +01:00
Matthew Hodgson
6786539550 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:48 +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
3c8a7e36aa 0.6.4-r1 2016-08-12 10:08:15 +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
David Baker
ec9243d4b0 0.6.4 2016-08-11 17:29:10 +01:00
David Baker
e4dd387376 JS SDK 0.5.5 released 2016-08-11 17:28:09 +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
Matthew Hodgson
d0158f5812 fix merge conflict 2016-08-04 23:45:28 +01:00
Matthew Hodgson
90e5ab2ca3 merge in develop 2016-08-04 13:39:47 +01:00
Richard van der Hoff
24cc4f52bf Downgrade emojione to 2.2.3 
... because @aviraldg says > 2.2.3 is broken :/
 2016-08-03 21:36:52 +01:00
Richard van der Hoff
f4e40696bc Bump emojione to 2.2.3 
Because @aviraldg says it's better.
 2016-08-03 21:17:54 +01:00
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
David Baker
cf3cd69f37 Merge pull request #366 from matrix-org/rav/remove_relayoutonupdate 
Remove relayoutOnUpdate prop on gemini-scrollbar
 2016-07-27 15:21:46 +01:00
David Baker
3308842121 Fix up reskindex.js path 
Since npm does not put our *own* 'binaries' on the path, we need to use the full path to it
 2016-07-27 13:28: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
c8df9148b3 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:35:48 +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
e3cdeed32b Bump to react 15.2.1 
This should also stop npm complaining about invalid peerDependencies.
 2016-07-22 10:43:50 +01:00
Richard van der Hoff
ad7f8d0a58 Bump to latest react-gemini-scrollbar 
I've updated our forks of the gemini-scrollbar project to latest upstream.
 2016-07-22 10:12:37 +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
David Baker
6d403e792b Add --stage 1 to babel cmdline 
So we can use trailing function commas. The trailing comma proposal is actually at stage 3 now and there's a babel 6 plugin for it, which  we should use when we switch back to babel 6.
 2016-07-08 15:29:59 +01:00
Aviral Dasgupta
cccc58b47f feat: implement autocomplete replacement 2016-07-03 22:15:13 +05:30
Aviral Dasgupta
cd928fe6f5 Merge remote-tracking branch 'upstream/develop' into feature-autocomplete 2016-07-03 00:00:02 +05:30
David Baker
21cc4cba9a Correct npm run lint command line 2016-07-01 19:30:53 +01:00
Aviral Dasgupta
1c002866e8 feat: add and configure eslint 2016-07-01 23:08:51 +05:30
David Baker
5cda2a6802 Disable colour output in jenkins script 
As it really confuses jenkins
 2016-06-23 14:38:08 +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
Matthew Hodgson
94aec10512 Merge branch 'develop' into dbkr/scalar 2016-06-19 22:40:48 +01:00
Aviral Dasgupta
b9d7743e5a Emoji provider, DDG working, style improvements 2016-06-17 04:58:09 +05:30
Aviral Dasgupta
769b3f0c2a Merge branch 'develop' into feature-autocomplete 2016-06-17 00:37:39 +05:30
Aviral Dasgupta
4bc8ec3e6d room, user, ddg autocomplete providers (wip) 2016-06-12 17:02:46 +05:30
Aviral Dasgupta
0df201c483 Merge branch 'develop' into feature-autocomplete 2016-06-12 14:10:23 +05:30
Aviral Dasgupta
e4217c3fb7 rte improvements, markdown mode 2016-06-11 15:52:08 +05:30
Aviral Dasgupta
bf8e56e04c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte 2016-06-10 04:43:44 +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
Richard van der Hoff
7999a70cab Switch to dev versions of react-sdk and js-sdk 2016-06-08 21:36:45 +01:00
Richard van der Hoff
cab24bb14c Switch matrix-js-sdk back to develop 2016-06-08 21:34:30 +01:00
David Baker
aca0e060a4 Also change velocity-vector commit & requires 
Because it needs a versiob where the package name is actually updated and the requires need to use the right package name
 2016-06-07 20:47:37 +01:00
David Baker
8679ce80c8 Update vector velocity fork package name 2016-06-07 20:28:38 +01:00
David Baker
d5a522fdfe Second attempt at fixing the Velocity memory leak 
1) Correct fix for Velociraptor (we need to find the DOM node and pass that in)
2) Do the same leak fix for the read marker
3) Update the dependency to our fork which is fixed to make the call we do to release memory actually work.
4) Remove the velocity-ui-pack dependency which is unnecessary because velocity-ui is included in the velocity package
 2016-06-07 18:22:01 +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
fdcebe1e56 Merge remote-tracking branch 'origin/develop' into dbkr/scalar 2016-06-06 17:19:38 +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
507f5e2ca1 0.6.3 2016-06-03 12:17:46 +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
b06ab78a81 0.6.2 2016-06-02 18:55:34 +01:00
Matthew Hodgson
168f74d6cf correctly bump dep on js-sdk 0.5.4 2016-06-02 18:53:50 +01:00
Matthew Hodgson
635fd927cd 0.7.1 2016-06-02 18:41:20 +01:00
Matthew Hodgson
204437e40c 0.6.1 2016-06-02 18:32:50 +01:00
Richard van der Hoff
e0bf23fa7c 0.7.0 2016-06-02 13:42:25 +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
Richard van der Hoff
268cedee0f 0.6.0 2016-06-02 13:38:19 +01:00
Richard van der Hoff
d812c77fc1 Bump to js-sdk 0.5.3 2016-06-02 13:36:45 +01:00
Aviral Dasgupta
b979a16199 initial version of autocomplete 2016-06-01 16:54:21 +05:30
Aviral Dasgupta
7e563b89c7 initial version of rich text editor 2016-05-27 10:17:01 +05:30
Aviral Dasgupta
001011df27 Initial version of rich text editor 2016-05-27 10:15:55 +05:30
Jason Papakostas
6a6118e136 serve config.json statically instead of bundling it 
issue #1344
 2016-05-24 19:08:09 -05:00
David Baker
0bb4f9dd5c add browser request as a dep 
since we need to do requests directly for scalar integ
 2016-05-16 15:35:39 +01:00
David Baker
4f64f70a12 Use react-sdk develop as email notifs needs it 2016-05-10 17:35:35 +02:00
Richard van der Hoff
4cddda67d9 0.6.1 2016-04-22 11:35:51 +01:00
Richard van der Hoff
ee88fe55c1 Bump to react-sdk 0.5.2 2016-04-22 11:30:33 +01:00
Richard van der Hoff
412512570b 0.5.2 2016-04-22 11:21:32 +01:00
Richard van der Hoff
e5e9a3819e Load babel-polyfill in tests 
Object.values() isn't available natively, so use polyfill for it.
 2016-04-21 08:10:46 +01:00
Richard van der Hoff
b8018942fc Bump react-gemini-scrollbar 
(to pick up a non-broken version)
 2016-04-20 13:46:59 +01:00
Richard van der Hoff
37365728cb Bump react-gemini-scrollbar 
(to pick up a non-broken version)
 2016-04-20 13:46:21 +01:00
Richard van der Hoff
02f58ef9e3 Don't relayout scrollpanels every time something changes 
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
 2016-04-20 12:29:32 +01:00
Richard van der Hoff
d953ac4e6b Don't relayout scrollpanels every time something changes 
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
 2016-04-20 12:25:19 +01:00
Richard van der Hoff
b5f029d10e Turn react consistency checks off in develop builds 
For now at least, turn off the consistency checks in build:dev, and hence in
/develop. This will allow us to more meaningfully compare performance between
/beta and /develop.
 2016-04-19 20:28:29 +01:00
Richard van der Hoff
caff20cbb3 Merge pull request #1431 from vector-im/rav/reactperf 
Include react-addons-perf for non-production builds
 2016-04-19 19:28:15 +01:00
Richard van der Hoff
e71ca328e7 Switch back to dev builds of the react-sdk and js-sdk 2016-04-19 18:32:35 +01: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
abca28c80b 0.6.0 2016-04-19 13:39:40 +01:00
Richard van der Hoff
da7909f1ce Bump to release versions of js-sdk and react-sdk 
... in preparation for vector release.
 2016-04-19 13:36:25 +01:00
Richard van der Hoff
9bd68ba5a8 0.5.1 2016-04-19 13:35:06 +01:00
Richard van der Hoff
e114f04e47 Abort publish if build fails 
.. otherwise we end up publishing a broken build.
 2016-04-19 13:30:07 +01:00
Richard van der Hoff
24223ae2b6 0.5.0 2016-04-19 13:20:26 +01:00
Richard van der Hoff
bf6665c9f7 Bump to js-sdk 0.5.2 2016-04-19 13:16:39 +01:00
Richard van der Hoff
210cb31852 Upgrade to react 15.0 
(which also requires upgrades to react-gemini-scrollbar and react-dnd)
 2016-04-17 21:41:50 +01:00
Richard van der Hoff
3cde22169e Upgrade to react 15.0 
Needs a new react-gemini-scrollbar to match.
 2016-04-17 21:40:50 +01:00
Richard van der Hoff
5cdd234bf2 Do less mangling of jenkins builds 
This turns off uglification, and turns on the react sanity checks.
 2016-04-14 15:05:36 +01:00
Richard van der Hoff
cb3ae0e069 Disable autoWatch for npm test 
... we're only going to run the tests once, so there is no need to tell webpack
to watch the sources. This saves a spurious repack.
 2016-04-13 18:13:57 +01:00
Richard van der Hoff
bf31d6d5fa Karma test tweaks 
* Make sure we only get one js-sdk (and update runtime config to match)
* Don't verifyNoOutstandingRequests (since it is hard to be certain which we
  will get, and makes the tests too dependent on implementation-specifics).
* Disable color for npm test, to avoid confusing Jenkins
 2016-04-13 17:41:23 +01:00
Richard van der Hoff
322af6513d Run some tests under karma 
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
 2016-04-13 17:20:06 +01:00
Richard van der Hoff
69ce3c43cf Revert "Merge branch 'develop' into rav/karma" 
The karma tests don't pass yet, and aren't ready to land on develop.

This reverts commit 438453e61a, reversing
changes made to 50f94eb040.
 2016-04-13 17:17:45 +01:00
Richard van der Hoff
429d110212 Run some tests under karma 
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
 2016-04-13 10:15:04 +01:00
Richard van der Hoff
73f7528d0f Use babel 5 for karma tests 2016-03-31 16:59:38 +01:00
Richard van der Hoff
bf055688b7 Switch js-sdk and react-sdk back to develop 2016-03-31 16:35:38 +01:00
Richard van der Hoff
3129e84b6c Switch js-sdk back to develop 2016-03-31 16:34:38 +01:00
Richard van der Hoff
dc5c0928b2 Some basic tests for MessagePanel 
Check that it puts the read marker in the right place, and check that the
animation works.

... all of which has been surprisingly painful.
 2016-03-31 00:48:46 +01:00
Richard van der Hoff
00a92452e8 0.5.0 2016-03-30 13:31:09 +01:00
Richard van der Hoff
20f93e761b Bump to react-sdk 0.4.0 and js-sdk 0.5.1. 2016-03-30 13:27:55 +01:00
Richard van der Hoff
d2e69c819f 0.4.0 2016-03-30 13:25:25 +01:00
Richard van der Hoff
c5793b91cd Bump to js-sdk 0.5.1 2016-03-30 13:23:13 +01:00
Richard van der Hoff
abedb05268 Merge pull request #250 from matrix-org/rav/disable_composer_if_no_permission 
Disable the message composer if we don't have permission to post
 2016-03-29 15:15:58 +01:00
Richard van der Hoff
9ae3a96b6a Add missing devDependencies 2016-03-29 00:12:59 +01:00
Richard van der Hoff
31e283729e Need babel-loader for karma tests 2016-03-29 00:12:59 +01:00
Richard van der Hoff
6069812fcf Create Junit reports from karma 2016-03-29 00:12:59 +01:00
Richard van der Hoff
04561ea6e6 Use phantomjs when running a single test 2016-03-29 00:12:59 +01:00
Richard van der Hoff
f60dd93660 Initial implementation of some karma/mocha tests 
It does something, but things I don't like:

* it churns for 15 seconds webpacking everything. Do we really need to get
  webpack involved here?

* I don't think there's any way to control which tests get run and which don't.

Other things I'd want to fix up include:

* Make it run on jsdom or phantomjs instead of Chrome
* figure out how to configure babel without a .babelrc
 2016-03-29 00:12:58 +01:00
Richard van der Hoff
2462ede539 Switch to dev versions of react-sdk and js-sdk 2016-03-24 17:39:49 +00:00
Richard van der Hoff
cbf5b0eca3 Disable the message composer if we don't have permission to post 
Rehashes dave's earlier PR which did the same thing
 2016-03-24 13:57:21 +00:00
Richard van der Hoff
4507117f89 0.4.1 2016-03-23 14:58:30 +00:00
Richard van der Hoff
5138dc9fd8 Bump to react-sdk 0.3.1 
Disables ScrollPanel debug.
 2016-03-23 14:56:22 +00:00
Richard van der Hoff
dcfc283279 0.3.1 2016-03-23 14:55:44 +00:00
Richard van der Hoff
c12a77bc15 0.4.0 2016-03-23 14:40:16 +00:00
Richard van der Hoff
752f8363a7 Bump to release versions of react-sdk and js-sdk 2016-03-23 14:14:07 +00:00
Richard van der Hoff
31a3f342af 0.3.0 2016-03-23 14:00:40 +00:00
Richard van der Hoff
fb3a471d77 Revert "Switch js-sdk back to develop" 
This reverts commit bf6e13dbcd.

Apparently we don't need this change anyway
 2016-03-23 13:54:20 +00:00
Richard van der Hoff
948b862c31 Bump gemini-scrollbar to latest version 
RoomDirectory uses react-gemini-scrollbar directly, so make sure we are using a
consistent version.
 2016-03-23 12:24:25 +00:00
Richard van der Hoff
bf6e13dbcd Switch js-sdk back to develop 
Matthew has landed some required fix in js-sdk
 2016-03-23 12:11:05 +00:00
Richard van der Hoff
1495a6ffa0 Bump react-sdk to latest develop 
Pick up the version which optimises out onResize handler where possible
 2016-03-23 12:09:09 +00:00
Richard van der Hoff
272bef1606 Bump react-gemini-scrollbar version 2016-03-23 00:03:55 +00:00
Richard van der Hoff
a82c0580d2 Bump to matrix-js-sdk 0.5.0 2016-03-22 19:17:22 +00:00
Richard van der Hoff
a5e0aa763b Bump gemini-scrollbar version 
To fix scrollbar fail thanks to npm's lack of dependency-version conflict
resolution.
 2016-03-18 16:34:20 +00:00
Richard van der Hoff
cb1cf0661e Bump to latest react-gemini-scrollbar build 
Hopefully this will https://github.com/vector-im/vector-web/issues/1186 and
some other bugs.
 2016-03-18 16:06:12 +00:00
Richard van der Hoff
0598092f9d Bump to latest react-gemini-scrollbar 
... which will hopefully fix the mystery of the disappearing member list.
 2016-03-14 19:02:22 +00:00
Richard van der Hoff
d4d2ef326e Bump to dev branch of js-sdk 2016-03-14 15:54:56 +00:00
Richard van der Hoff
6a0cd9e047 Bump to dev branch of js-sdk 2016-03-14 15:54:33 +00:00
Richard van der Hoff
2a62fdb652 Switch back to dev version of react-sdk 2016-03-14 14:08:47 +00:00
Richard van der Hoff
88b3f2ed8c Use our fork of react-gemini-scrollbar to fix resize issues 
Rather than telling react-gemini-scrollbar to update every time something that
changes its size happens, try out our fork of it which uses some hackery to
listen for resizes.
 2016-03-14 12:46:13 +00:00
Richard van der Hoff
8fa059fc4b Prep 0.3.0 2016-03-11 13:00:31 +00:00
Richard van der Hoff
fc062072b0 Bump to 0.2.0 2016-03-11 12:52:21 +00:00
Richard van der Hoff
eeab97114f Prepare v0.2.0 2016-03-11 12:48:26 +00:00
Richard van der Hoff
02510003dd prep v0.1.1 2016-03-11 12:24:44 +00:00
Richard van der Hoff
030b8fe113 Merge remote-tracking branch 'origin/0_1_0_fixes' into develop 2016-02-25 17:32:22 +00:00
Richard van der Hoff
c1bb527539 s/version.txt/git-revision.txt/ 2016-02-25 16:50:27 +00:00
Richard van der Hoff
dceb4a9297 Add a 'version.txt' file to the tarball 
This will enable the vector build to know what it got
 2016-02-25 15:24:10 +00:00
David Baker
874123bbfa Move package script out and make it tar into a versioned top level directory. It may as well be a shell script since it's unix specific anyway, and maintaining it inside package.json is now impractical. 2016-02-24 18:41:30 +00:00
David Baker
b088651211 Use the --tags option so it works with non-annoated tags (seriously, git?) 2016-02-24 15:05:13 +00:00
David Baker
ebd5399626 Bump to version 0.2.0 2016-02-24 14:24:15 +00:00
David Baker
5d63d2269e Use newly released versions of js-sdk & react-sdk 2016-02-24 14:21:53 +00:00
David Baker
4b13d71bb4 Bump to 0.1.0 2016-02-24 14:14:53 +00:00
David Baker
cd92f0ea62 Use new release of js-sdk 2016-02-24 14:06:03 +00:00
Matthew Hodgson
484736bf57 oops, add sanitize-html 2016-02-21 00:05:44 +00:00
David Baker
95a3354b90 Merge pull request #914 from vector-im/dbkr/package_use_tar 
Use tar for packaging because zip can't traverse directory symlinks
 2016-02-11 15:09:49 +00:00
David Baker
82b498017d Bumb webpack micro version (although it would have installed the latest micro version anyway) to maybe get a webpack that doesn't throw stack depth errors. 2016-02-11 15:01:32 +00:00
David Baker
b929f80be8 Use tar for packaging because zip can't traverse directory symlinks, hence ditch windows support for packaging. 2016-02-11 14:59:22 +00:00
David Baker
05a30e7c68 Merge pull request #902 from vector-im/dbkr/add_package_script 
Add 'package' script to build a webapp bundle
 2016-02-11 14:18:06 +00:00
David Baker
3c75c43d37 Bail if build step fails 2016-02-11 13:59:40 +00:00
David Baker
369e357742 We expect the mkdir to fail when the dir exists, so use ; not && 2016-02-11 13:40:26 +00:00
David Baker
93f8fcbacc Add 'package' script to build a webapp bundle for straight unzipping on a production server. 2016-02-10 15:35:06 +00:00
Matthew Hodgson
155728b136 make babel actually do full ES6 emulation for Safari 8 2016-02-10 14:54:55 +00:00
Kegan Dougal
0752c3a6d5 Add start:prod - same as 'npm run start' but with NODE_ENV=production 2016-01-22 13:17:09 +00:00
David Baker
99a491bb0e Merge pull request #68 from matrix-org/notif_sync 
Set room highlight from unread_notification_count
 2016-01-21 10:31:42 +00:00
David Baker
02e41450b4 Do (more) client side validation of registration parameters. 2016-01-15 13:31:41 +00:00
David Baker
6ea3f21a8e Favicon badges 2015-12-21 12:55:13 +00:00
David Baker
939733b736 Merge branch 'develop' into require-css 2015-12-02 10:26:26 +00:00
Kegan Dougal
d837d02ac9 Still add highlight.js as an import as we symlink directly to the node_module for github.css :/ - Fixes ENOENT 2015-12-02 09:26:12 +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
5e2a4fa537 Merge branch 'develop' into skindex-nextgen 2015-12-01 15:48:05 +00:00
David Baker
021056cfd1 Move copyright header 2015-11-30 18:00:54 +00:00
David Baker
4f8895f160 Copyright header on component index 2015-11-30 18:00:19 +00:00
David Baker
730b33535a More WIP component indexing 2015-11-30 17:33:04 +00:00
David Baker
6f646260aa WIP of component indexing update 2015-11-30 17:31:32 +00:00
Kegan Dougal
80a235adf9 Move and merge MemberList 2015-11-30 15:13:28 +00:00
Kegan Dougal
9950e45b7d Add required imports 2015-11-27 15:39:52 +00:00
Kegan Dougal
af30ef1f72 Remove unusued imports 2015-11-27 15:39:29 +00:00
Kegan Dougal
5ba1ef5203 Move velocity stuff / contextual menu from Vector to React. 2015-11-27 15:37:40 +00:00
Kegan Dougal
05c9b44b81 Move velocity stuff to react sdk 2015-11-27 15:34:26 +00:00
Matthew Hodgson
da97185fcd highlight <code/> blocks via highlight.js 2015-11-21 12:14:56 +00:00
Matthew Hodgson
76c6d6d4d6 add target=_blank onto all HTML links, and apply GFM.css for CSS for markdown 2015-11-20 20:12:23 +00:00
Kegan Dougal
b12fc67a63 Add markdown support (enabled by default) 2015-11-20 16:08:57 +00:00
Richard van der Hoff
3a003341ad Merge pull request #387 from vector-im/rav/suppress_unread_on_memberchange 
Don't mark rooms as unread on m.room.member changes
 2015-11-19 13:22:37 +00:00
David Baker
025b9e2fc8 depend on react sdk dev 2015-11-18 14:54:32 +00:00
David Baker
caabe02fca Merge pull request #32 from matrix-org/read_receipts 
Read receipts
 2015-11-18 14:53:25 +00:00
Richard van der Hoff
c42d4f901b Don't mark rooms as unread on m.room.member changes 
A quick and hacky fix to issue #169.
 2015-11-18 11:01:47 +00:00
David Baker
816f20e068 comma 2015-11-16 16:36:01 +00:00
David Baker
bb59e9276b Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-16 16:33:39 +00:00
David Baker
bc2c744bed more bits of read receipt animation implemented 2015-11-13 11:42:51 +00:00
Matthew Hodgson
02ad2b5152 remove react-loader (not that the controller should be rendering spinners in the first place :( 2015-11-10 18:25:10 +00:00
Matthew Hodgson
68c1ddd5d2 replace react-loader with Spinner everywhere 2015-11-10 18:12:26 +00:00
David Baker
2f783a7ba9 Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-10 11:27:43 +00:00
David Baker
450036a6ed Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-10 11:26:42 +00:00
Matthew Hodgson
cb887c699e use gemini-scrollbar to provide fake scrollbars for the room list 2015-11-10 01:40:08 +00:00
Matthew Hodgson
87bb7c9b7b upgrade to react 0.14 2015-11-09 23:13:46 +00:00
Matthew Hodgson
efd88b9a83 upgrade to react 0.14 2015-11-09 23:13:43 +00:00
David Baker
d8edbd2e3c Requires js-sdk develop 2015-11-05 14:45:48 +00:00
David Baker
0aa90d918c bump js-sdk dep to develop 2015-11-05 14:45:16 +00:00
Matthew Hodgson
7fe7af6026 refactor out the sections of the RoomList into RoomSubLists. Start wiring up tags 2015-11-04 00:19:37 +00:00
Matthew Hodgson
e25d31a9fe Merge pull request #296 from vector-im/matthew/redesign 
Matthew/redesign
 2015-10-30 18:30:13 +00:00
David Baker
ffb9ce89c7 Merge branch 'develop' into matthew/redesign 2015-10-30 11:50:34 +00:00
Matthew Hodgson
fdfa0cbd0e display search results correct; support HTML markup 2015-10-30 04:10:37 +00:00
Kegan Dougal
cc313f350c Merge branch 'develop' into kegan/blocking 2015-10-29 16:03:26 +00:00
David Baker
5c77395faa v0.1.2 2015-10-28 18:32:13 +00:00
David Baker
e48e636c44 Bump js-sdk & react-sdk deps 2015-10-28 18:27:09 +00:00
David Baker
966f44baa1 bump js-sdk -> 0.3.0 on the right branch 2015-10-28 18:06:10 +00:00
David Baker
c46f40c816 bump js-sdk -> 0.3.0 2015-10-28 18:02:50 +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
David Baker
d12ca92ea7 Avoid double updating: setting the state will cause a re-render so forcing an update is redundant. Also bump js sdk dep to newest to match vector. 2015-10-13 11:12:06 +01:00
David Baker
1dd707775a Use new js-sdk modified time to avoid unnecessary member tile updates. Also avoid double-updating since we were setting state and then forcing an update which is redundant. 2015-10-13 11:10:43 +01:00
David Baker
53c8b9bcf7 no single quotes because windows 2015-10-05 10:20:02 +01:00
David Baker
55f656f150 0.0.2 2015-10-02 18:55:09 +01:00
David Baker
2247d951d6 Add config file for default hs/is urls 2015-10-02 11:48:52 +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
4472f63b5f We need js sdk 0.2.1 for getRoomIdForAlias 2015-09-25 17:49:35 +01:00
David Baker
3ecf19df49 Disable caching on the local http server as commented 2015-09-25 17:38:51 +01:00
David Baker
56530d80d7 Add link to guthub issue about webpack's loader path silliness 2015-09-25 13:53:58 +01:00
David Baker
d172aaf41f Add -loader packages as deps 
Even though we don't use webpack directly, webpack needs the loaders
to be in the dependency package's node_modules directory, so this
lets packages that depend on us use webpack.
 2015-09-25 13:39:21 +01:00
David Baker
796f424a3f Didn't need these in the end 2015-09-25 11:51:35 +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
David Baker
c21dd853f9 Update package.json for renamed skin 2015-09-23 09:48:18 +01:00
David Baker
7e72ee891a More fixing up of vector skin 2015-09-22 18:49:04 +01:00
David Baker
09b81f46b0 Remove controllers that all come from react-sdk 2015-09-22 17:20:22 +01:00
David Baker
d938ba70d3 Port over room leaving 2015-09-17 12:10:01 +01:00
David Baker
901574b56e Update package.json 2015-09-16 14:13:16 +01:00
David Baker
aba4c1e9af We don't use catw here anymore 2015-09-15 14:46:41 +01:00
David Baker
f3b9f8c799 WIP reworking of skinning and app integration process 2015-09-11 15:42:11 +01:00
David Baker
9b73d6ed6d react-tools is dead. Long live Babel. 2015-09-10 15:28:30 +01:00
David Baker
6cc88e4ef3 Remove stuff that's going into the base skin 2015-09-09 16:57:55 +01:00
David Baker
e1a6ede17b Ignore all module caches and make the built js the default include root 2015-09-08 18:45:00 +01:00
Matthew Hodgson
5bab440a1f temporarily pin flux to 2.0, as 2.1 switches to ES6 and Babel which breaks our Dispatcher.js which fails to correctly extend the new Flux dispatcher, presumably due to using our noddy extend.js rather than an ES6-compatible one 2015-08-29 20:28:07 +01:00
David Baker
5a87b9759f update to new js-sdk 2015-08-07 11:27:13 +01:00
Kegan Dougal
772f987489 Unbreak npm start when running on Windows 2015-07-22 08:25:40 +01:00
David Baker
c8f3f5841c Depend on develop js-sdk for now 2015-07-21 22:51:54 -07:00
Matthew Hodgson
c33899e93a bump to the same react version as the custom app 2015-07-12 14:26:51 +01:00
David Baker
63d7ff3ed6 Build the logic too into the same hierarchy as it is unbuilt so it can be used either processed or unprocessed. Does involve having a dir called 'src' in the built products directory, and abusing jsx as a cross-platform version of cp (there is no jsx in the src dir). 2015-07-10 18:09:30 +01:00
David Baker
a00510c1ca Linkify URLs 2015-07-09 15:41:19 +01:00
David Baker
53e9d030b7 See uploaded files 2015-07-08 16:25:27 +01:00
David Baker
36ecbfc87f Upload files and images 2015-07-08 14:34:53 +01:00
David Baker
dff74f44de Tweak the example build process. Move example -> examples/trivial to we can have more than one. Update README appropriately. 2015-07-03 15:56:04 +01:00
Matthew Hodgson
aaa38d95ba s/themes/skins/g as we are always describing the whole UI layout here, whereas themes can sometimes just be small cosmetic tweaks (light-on-dark, dark-on-light etc) 2015-06-23 18:28:20 +01:00
David Baker
6fc1c54e66 Bump js-sdk version 2015-06-23 15:48:15 +01:00
David Baker
a022a4b9a6 Reshuffle to put "HTML" (JSX) and CSS together as a theme with logic elsewhere. 2015-06-23 14:40:50 +01:00
David Baker
5c56b201fc sensible version of js-sdk 2015-06-18 11:56:12 +01:00
David Baker
125fa78bc6 Something starting to resemble a Matrix Client 2015-06-12 17:34:17 +01:00
David Baker
877873e730 Build (and watch-build) jsx->js and modular css -> (uglified) css bundle 2015-06-10 15:54:36 +01:00
David Baker
2ea9ed8d79 Add repository fields to package.json and add a README to the example 2015-06-09 18:52:26 +01:00
David Baker
c42733ec95 Basic structure of a react SDK and start of an implementation. 2015-06-09 17:40:42 +01:00