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

872 Commits

Author SHA1 Message Date
Matthew Hodgson
b7843a5d46 find versions of webpack, webpack-cli, and karma-webpack which work together atm 2018-09-26 01:18:53 +01:00
Matthew Hodgson
41e03333a7 Merge branch 'develop' into matthew/webpack4 2018-09-26 00:17:49 +01:00
Matthew Hodgson
c57c653535 Merge branch 'develop' into matthew/webpack4 2018-09-26 00:15:56 +01:00
Travis Ralston
91304e70a1 Swap out the complicated canary stuff for serial execution 
Fixes https://github.com/vector-im/riot-web/issues/7386
 2018-09-25 15:49:14 -06:00
Travis Ralston
27c23058dc Alter build process to rely on canaries only 
With the react-sdk and js-sdk having their `npm start`s split out (as per https://github.com/matrix-org/matrix-react-sdk/pull/2175 and https://github.com/matrix-org/matrix-js-sdk/pull/742) we can trigger an initial build ourselves and start the watcher afterwards. This canary approach has a very slight speed increase over serially running all the commands as the watcher can be started as early as possible.

This all can be improved and potentially eliminated with a bit more planning, however: https://github.com/vector-im/riot-web/issues/7386
 2018-09-25 11:20:58 -06:00
Travis Ralston
2b037ee146 Prevent races by blocking on SDK builds 
If we don't block on SDK builds, then the riot-web build fails due to half-built dependencies. This needs to be done at two levels: the js-sdk because it is used by both the react-sdk and riot-web, and at the react-sdk because riot-web needs it. This means our build process is synchronous for js -> react -> riot, at least for the initial build. 

This does increase the startup time, particularly because the file watch timer is at 5 seconds. The timer is used to detect a storm of file changes in the underlying SDKs and give the build process some room to compile larger files if needed. 

The file watcher is accompanied by a "canary signal file" to prevent the build-blocking script from unblocking too early. Both the js and react SDKs build when `npm install` is run, so we ensure that we only listen for the `npm start` build for each SDK.

This is all done at the riot level instead of at the individual SDK levels (where we could use a canary file to signal up the stack) because:
* babel (used by the js-sdk) doesn't really provide an "end up build" signal
* webpack is a bit of a nightmare to get it to behave at times
* this blocking approach is really only applicable to riot-web, although may be useful to some other projects.

Hopefully that all makes sense.
 2018-09-24 17:12:42 -06:00
Travis Ralston
67e9606d55 Reduce the number of terminals required to build riot-web to 1 
A step towards a real solution for https://github.com/vector-im/riot-web/issues/7305

This approach makes use of `npm link` to remove the use of symlinks in the build process. The build process has also been altered to invoke the build process of each underlying SDK (react, js). This means that one can now `npm link` and `npm start` and have a working environment. 

At the same time, parallelshell was dropped due to lack of maintenance from the maintainer.
 2018-09-17 17:50:03 -06:00
David Baker
2b18aa7d79 Merge branch 'release-v0.16.4' 2018-09-10 11:47:09 +01:00
David Baker
0f9c8235e1 v0.16.4 2018-09-10 11:43:23 +01:00
David Baker
ce4c71ccfb Released js-sdk & react-sdk 2018-09-10 11:41:45 +01:00
David Baker
d6406b48fd v0.16.4-rc.1 2018-09-07 14:42:52 +01:00
David Baker
09130582ad js-sdk & react-sdk rc.1 2018-09-07 14:38:16 +01:00
Matthew Hodgson
588369d297 downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57 
thanks @ZerataX! :)
 2018-09-04 20:32:06 +01:00
David Baker
d00ca02c25 v0.16.3 2018-09-03 14:34:06 +01:00
David Baker
6231cf3496 Released js-sdk & react-sdk 2018-09-03 14:28:34 +01:00
David Baker
5170635a1f v0.16.3-rc.2 2018-08-31 13:52:58 +01:00
David Baker
2b91595aa9 js-sdk & react-sdk rc.2 2018-08-31 13:50:12 +01:00
David Baker
7cfda97b82 v0.16.3-rc.1 2018-08-30 14:40:22 +01:00
David Baker
447c133d82 js-sdk & react-sdk rc.1 2018-08-30 14:38:15 +01:00
David Baker
e54865b7ec electron 2.0.8 2018-08-30 11:38:20 +01:00
David Baker
cdcdab82eb v0.16.2 2018-08-23 15:34:00 +01:00
David Baker
49523ba8d1 New react-sdk for new server notices format 2018-08-23 15:31:26 +01:00
David Baker
dd8ed7cc77 v0.16.1 2018-08-20 14:00:47 +01:00
David Baker
2a0cc21dfe Released js-sdk & react-sdk 2018-08-20 13:58:00 +01:00
David Baker
472e55cea5 v0.16.1-rc.1 2018-08-16 15:47:50 +01:00
David Baker
1a73284b0c js-sdk & react-sdk rc.1 2018-08-16 15:43:17 +01:00
David Baker
37e848eee9 Bump electron version 2018-08-16 15:09:57 +01:00
David Baker
a79e9b4fd6 Unpin sanitize-html 
1.18.4 is now out which makes it work with webpack again
 2018-08-02 16:22:07 +01:00
David Baker
8a18488b1e Pin sanitize-html to 0.18.2 
Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241
 / https://github.com/punkave/sanitize-html/issues/242
 2018-08-02 11:00:35 +01:00
David Baker
764797e211 v0.16.0 2018-07-30 12:19:27 +01:00
David Baker
88745a9f36 Released js-sdk & react-sdk 2018-07-30 12:13:29 +01:00
David Baker
8bd832b449 v0.16.0-rc.2 2018-07-24 19:42:11 +01:00
David Baker
8e5b67d7c9 react-sdk rc.2 2018-07-24 19:40:31 +01:00
David Baker
f5a257ca79 v0.16.0-rc.1 2018-07-24 18:35:02 +01:00
David Baker
96b624e941 js-sdk & react-sdk rc.1 2018-07-24 18:33:04 +01:00
David Baker
25c0656106 Update to electron 2.0.5 2018-07-24 18:28:48 +01:00
David Baker
7e03b25030 v0.15.7 2018-07-09 13:20:29 +01:00
David Baker
73be5005c2 Released react-sdk & js-sdk 2018-07-09 13:16:42 +01:00
David Baker
c36b42af71 v0.15.7-rc.2 2018-07-06 16:01:42 +01:00
David Baker
75e9489db5 js-sdk rc.1 & react-sdk rc.2 2018-07-06 15:58:39 +01:00
David Baker
0de36d331f v0.15.7-rc.1 2018-07-04 11:28:19 +01:00
David Baker
6ada5e5b26 react-sdk rc.1 2018-07-04 11:26:33 +01:00
David Baker
aee6b28469 Bump electron version 2018-07-04 11:18:30 +01:00
David Baker
768e206c4a v0.15.6 2018-06-29 12:02:51 +01:00
David Baker
e193b65bc7 Released js-sdk & react-sdk 2018-06-29 11:54:01 +01:00
David Baker
fb43e49954 v0.15.6-rc.2 2018-06-22 18:15:34 +01:00
David Baker
79cf34b72e react-sdk rc.2 2018-06-22 18:12:41 +01:00
David Baker
ee6fc5859c v0.15.6-rc.1 2018-06-21 10:20:26 +01:00
David Baker
f9e7af6e90 js & react sdk rc.1 2018-06-21 10:09:01 +01:00
David Baker
9dd37ac9e2 v0.15.5 2018-06-12 14:36:10 +01:00
David Baker
79bc81317d Released react-sdk & js-sdk 2018-06-12 14:30:44 +01:00
David Baker
33a2e068f6 v0.15.5-rc.1 2018-06-06 16:11:58 +01:00
David Baker
1ed2935eb6 react-sdk & js-sdk rc.1 2018-06-06 16:08:47 +01:00
David Baker
a4b58f4d83 v0.15.4 2018-05-25 15:25:10 +01:00
David Baker
57c79c7133 released react-sdk & js-sdk 2018-05-25 15:22:39 +01:00
David Baker
93ea9d7c36 v0.15.4-rc.1 2018-05-24 18:28:44 +01:00
David Baker
cd9821f87e Merge branch 'develop' into release-v0.15.4 2018-05-24 18:26:02 +01:00
David Baker
10881587e9 electron 2.0.2 2018-05-24 18:25:35 +01:00
David Baker
1bfe4513ac js-sdk & react-sdk RCs 2018-05-24 18:24:20 +01:00
David Baker
ec62b5f03c v0.15.3 2018-05-18 12:38:59 +01:00
David Baker
b1f0f33204 Update to electron 2.0.1 
It does have a security fix
 2018-05-18 12:24:12 +01:00
David Baker
b128431128 v0.15.2 2018-05-17 17:10:17 +01:00
David Baker
b90017ff15 react-sdk v0.12.5 2018-05-17 17:06:24 +01:00
David Baker
4e6c2fdd1c v0.15.1 2018-05-16 16:16:23 +01:00
David Baker
f759bfb1f6 Bump to Electron 2.0.0(!) 2018-05-16 15:30:42 +01:00
David Baker
0a4614247f v0.15.0 2018-05-16 11:56:07 +01:00
David Baker
c4ecf40d1c Released react-sdk 2018-05-16 11:54:29 +01:00
David Baker
02ab1fded2 v0.15.0-rc.6 2018-05-15 18:08:52 +01:00
David Baker
ecfefd6b21 react-sdk rc.6 2018-05-15 18:06:11 +01:00
Luke Barnard
50e430d8dc v0.15.0-rc.5 2018-05-15 16:01:39 +01:00
Luke Barnard
7eb14ad12c Bump react-sdk version to 0.12.4-rc.5 2018-05-15 15:54:07 +01:00
Luke Barnard
e5641fe71c v0.15.0-rc.4 2018-05-14 18:31:07 +01:00
Luke Barnard
be5aa59e39 Bump react-sdk dep to 0.12.4-rc.4 2018-05-14 18:20:28 +01:00
Luke Barnard
9b2fa966f1 v0.15.0-rc.3 2018-05-11 18:31:34 +01:00
Luke Barnard
030fc041be Bump react-sdk dep to 12.4-rc.3 (for instant sticker picker) 2018-05-11 18:28:40 +01:00
David Baker
8f4953c182
Merge branch 'develop' into webpack4 2018-05-11 16:27:50 +01:00
Luke Barnard
c2fccb7e14 v0.15.0-rc.2 2018-05-09 17:39:57 +01:00
Luke Barnard
82a27d7fa3 Bump react-sdk version to 0.12.4-rc.2 2018-05-09 17:31:31 +01:00
Luke Barnard
2ea7ad6d7b v0.15.0-rc.1 2018-05-09 15:31:25 +01:00
Luke Barnard
fb0bbf31c4 v0.14.3-rc.1 2018-05-09 13:52:27 +01:00
Luke Barnard
0e00677851 Bump react-sdk dep to 12.4-rc.1 2018-05-09 13:48:06 +01:00
David Baker
d6a226e6bd
Put webpack-dev-server in development mode 
https://github.com/webpack/webpack-dev-server/issues/1327
 2018-05-04 18:37:29 +01:00
David Baker
76d4a4f3fe v0.14.2 2018-04-30 13:44:23 +01:00
David Baker
ff8f617fc6 Released react-sdk & js-sdk 2018-04-30 13:42:38 +01:00
MTRNord
d69084f31e
Fix builld:dev build by using raw-loader instead css-raw-loader 2018-04-27 12:02:00 +02:00
MTRNord
02a185f2fe
Update Webpack to version 4 2018-04-27 11:32:59 +02:00
David Baker
137665685d v0.14.2-rc.3 2018-04-26 15:38:18 +01:00
David Baker
1eb82d97ae Fix dependencies to the same versions as react-sdk 
Otherwise Things Get Weird, eg. headers in the left panel end up in
the wrong place because the gemini scrollbar CSS has changed
between versions.
 2018-04-26 15:25:20 +01:00
David Baker
b8f7025f2a v0.14.2-rc.2 2018-04-26 11:46:38 +01:00
David Baker
18ba570c74 Bump react-sdk version 2018-04-26 11:33:44 +01:00
David Baker
5923417654 v0.14.2-rc.1 2018-04-25 17:39:56 +01:00
David Baker
981bd94615 Change CSS dependencies to not hardcoded paths 
Add add direct dependencies on the packages they come from, because
referring to them by path like this doesn't work in a frash
checkout / npm install because of how npm lays out the packages.
 2018-04-25 17:33:18 +01:00
David Baker
8d4d16bde1 Bump react-sdk version 2018-04-25 16:35:13 +01:00
David Baker
ee9f781adc js-sdk & react-sdk RCs 2018-04-25 15:37:24 +01:00
David Baker
83c20f5d5d Bump electron version to 1.8.4 2018-04-25 15:00:39 +01:00
Matthew Hodgson
df3fb83da3 move deps to sdk for stuff now in the sdk 2018-04-18 10:53:17 +01:00
David Baker
c8a3471135 Merge branch 'master' into develop 2018-04-12 13:07:09 +01:00
David Baker
740b221769 v0.14.1 2018-04-12 13:02:27 +01:00
David Baker
c631858ab3 Bump js-sdk & react-sdk 2018-04-12 12:57:04 +01:00
Luke Barnard
8644a5ead9 Merge branch 'master' into develop 2018-04-11 12:04:58 +01:00
Luke Barnard
eaeb495349 v0.14.0 2018-04-11 12:01:45 +01:00
Luke Barnard
5fc37032ad Bump js-sdk to 0.10.0, react-sdk to 0.12.1 2018-04-11 11:42:56 +01:00
Luke Barnard
74454567bc v0.14.0-rc.6 2018-04-09 17:16:37 +01:00
Luke Barnard
8eaabceb0c Bump react version number 2018-04-09 17:09:11 +01:00
Luke Barnard
ec2adc4516 v0.14.0-rc.5 2018-04-09 15:46:35 +01:00
Luke Barnard
60079d4206 Bump matrix-js-sdk, matrix-react-sdk versions 2018-04-09 15:36:43 +01:00
Luke Barnard
e739d1b850 Bump source-map-loader version to avoid bug /w inline base64 maps 2018-04-09 13:50:43 +01:00
David Baker
220b553a97 v0.14.0-rc.4 2018-03-22 13:29:01 +00:00
David Baker
047d37b417 Bump react-sdk version 2018-03-22 13:25:30 +00:00
David Baker
96b56fd901 v0.14.0-rc.3 2018-03-20 17:42:23 +00:00
David Baker
f3a5a31ccf Bump react-sdk version 2018-03-20 17:39:31 +00:00
David Baker
99b20e49c3 v0.14.0-rc.2 2018-03-19 15:02:10 +00:00
David Baker
ae44efcebf Bump react-sdk version 2018-03-19 15:00:09 +00:00
David Baker
d7c0e3ddc9 v0.14.0-rc.1 2018-03-19 12:21:05 +00:00
David Baker
4af53fabbc Bump js-sdk & react-sdk 2018-03-19 12:17:53 +00:00
David Baker
0e2a911b57 Bump electron version 2018-03-16 16:16:50 +00:00
David Baker
1d2f5bafda Merge branch 'master' into develop 2018-02-09 12:46:28 +00:00
David Baker
9e614a54da v0.13.5 2018-02-09 12:43:45 +00:00
David Baker
b20dea58c6 Bump react-sdk version 2018-02-09 12:36:19 +00:00
lukebarnard
883ee4ec75 Remove react-dnd 2018-01-19 13:35:11 +00:00
lukebarnard
3481283af8 Swap RoomList to react-beautiful-dnd 
Includes themeing

See matrix-org/matrix-react-sdk#1711
 2018-01-18 17:54:39 +00:00
Michael Telatynski
627ebb848d
Change author 2018-01-08 21:32:25 +00:00
David Baker
5635614549 v0.13.4 2018-01-03 16:13:24 +00:00
Luke Barnard
b73f0c7b90 v0.13.3 2017-12-04 12:31:50 +00:00
Luke Barnard
c685546e9a Bump js-sdk to 0.9.2, react-sdk to 0.11.3 2017-12-04 12:27:49 +00:00
Richard van der Hoff
5fff46fdac v0.13.2 2017-11-28 11:17:57 +00:00
Richard van der Hoff
2e9f309415 Bump to react-sdk 0.11.2 2017-11-28 11:16:13 +00:00
David Baker
aad2069a51 v0.13.1 2017-11-17 16:09:48 +00:00
David Baker
538e1d2446 Released js-sdk & react-sdk 2017-11-17 16:05:01 +00:00
Luke Barnard
629a18ebef v0.13.0 2017-11-15 11:09:31 +00:00
Luke Barnard
02c2e1a14c Bump js/react SDKs to releases 0.9.0 & 0.11.0 2017-11-15 11:03:20 +00:00
Luke Barnard
ad0cb6f0a8 v0.13.0-rc.3 2017-11-14 14:22:29 +00:00
Luke Barnard
e1c762dcaa Bump react-sdk version to 0.11.0-rc.3 2017-11-14 14:20:21 +00:00
Luke Barnard
ef9f2f7ce6 v0.13.0-rc.2 2017-11-10 16:53:03 +00:00
Luke Barnard
150fa43735 Bump react-sdk dep 2017-11-10 16:51:05 +00:00
Luke Barnard
5c9dd17d21 v0.13.0-rc.1 2017-11-10 13:44:55 +00:00
Luke Barnard
1008ede4d1 Bump matrix-react/js-sdk deps 2017-11-10 13:42:31 +00:00
Richard Lewis
63bcca1c7d Merge pull request #4881 from vector-im/rxl881/parallelshell 
Rxl881/parallelshell
 2017-10-20 17:11:20 +01:00
David Baker
00f902cab1 Add script to prune unused translations 2017-10-19 12:11:53 +01:00
David Baker
4e31aea402 Switch to gen-i18n script 2017-10-19 10:53:02 +01:00
Richard Lewis
568cd0aac6 Update parallelshell to ^3.02 2017-10-19 10:12:00 +01:00
Michael Telatynski
6ccacfee46
bump version to prevent eslint errors 
got bumped in react-sdk, missed here

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-17 14:44:41 +01:00
David Baker
bf56a00d60 v0.12.7 2017-10-16 14:56:52 +01:00
David Baker
bfae8e98a1 Released js-sdk & react-sdk 2017-10-16 14:52:00 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
943c9d931e v0.10.0-rc.1 2017-06-02 01:12:19 +01:00
Matthew Hodgson
0fbd73a3c9 bump js & react sdk 2017-06-01 02:16:57 +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
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
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
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
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
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
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
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
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
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
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
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
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
Richard van der Hoff
ccc33db9dd Compress uploaded rageshakes. (#3647) 2017-04-18 17:23:34 +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
6a5d0dda2f Use release versions of js-sdk & react-sdk 2017-04-12 10:03:43 +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
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
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
Matthew Hodgson
546e2ab30b bump emojione 2017-04-01 01:28:44 +01:00
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
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
53e5c7eebe Unpin js-sdk & react-sdk 2017-02-03 14:39:11 +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
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
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
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
bc714ba3a0 Add eslint config 
An early start that gets some linting in place.
 2017-01-23 14:22:54 +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
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
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
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
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
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
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
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
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