3819 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
David Baker	68a39b2783	Update process to not set deps to #develop ... Update README instructions and add checks to release script to prevent us forgetting to bump the versions of dependencies (because the check in the main release script will only catch references to #develop left in, which will no longer be the failure mode).	2017-05-19 11:59:27 +01:00
Luke Barnard	448ac8dce1	Merge pull request #3964 from vector-im/luke/fix-logo-svgs-style-type ... Add type="text/css" to SVG logos	2017-05-19 11:38:27 +01:00
Luke Barnard	76bf869d87	Add type="text/css" to SVG logos ... Without this, SVG renderers may not pick up the CSS in the SVGs at all, as is the case with librsvg.	2017-05-19 11:19:30 +01:00
David Baker	da14d7eb8c	v0.9.10-rc.1	2017-05-19 10:43:11 +01:00
David Baker	3a44cb65b7	Prepare changelog for v0.9.10-rc.1	2017-05-19 10:43:10 +01:00
David Baker	029dfe5ed0	v0.9.10-rc.1	2017-05-19 10:41:22 +01:00
David Baker	c0c1972d56	Released js-sdk & react-sdk	2017-05-19 10:40:44 +01:00
Michael Telatynski	09f987559b	rename action, now forwarding any event is possible, limited by where ... button is shown, i.e easy to modify Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-19 01:30:36 +01:00
Michael Telatynski	eaeac1230f	Merge branch 'develop' of github.com:vector-im/riot-web into forward_message	2017-05-19 01:15:31 +01:00
Michael Telatynski	7777be89ee	only for finalised events ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-18 23:53:37 +01:00
Richard van der Hoff	b886215fdd	Merge pull request #3958 from vector-im/rav/roomdirectory_unmounting ... Fix some setState-after-unmount in roomdirectory	2017-05-18 19:06:18 +01:00
Richard van der Hoff	4d60d444d4	Merge pull request #3956 from vector-im/rav/deflakify ... Attempt to deflakify joining test	2017-05-18 19:06:01 +01:00
Luke Barnard	53f0a6b360	Merge pull request #3959 from vector-im/luke/improve-country-dd-4 ... CSS for left_aligned Dropdowns, and adjustments for Country dd in Login	2017-05-18 14:38:47 +01:00
Luke Barnard	d0adfb6469	CSS for left_aligned Dropdowns, and adjustments for Country dd in Login	2017-05-18 14:03:27 +01:00
Luke Barnard	1460eae280	Change background colour of login country dd to white	2017-05-18 13:43:21 +01:00
Richard van der Hoff	86055bc476	Fix some setState-after-unmount in roomdirectory ... Give the RoomDirectory and unmounted guard, and use it to avoid some setState warnings. Also, cancel the filterTimeout (no point in leaving it around). There are still plenty of other opportunities to setState after unmount, but the filterTimeout was causing noise in the test.	2017-05-18 13:41:54 +01:00
Richard van der Hoff	f16086bbea	Attempt to deflakify joining test ... give the client a bit longer to get started.	2017-05-18 13:39:33 +01:00
Richard van der Hoff	f60773ae1f	mock-request: improve logging ... attempt to make the logging a bit more comprehensible	2017-05-18 13:37:23 +01:00
Luke Barnard	01a15b2b7e	Merge pull request #3953 from vector-im/luke/improve-country-dd-3-square-flags ... Add square flag pngs /w genflags.sh script	2017-05-18 13:37:17 +01:00
David Baker	5526525b6b	Merge pull request #3954 from vector-im/dbkr/riot_bot_for_desktop ... Add config for riot-bot on desktop app build	2017-05-18 13:18:19 +01:00
Richard van der Hoff	a39a7c8334	Update to more recent mock-request ... Just copy-and-paste the updated version from js-sdk in here.	2017-05-18 12:18:57 +01:00
David Baker	c9e821ffc5	Add config for riot-bot on desktop app build ... Also remove unused room dir stuff	2017-05-18 12:00:02 +01:00
Luke Barnard	b290a28123	Merge pull request #3952 from vector-im/dbkr/electron_copy_link_location ... Desktop: 'copy link address'	2017-05-18 11:49:41 +01:00
David Baker	16899d3b1f	Bump electron version to 1.6.8	2017-05-18 11:38:03 +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	7c764b7365	Add copyright	2017-05-18 11:34:26 +01:00
David Baker	dfb30e91de	Desktop: 'copy link address' ... Add 'copy link address' to link context menu in electron app	2017-05-18 11:32:10 +01:00
Luke Barnard	ea03140cbd	Add ellipsis overflow to long dd options	2017-05-18 11:30:22 +01:00
Luke Barnard	98215b4767	Adjust for 27x27 flag png size	2017-05-18 11:29:57 +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	b3b44dd99e	Use fetch dep script for travis	2017-05-17 18:20:25 +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
Richard van der Hoff	ca3921f3a0	Merge pull request #3943 from vector-im/rav/reduce_rageshake_size ... Reduce rageshake log size to 1MB	2017-05-17 15:59:10 +01:00
Richard van der Hoff	15ab1732a2	Reduce rageshake log size to 1MB ... ... 50MB turned out to be quite a lot.	2017-05-17 14:46:06 +01:00
Luke Barnard	338ab4d046	Merge pull request #3942 from vector-im/luke/improve-country-dd-2 ... CSS for putting country dd on same line as phone input	2017-05-17 14:29:48 +01:00
Luke Barnard	089740a840	CSS for putting country dd on same line as phone input ... (For login and registration)	2017-05-17 14:25:43 +01:00
David Baker	7ea0ecd125	Merge branch 'new_release_process_stable' into develop ... This reverts PRs on riot-web marked as notready, turning the develop branch into a more stable version.	2017-05-17 10:43:02 +01:00
Michael Telatynski	9352e5d78e	Lets make it abundantly clear that we want attention. FLASH FLASH FLASH ... also improve favicon updating to not change if we're same as previous not sure how intensive the nativeImage stuff is but cheap efficiency For FLASH FLASH I moved the setBadgeCount stuff RPC -> IPC should be more reliable now, its in electron-main Win only: if mainWindow is set and is not in focus make it FLASH clear flash if notification gets cleared elsewhere debounce focus handler so we don't set a million of them if the app is backgrounded a while Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-17 10:39:43 +01:00
Michael Telatynski	826a571b60	apply same image to the window/taskbar too; as per request ... LETS MAKE IT CLEAR WE ARE NEEDY AND WANT ATTENTION Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-17 10:05:50 +01:00
Michael Telatynski	39b6c7c65d	ignore electron_app subdirs properly, missed these too :L ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-17 09:53:33 +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	844ea390c8	Revert "clear the searchbox after quick-search" ... This reverts commit ddd12edc06.	2017-05-16 17:13:55 +01:00
David Baker	fdf326c9f0	Revert "Cancel quick-search on Escape, clearing it and returning focus to composer." ... This reverts commit 52a119244b.	2017-05-16 17:13:39 +01:00