6 Commits (fe3839d8cc1508f6f8d76a2301f1f0f436e93c69)

Author	SHA1	Message	Date
Oliver Günther	b0e4b0e9b2	Set explicit timeout in the dev proxy ... Otherwise longer debug sessions will get terminated	4 years ago
Benjamin Bädorf	5f45ee07ab	Move development docker-compose file to the main directory (#8798) ... * Move development docker-compose file to the main directory This requires us to move some other files around, like the pullpreview and example docker-compose file for production setups. This commit also does some housekeeping, like removing some old files and deduping configuration. * Updated to selenium grid * Fix in-Docker Selenium tests The Selenium tests now run inside a Docker Chrome Container. Backwards compatability with non-docker setups is not guaranteed, though it should not be hard to implement with a couple of small fixes. * Updated docker development documentation * Improved test timings, changed the documentation * Updated docker testing again * Run npm in the frontend directory * Really run npm in the frontend directory * Also run npm in frontend when setting up travis cache * Change directory for one command only * Change default test driver name * CI test change fixes * Fixed syntax error * Added dev check * Trying to fix firefox resizing * Trying to get tests running * Stop resizing firefox * Fixed apple icon spec * fix host in url helpers for omniauth spec * Fix omniauth specs * Fix docs * Small fixes to docker tests * Added package.json back in * Change env variables Co-authored-by: Markus Kahl <machisuji@gmail.com>	4 years ago
Benjamin Bädorf	fbc30d89b2	Added PROXY_HOSTNAME env variable for local docker development ... Before, the webpack dev proxy tried to proxy any requests to `localhost:3000`. However, since the backend and frontend containers are different hosts in the docker context, it was proxying to itself and failing. The proxy now takes this env variable which is set in the docker-compose file to `backend`, but defaults to localhost for backward compatability.	4 years ago
Benjamin Bädorf	08fb523269	Added PROXY_HOSTNAME env variable for local docker development ... Before, the webpack dev proxy tried to proxy any requests to `localhost:3000`. However, since the backend and frontend containers are different hosts in the docker context, it was proxying to itself and failing. The proxy now takes this env variable which is set in the docker-compose file to `backend`, but defaults to localhost for backward compatability.	4 years ago
Roman Roelofsen	d3993266ad	cleanup proxy config	7 years ago
Roman Roelofsen	2007e888c9	update Angular 6	7 years ago
Roman Roelofsen	2fb8dd07ac	WIP AngularCLI integration	7 years ago