David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								9b80aa76ce 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #7385  from vector-im/dbkr/wasm  
							
							 
							
							... 
							
							
							
							Support WebAssembly version of Olm 
							
						 
						
							2018-10-25 15:58:24 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								de7d3ba701 
								
							
								 
							
						 
						
							
							
								
								Change electron build script paths  
							
							 
							
							... 
							
							
							
							Because electron builder has decided to output the mac assets to
somewhere else today. 
							
						 
						
							2018-10-16 10:26:04 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c5ee92f4c3 
								
							
								 
							
						 
						
							
							
								
								Fall back to legacy asm.js Olm  
							
							 
							
							
							
						 
						
							2018-10-04 20:11:34 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								30f0a7932b 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/wasm  
							
							 
							
							
							
						 
						
							2018-10-02 16:58:31 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1f34d2d644 
								
							
								 
							
						 
						
							
							
								
								Kill off olm-loader  
							
							 
							
							... 
							
							
							
							Now that Olm needs to be inited asynchronously anyway, we can just
pass the options to Olm.init(), and as long as we do that before we
start the js-sdk, we're all good.
This will means the olm js is now part of the main bundle but since
it's now just a wrapper around the wasm, this is probably faster.
Also add the directwatch flag to olm.wasm because otherwise it
doesn't seem to copy the file in watch mode... 
							
						 
						
							2018-09-26 16:44:52 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								4041f3db5c 
								
							
								 
							
						 
						
							
							
								
								Send standard output/input from npm-sub.js to the parent proc  
							
							 
							
							
							
						 
						
							2018-09-25 15:54:38 -06: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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c511902356 
								
							
								 
							
						 
						
							
							
								
								Support WebAssembly version of Olm.  
							
							 
							
							... 
							
							
							
							* Olm no longer supports setting the stack/memory size at runtime,
   so don't (they're now set to be that in the Olm build).
 * Copy the wasm file from the Olm library (see multiple comments
   about it being in the wrong place and webpack being awful). 
							
						 
						
							2018-09-25 17:55:41 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								8d7cec2a94 
								
							
								 
							
						 
						
							
							
								
								Add some comments to describe the build process  
							
							 
							
							
							
						 
						
							2018-09-24 17:57:18 -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
							
						 
						
							 
							
							
							
								
							
								c6da122e41 
								
							
								 
							
						 
						
							
							
								
								Fix npm link in the build script  
							
							 
							
							
							
						 
						
							2018-09-17 17:57:27 -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
							
						 
						
							 
							
							
							
								
							
								8a167d2743 
								
							
								 
							
						 
						
							
							
								
								Add Norsk & Italian  
							
							 
							
							
							
						 
						
							2018-08-16 15:04:17 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0abaff5aed 
								
							
								 
							
						 
						
							
							
								
								Copy media from react-sdk  
							
							 
							
							... 
							
							
							
							Looks like this just got missed
Fixes https://github.com/vector-im/riot-web/issues/6586  
							
						 
						
							2018-04-23 17:27:35 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f012dd5f31 
								
							
								 
							
						 
						
							
							
								
								Fix favicon  
							
							 
							
							... 
							
							
							
							In removing 'media' here, it changed the meaning of the copy so
the contents of vector-icons (rather than the dir itself) got
copied to webapp/ 
							
						 
						
							2018-04-23 11:28:01 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								a46b718b4a 
								
							
								 
							
						 
						
							
							
								
								copy resources from their new locations  
							
							 
							
							
							
						 
						
							2018-04-13 01:49:52 +01:00  
						
					 
				
					
						
							
							
								 
								Krombel
							
						 
						
							 
							
							
							
								
							
								57803f7a41 
								
							
								 
							
						 
						
							
							
								
								reorder based on language code  
							
							 
							
							
							
						 
						
							2018-03-17 16:24:47 +01:00  
						
					 
				
					
						
							
							
								 
								Krombel
							
						 
						
							 
							
							
							
								
							
								14f70beac2 
								
							
								 
							
						 
						
							
							
								
								Add languages (czech, galician and serbian)  
							
							 
							
							
							
						 
						
							2018-03-17 11:27:10 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								075f568f61 
								
							
								 
							
						 
						
							
							
								
								Fix crash; fs event received /w langauge file empty  
							
							 
							
							... 
							
							
							
							It was common, at least for me, to experience a crash produced
when running the `matrix-react-sdk/scripts/gen-i18n.js` script
because when writing en_EN.json (via the script or otherwise)
choikdar would receive an event and cause the file to be read,
but the file would be empty when clearly it wasn't.
This would happen even when doing an atomic write in gen-i18n.
The fix adds a debounce as a workaround. 
							
						 
						
							2018-03-02 15:30:06 +00:00  
						
					 
				
					
						
							
							
								 
								Ralitsa Bozhkova
							
						 
						
							 
							
							
								
								
							
							
								
							
								90897b0741 
								
									
								
							
								 
							
						 
						
							
							
								
								Add Bulgarian to the list of languages  
							
							 
							
							... 
							
							
							
							Bulgarian is now at 100% for both riot-web and matrix-react-sdk.
It has also been tested by building it manually and verifying that it looks good. 
							
						 
						
							2018-02-24 10:28:39 +02:00  
						
					 
				
					
						
							
							
								 
								Simó Albert i Beltran
							
						 
						
							 
							
							
							
								
							
								e56b16f7d1 
								
							
								 
							
						 
						
							
							
								
								Add Catalan  
							
							 
							
							
							
						 
						
							2018-01-25 18:25:46 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								bddab533a3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5938  from osoitz/master  
							
							 
							
							... 
							
							
							
							Corrected language name 
							
						 
						
							2018-01-07 20:34:19 +00:00  
						
					 
				
					
						
							
							
								 
								osoitz
							
						 
						
							 
							
							
								
								
							
							
								
							
								5106809394 
								
									
								
							
								 
							
						 
						
							
							
								
								Update copy-res.js  
							
							 
							
							... 
							
							
							
							Corrected Basque name 
							
						 
						
							2018-01-07 20:39:24 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								dff791d478 
								
							
								 
							
						 
						
							
							
								
								Add Slovak to included languages  
							
							 
							
							
							
						 
						
							2017-11-17 15:07:20 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								9664b4d176 
								
							
								 
							
						 
						
							
							
								
								Add Slovak to included languages  
							
							 
							
							
							
						 
						
							2017-11-15 12:14:30 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								f86b616769 
								
							
								 
							
						 
						
							
							
								
								status homepage  
							
							 
							
							
							
						 
						
							2017-10-26 01:38:07 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								01b3d6128c 
								
							
								 
							
						 
						
							
							
								
								move status theme into a dedicated dir, and make fonts work  
							
							 
							
							
							
						 
						
							2017-10-22 17:03:39 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e39730d52e 
								
							
								 
							
						 
						
							
							
								
								Say which translation file failed ( #5196 )  
							
							 
							
							... 
							
							
							
							So we can see which i18n file is invalid when it fails 
							
						 
						
							2017-10-11 09:56:38 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								133e17c1db 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/add_finnish  
							
							 
							
							
							
						 
						
							2017-09-22 09:50:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1cca4c2133 
								
							
								 
							
						 
						
							
							
								
								Fix debug message to be clearer  
							
							 
							
							
							
						 
						
							2017-09-21 10:26:07 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b4ea938be3 
								
							
								 
							
						 
						
							
							
								
								This is the default  
							
							 
							
							
							
						 
						
							2017-09-20 18:17:06 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6ec26932af 
								
							
								 
							
						 
						
							
							
								
								This is the default anyway  
							
							 
							
							
							
						 
						
							2017-09-20 17:54:52 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								21d233b5af 
								
							
								 
							
						 
						
							
							
								
								oops, leftover debug  
							
							 
							
							
							
						 
						
							2017-09-20 17:48:47 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b9b4ac3166 
								
							
								 
							
						 
						
							
							
								
								Rename symlink to 'include' & add to redeploy  
							
							 
							
							... 
							
							
							
							Because redeploy.py already has a 'symlink' option that does
something else. 
							
						 
						
							2017-09-20 17:22:47 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6ff91789b2 
								
							
								 
							
						 
						
							
							
								
								Rename 'config' option to 'symlink'  
							
							 
							
							... 
							
							
							
							because that's really all it's doing and we can use it for other
things 
							
						 
						
							2017-09-20 17:04:31 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								be938ac0f4 
								
							
								 
							
						 
						
							
							
								
								Accept globs for the config location  
							
							 
							
							... 
							
							
							
							and make the default config*.sjon so we'll automatically symlink
any config files in the current dir. 
							
						 
						
							2017-09-20 14:38:41 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e4082d4f45 
								
							
								 
							
						 
						
							
							
								
								Support multiple configs on the command line  
							
							 
							
							
							
						 
						
							2017-09-20 14:25:33 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b2e1a2956f 
								
							
								 
							
						 
						
							
							
								
								Include Finnish translation  
							
							 
							
							... 
							
							
							
							Which is 100% on riot-web and 40% on react-sdk which is probably
at a point where it can be useful. 
							
						 
						
							2017-09-15 12:26:45 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7202556f45 
								
							
								 
							
						 
						
							
							
								
								Don't delete dist dir after putting stuff in it  
							
							 
							
							
							
						 
						
							2017-09-06 14:37:57 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e6d43f9d77 
								
							
								 
							
						 
						
							
							
								
								Edit electron build script fior signed win builds  
							
							 
							
							... 
							
							
							
							Don't copy them to pub: let the signing process do that 
							
						 
						
							2017-09-06 13:28:21 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4ff9131e61 
								
							
								 
							
						 
						
							
							
								
								Redeploy script: don't bail if bundle exists ( #4977 )  
							
							 
							
							... 
							
							
							
							Just don't bother replacing that bundle. Continue redeploying the
rest as other assets (eg translation files) may have changed. 
							
						 
						
							2017-09-05 13:54:51 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b55174e5e9 
								
							
								 
							
						 
						
							
							
								
								Fix plurals in translations  
							
							 
							
							... 
							
							
							
							See https://github.com/matrix-org/matrix-react-sdk/pull/1358 
Requires https://github.com/matrix-org/matrix-react-sdk/pull/1358  
							
						 
						
							2017-09-04 17:18:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1f3f7af1e1 
								
							
								 
							
						 
						
							
							
								
								Revert accidental merge  
							
							 
							
							
							
						 
						
							2017-09-04 17:16:13 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1e203cade7 
								
							
								 
							
						 
						
							
							
								
								Fix plurals in translations  
							
							 
							
							... 
							
							
							
							See https://github.com/matrix-org/matrix-react-sdk/pull/1358 
Requires https://github.com/matrix-org/matrix-react-sdk/pull/1358  
							
						 
						
							2017-09-04 17:14:41 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								5db01373bb 
								
							
								 
							
						 
						
							
							
								
								Add i18n for Basque (eu), Latvian (lv), Telugu (te)  
							
							 
							
							
							
						 
						
							2017-08-16 11:15:48 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								6cf671ad42 
								
							
								 
							
						 
						
							
							
								
								order languages in copy-res by iso code  
							
							 
							
							
							
						 
						
							2017-08-16 11:14:24 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								c31f66aed5 
								
							
								 
							
						 
						
							
							
								
								Jenkins.sh: only fetch head of dependency branches  
							
							 
							
							
							
						 
						
							2017-08-08 09:50:49 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								7b024751d1 
								
							
								 
							
						 
						
							
							
								
								fetch-develop-deps: avoid breaking js-sdk  
							
							 
							
							... 
							
							
							
							do `npm i` in react-sdk *before* symlinking js-sdk, to avoid moving a load of
deps from js-sdk to react-sdk and hence breaking the build. 
							
						 
						
							2017-08-08 09:50:49 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								62579ed6b0 
								
							
								 
							
						 
						
							
							
								
								Add tracebacks to deploy exceptions  
							
							 
							
							
							
						 
						
							2017-07-20 11:25:19 +01:00  
						
					 
				
					
						
							
							
								 
								Kegsay
							
						 
						
							 
							
							
							
								
							
								9864ce5bb2 
								
							
								 
							
						 
						
							
							
								
								Support multiple config.json symlinks in redeploy.py ( #4644 )  
							
							 
							
							... 
							
							
							
							* Support multiple config.json symlinks in redeploy.py
* Review comments 
							
						 
						
							2017-07-20 11:02:10 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								eaf61526fb 
								
							
								 
							
						 
						
							
							
								
								add new languages  
							
							 
							
							
							
						 
						
							2017-06-18 23:50:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								491d83b17f 
								
							
								 
							
						 
						
							
							
								
								Enable Korean Translations  
							
							 
							
							... 
							
							
							
							As it's now at 64% on react-sdk and looking good 
							
						 
						
							2017-06-16 13:05:56 +01:00  
						
					 
				
					
						
							
							
								 
								krombel
							
						 
						
							 
							
							
							
								
							
								a62a9b9cd1 
								
							
								 
							
						 
						
							
							
								
								Use Thai string for Thai in Language-Chooser  
							
							 
							
							
							
						 
						
							2017-06-10 03:11:55 +02: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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9c94f2ac14 
								
							
								 
							
						 
						
							
							
								
								Use bash magic instead of sed  
							
							 
							
							
							
						 
						
							2017-06-07 10:39:46 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b0486e333d 
								
							
								 
							
						 
						
							
							
								
								Chop off 'origin/'  
							
							 
							
							... 
							
							
							
							when figuring out what branch we're on 
							
						 
						
							2017-06-07 10:35:08 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								13c780c7c5 
								
							
								 
							
						 
						
							
							
								
								add traditional chinese, thai, greek  
							
							 
							
							
							
						 
						
							2017-06-06 16:51:00 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e30fcdba4c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into new-guest-access  
							
							 
							
							
							
						 
						
							2017-06-06 11:39:47 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								c610d21e68 
								
							
								 
							
						 
						
							
							
								
								enable en_US as a 1st class language  
							
							 
							
							
							
						 
						
							2017-06-05 16:05:07 +01:00  
						
					 
				
					
						
							
							
								 
								Marcel
							
						 
						
							 
							
							
							
								
							
								4225813523 
								
							
								 
							
						 
						
							
							
								
								Fix DeprecationWarning  
							
							 
							
							... 
							
							
							
							the copy-res.js did throw "(node:8688) DeprecationWarning: Calling an asynchronous function without callback is deprecated." before 
							
						 
						
							2017-06-04 12:36:14 +02:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								4b92bbe6f4 
								
							
								 
							
						 
						
							
							
								
								enable swedish, as it's got bigger than danish & dutch  
							
							 
							
							
							
						 
						
							2017-06-02 22:05:46 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								81c0c7bd4f 
								
							
								 
							
						 
						
							
							
								
								Various tweaks to fetch-develop-deps  
							
							 
							
							... 
							
							
							
							* tell git to checkout the right branch, rather than cloning and then changing.
* clone with depth 1 under travis, to save time.
* less pushd/popd, which print out confusing text - use `cd` in a subshell
  instead. (and just avoid it where possible).
* add some markers to the output to let travis roll it up. 
							
						 
						
							2017-06-01 18:18:46 +01:00  
						
					 
				
					
						
							
							
								 
								dtygel
							
						 
						
							 
							
							
							
								
							
								33cf39e9a0 
								
							
								 
							
						 
						
							
							
								
								Add language picker labels ( #4141 )  
							
							 
							
							... 
							
							
							
							* fix after rebase
* add string to translate in messagecontextmenu
* add labels for language picker 
							
						 
						
							2017-06-01 14:38:36 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								cb33302f10 
								
							
								 
							
						 
						
							
							
								
								add spanish & dutch  
							
							 
							
							
							
						 
						
							2017-06-01 11:44:55 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								89e5c4f8ae 
								
							
								 
							
						 
						
							
							
								
								Fix fetch-develop-deps.sh  
							
							 
							
							... 
							
							
							
							This got broken by https://github.com/vector-im/riot-web/pull/4120  so that it
didn't work on a clean git clone. 
							
						 
						
							2017-05-31 23:50:06 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0e742cec27 
								
							
								 
							
						 
						
							
							
								
								scripts/fetch-develop.deps.sh: set -e ( #4120 )  
							
							 
							
							... 
							
							
							
							... so that when the git clone fails, it doesn't plough on regardless. 
							
						 
						
							2017-05-31 15:37:30 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								1f4f86b5f8 
								
							
								 
							
						 
						
							
							
								
								rework tom's welcome page to fit in slightly better with riot's UI/UX  
							
							 
							
							... 
							
							
							
							* moves login button to top-left
* switches from iframe to a request() to load the welcome page to inherit CSS (probably breaks RTS :/)
* namespace CSS
* change the layout a bit. 
							
						 
						
							2017-05-30 03:58:45 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								f085d2db39 
								
							
								 
							
						 
						
							
							
								
								make flags less muddy - fixes  https://github.com/vector-im/riot-web/issues/3974  
							
							 
							
							
							
						 
						
							2017-05-29 00:10:08 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								a92d96347b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into new-guest-access  
							
							 
							
							
							
						 
						
							2017-05-28 22:50:53 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								22e5e2126b 
								
							
								 
							
						 
						
							
							
								
								rev-parse the commit from the deps  
							
							 
							
							... 
							
							
							
							Because it's not added to package.json by npm anymore 
							
						 
						
							2017-05-26 22:52:49 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								96393f69b6 
								
							
								 
							
						 
						
							
							
								
								Remove old versions before linking react/js sdk  
							
							 
							
							
							
						 
						
							2017-05-26 22:37:44 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d3875ec794 
								
							
								 
							
						 
						
							
							
								
								Oops, include file extension in language list  
							
							 
							
							
							
						 
						
							2017-05-26 17:11:11 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6c3c4fc547 
								
							
								 
							
						 
						
							
							
								
								Language generation and file structure  
							
							 
							
							... 
							
							
							
							* Move language files to strings/ subdir to be consistent with
   react-sdk
 * Only copy static list of languages (to avoid including
   languages that are only a few percent translated)
 * Make copy-res script work with watch mode
 * Other general cleanups like only write each language file once,
   rather than n times. 
							
						 
						
							2017-05-26 16:48:21 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								efb6316ba0 
								
							
								 
							
						 
						
							
							
								
								Implement default welcome page and allow custom URL /w config  
							
							 
							
							... 
							
							
							
							counterpart to https://github.com/matrix-org/matrix-react-sdk/pull/922  
							
						 
						
							2017-05-24 17:58:03 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6b6fa59f3e 
								
							
								 
							
						 
						
							
							
								
								Squash merge  https://github.com/vector-im/riot-web/pull/3636  
							
							 
							
							
							
						 
						
							2017-05-23 14:12:53 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d7f1e01cfa 
								
							
								 
							
						 
						
							
							
								
								Don't fail if reskindex symlink exists  
							
							 
							
							
							
						 
						
							2017-05-19 14:47:44 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								50b46af943 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3945  from vector-im/dbkr/fetch_deps_script  
							
							 
							
							... 
							
							
							
							Script to fetch corresponding branches of dependent projects 
							
						 
						
							2017-05-19 13:14:07 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								7d81ade563 
								
							
								 
							
						 
						
							
							
								
								genflags.sh should be run from root dir  
							
							 
							
							
							
						 
						
							2017-05-18 11:38:01 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								bc5ad3c761 
								
							
								 
							
						 
						
							
							
								
								Move genflags.sh to scripts  
							
							 
							
							
							
						 
						
							2017-05-18 11:36:24 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								e879fb0eef 
								
							
								 
							
						 
						
							
							
								
								Add square flag pngs /w genflags.sh script  
							
							 
							
							... 
							
							
							
							This uses the github.com:googlei18n/region-flags and imagemagick to generate 27x27 flag pngs. The flags have a 1px #e0e0e0 border and transparent padding such that each flag is of the same height (17px including the border). 
							
						 
						
							2017-05-18 11:25:42 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a9a4b1c44e 
								
							
								 
							
						 
						
							
							
								
								Get branch from various CI env vars  
							
							 
							
							... 
							
							
							
							So we hopefully get the right branch for PRs from the same repo
(but not forks).
From @t3chguy's comment (tweaked a bit) 
							
						 
						
							2017-05-18 11:05:19 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c929cb1337 
								
							
								 
							
						 
						
							
							
								
								Do I mean bash? Probably  
							
							 
							
							
							
						 
						
							2017-05-17 18:21:58 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								18afbc5bec 
								
							
								 
							
						 
						
							
							
								
								Make dep install script work  
							
							 
							
							
							
						 
						
							2017-05-17 18:14:28 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								60d33f50a7 
								
							
								 
							
						 
						
							
							
								
								Create node_modules if it doesn't exist  
							
							 
							
							
							
						 
						
							2017-05-17 16:19:19 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								94ac4bf490 
								
							
								 
							
						 
						
							
							
								
								Use fetch dep script in jenkins script  
							
							 
							
							
							
						 
						
							2017-05-17 16:17:08 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								fac8906102 
								
							
								 
							
						 
						
							
							
								
								Add script to fetch correct dep branches  
							
							 
							
							... 
							
							
							
							Fetch branches of js-sdk and react-sdk that match the current
branch name, if they exist. This will mostly be used in the
automated tests. 
							
						 
						
							2017-05-17 16:11:34 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								cef26a5b20 
								
							
								 
							
						 
						
							
							
								
								fix   #3894  
							
							 
							
							
							
						 
						
							2017-05-15 21:14:01 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ea0b166da7 
								
							
								 
							
						 
						
							
							
								
								change wording to not confuse users building repo  
							
							 
							
							... 
							
							
							
							change default repos to match their current naming
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-11 17:49:31 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f248477f82 
								
							
								 
							
						 
						
							
							
								
								stage 0.5 rebrand (rename dist release)  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-11 17:46:08 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								0e0918d07c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3888  from vector-im/pr/3799  
							
							 
							
							... 
							
							
							
							move manifest.json outward so it is scoped properly 
							
						 
						
							2017-05-11 13:20:33 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								3c5594e034 
								
							
								 
							
						 
						
							
							
								
								move manifest.json outward so it is scoped properly  
							
							 
							
							... 
							
							
							
							this will matter more when we add a service worker
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-11 13:12:26 +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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								640aa98cf4 
								
							
								 
							
						 
						
							
							
								
								Update 2 missed icons to the new icon  
							
							 
							
							... 
							
							
							
							Electron icons for windows & Linux. Also add them to the script
that makes all the icon versions. 
							
						 
						
							2017-05-08 13:05:17 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								1e5908a31e 
								
							
								 
							
						 
						
							
							
								
								speed up burndown generation by ~250x  
							
							 
							
							
							
						 
						
							2017-05-07 19:34:16 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6013a3e71d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3683  from t3chguy/t3chguy/electron_version_inconsistency  
							
							 
							
							... 
							
							
							
							Remove leading v in /version file, for SemVer and to match Electron ver 
							
						 
						
							2017-05-05 18:28:16 +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
							
						 
						
							 
							
							
							
								
							
								61c338a233 
								
							
								 
							
						 
						
							
							
								
								remove leading v in /version file so its semver  
							
							 
							
							... 
							
							
							
							and also then consistent with electron versioning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-02 21:32:27 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								f010afe63f 
								
							
								 
							
						 
						
							
							
								
								Add emojione PNGs to the COPY_LIST  
							
							 
							
							
							
						 
						
							2017-04-21 17:36:48 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								8707cca7bc 
								
							
								 
							
						 
						
							
							
								
								Remove rageshake server  
							
							 
							
							... 
							
							
							
							This is now at https://github.com/matrix-org/rageshake  
							
						 
						
							2017-04-04 16:29:12 +01:00