11062 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Hodgson	4fbf34e05b	Merge branch 'develop' into matthew/dharma	2018-08-03 17:15:00 -07:00
Bruno Windels	4c6d5f50e9	Merge pull request #2108 from matrix-org/dbkr/chairman_mau_pt_3_sync_error ... Support MAU error on sync	2018-08-03 18:01:28 +02:00
David Baker	cd18744101	unused import	2018-08-03 16:10:50 +01:00
David Baker	9a2155f1ad	Oops, add file to right branch	2018-08-03 16:03:27 +01:00
David Baker	c36779fc15	d'oh, didn't mean to push this to develop	2018-08-03 16:02:51 +01:00
David Baker	0c8943cdc0	Oops, add the file	2018-08-03 16:01:22 +01:00
David Baker	b5d2fa769c	Support MAU error on sync ... For https://github.com/vector-im/riot-web/issues/7091	2018-08-03 14:54:52 +01:00
David Baker	bc1d359398	Merge pull request #2106 from matrix-org/dbkr/chairman_mau_pt_2_message_send ... Support active user limit on message send	2018-08-03 13:14:18 +01:00
David Baker	b322f0b291	Merge pull request #2091 from matrix-org/bwindels/e2e-tests-ci-script ... Run end to end tests as part of Travis build	2018-08-03 11:42:28 +01:00
Bruno Windels	e2695fb467	now the ci scripts are merged in the test repo, change the branch to fetch them from to master	2018-08-03 11:43:12 +02:00
David Baker	86c5fac030	Merge pull request #2097 from matrix-org/dbkr/remove_package_lock ... Remove package-lock.json for now	2018-08-03 09:14:24 +01:00
Bruno Windels	74ee7069e2	Merge pull request #2103 from matrix-org/dbkr/chairman_mau_pt_1_login ... Support montly active user limit error on /login	2018-08-03 09:32:08 +02:00
David Baker	d25fc9d9fb	Revert 3f0c948387 ... ...as hopefully this should work now sanitize-html is fixed?	2018-08-02 19:37:27 +01:00
David Baker	02019a58b3	Support active user limit on message send ... For https://github.com/vector-im/riot-web/issues/7091	2018-08-02 17:09:04 +01:00
Bruno Windels	2b5c8282d0	Merge pull request #2105 from matrix-org/dbkr/unpin_sanitize_html ... Unpin sanitize-html	2018-08-02 17:52:15 +02:00
David Baker	d25ed88b0d	Unpin sanitize-html ... 1.18.4 is now out which makes it work with webpack again	2018-08-02 16:20:55 +01:00
David Baker	bb9a3eb33d	Support MAU limit error on register too	2018-08-02 16:09:57 +01:00
David Baker	cc58b06226	Support montly active user limit error on /login ... The 'contact your service administrator' should be a link but we don't have this info from the HS yet.	2018-08-02 14:25:17 +01:00
Bruno Windels	d1dcd0f374	Merge pull request #2101 from matrix-org/dbkr/pin_sanitize_html ... Pin sanitize-html to 0.18.2	2018-08-02 12:05:37 +02:00
David Baker	4575710c84	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 10:59:26 +01:00
Bruno Windels	3f0c948387	try logging the stack to see where the TypeError on travis occurs exactly	2018-08-01 18:46:40 +02:00
David Baker	de43cc920d	Add package-lock to gitignore	2018-08-01 15:07:17 +01:00
David Baker	f0d135d76e	Remove package-lock.json for now ... As per https://github.com/vector-im/riot-web/issues/7083 The package-lock file is currently not bringing any of the benefits it's supposed to bring because we don't do the neccessary things to massage it during the release process. Remove it until we actually manage it correctly.	2018-07-31 11:02:14 +01:00
Bruno Windels	6f60b68ac7	Puppeteer does need it's own chrome after all ... The stable chrome travis provides is not supported.	2018-07-31 11:00:44 +02:00
Bruno Windels	93f51eb6ce	force running scripts in bash, as it's not the default shell on Ubuntu (which is what Travis runs)	2018-07-31 11:00:44 +02:00
Bruno Windels	70f8ee0e87	install synapse prerequisites as part of build	2018-07-31 11:00:44 +02:00
Bruno Windels	e08e09df9a	pass location of google-chrome-stable to e2e test runner	2018-07-31 11:00:44 +02:00
Bruno Windels	0ee72a2972	disable tests for now to speed up trying stuff out, run the build as well	2018-07-31 11:00:44 +02:00
Bruno Windels	fd5193b9f4	try to run e2e tests in travis	2018-07-31 10:39:30 +02:00
Matthew Hodgson	fe73953d9d	fix merge; disable sticky headers; tweak chevrons	2018-07-30 09:00:11 -07:00
David Baker	2f13615dd1	Merge branch 'master' into develop	2018-07-30 12:09:07 +01:00
David Baker	3c8fc5a8af	v0.13.0	2018-07-30 11:57:53 +01:00
David Baker	1ebcd0f0ec	Prepare changelog for v0.13.0	2018-07-30 11:53:15 +01:00
David Baker	2df3580c60	Released js-sdk	2018-07-30 11:46:28 +01:00
Michael Telatynski	2bc4dcc7da	Merge pull request #2096 from matrix-org/dbkr/click_on_side_panels_closes_settings_3 ... Make clicking on side panels close settings (mk 3)	2018-07-29 19:44:53 +01:00
Matthew Hodgson	9783b6100d	Merge branch 'develop' into matthew/dharma	2018-07-29 17:03:23 +01:00
David Baker	f4c073ad45	Nest ifs to avoid unnecessary work	2018-07-27 18:58:11 +01:00
David Baker	e059a08d7b	Make clicking on side panels close settings (mk 3) ... Just do it by fixing the somewhat hacky logic to not break if the target elements also have additional classes, like they do if the toolbar is showing (I think it turns out this bug is only that it doesn't work with the toolbar showing...) Fixes https://github.com/vector-im/riot-web/issues/5658	2018-07-27 18:53:36 +01:00
David Baker	897d18bffb	Merge pull request #2093 from matrix-org/t3chguy/slate_cont2 ... Fix composer bug where cursor position would change when Riot regained focus	2018-07-27 15:42:35 +01:00
David Baker	8a99c712c1	Merge pull request #2094 from matrix-org/dbkr/reposition_jitsi__release ... Fix persistend element location not updating	2018-07-27 15:42:21 +01:00
David Baker	148308235d	Merge pull request #2092 from matrix-org/dbkr/reposition_jitsi ... Fix persistent element location not updating	2018-07-27 14:51:29 +01:00
David Baker	1c0f778e82	Fix persistend element location not updating ... As hopefully all explained in comment	2018-07-27 14:42:58 +01:00
David Baker	1fe0f04986	Fix persistend element location not updating ... As hopefully all explained in comment	2018-07-27 14:33:05 +01:00
David Baker	b6ebb0cc37	Merge pull request #2089 from matrix-org/t3chguy/slate_cont2 ... Slate Fixes 42?	2018-07-27 14:00:53 +01:00
Michael Telatynski	6093f0ca68	Merge pull request #2090 from matrix-org/t3chguy/devtools_focus ... fix Devtools input autofocus && state traversal when len === 1 && key=""	2018-07-26 22:28:07 +01:00
Michael Telatynski	0174f67fe7	fix Devtools input autofocus && state traversal when len === 1 && key="" ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-26 18:20:09 +01:00
Michael Telatynski	f264075369	null-guard history properly ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-26 17:11:32 +01:00
Michael Telatynski	265e4267b8	remove faulty onBlur/onFocus code which caused selection to rollback ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-26 15:00:43 +01:00
David Baker	a00c2b753a	Merge pull request #2085 from matrix-org/t3chguy/emoji_aliases ... allow autocompleting Emoji by common aliases, e.g 👍 to 👍	2018-07-25 10:40:59 +01:00
David Baker	0c1722c8ee	Update package-lock deps	2018-07-24 22:07:12 +01:00