1382 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sonja Happ	0ec419e0bc	add showUnit property to customProperties of plot widget #313	2021-05-05 14:07:43 +02:00
Sonja Happ	fdd345e2ee	Slider: do not send value update to DB during continuous update #311	2021-05-04 17:22:36 +02:00
Sonja Happ	1a688e6df9	Websocket input signals: set length of values field prior to sending to avoid errors	2021-05-04 17:13:50 +02:00
Sonja Happ	47ec6894f9	Move password confirmation check to edit user dialog	2021-05-04 15:21:29 +02:00
Sonja Happ	433c0918f2	Fixes for editing users ... - edit user dialogs behave as expected - editing own user triggers update of LoginStore and local storage with updated user data	2021-05-04 15:13:40 +02:00
Sonja Happ	3437e582c7	fix edit user dialog	2021-05-04 13:01:06 +02:00
Sonja Happ	f0c8ee9005	improve edit dialog for color zones	2021-05-04 12:03:00 +02:00
Sonja Happ	5089db48ba	add propTypes to ColorPicker component	2021-05-04 11:45:30 +02:00
Sonja Happ	2f2e6da54e	move color picker to common folder	2021-05-04 11:12:03 +02:00
Sonja Happ	5f2699b938	Major reworking of color picker and edit widget components that use it #312	2021-05-03 16:53:13 +02:00
Sonja Happ	ac5b40f768	Merge branch 'feature-whitelabel' ... # Conflicts: # package-lock.json	2021-04-30 16:26:22 +02:00
Sonja Happ	392cab76b4	update react-dnd	2021-04-30 16:09:27 +02:00
Sonja Happ	8fc9008de5	remove unused dep @rjsf/core	2021-04-30 16:04:04 +02:00
Sonja Happ	e683a45fde	Docker: add env variable to Dockerfile	2021-04-30 15:54:40 +02:00
Sonja Happ	adde4c1b2e	CI: two deploy jobs (default image and slew image)	2021-04-30 15:15:19 +02:00
irismarie	ec04fdc81b	Merge branch 'master' into feature-whitelabel	2021-04-30 13:39:57 +02:00
irismarie	07ebff321d	reset Dockerfile	2021-04-30 13:39:46 +02:00
irismarie	b0fddfba14	standardize 'New Dialog', creating new entity	2021-04-29 16:05:01 +02:00
Sonja Happ	e86851b25e	remove unused code and fix scenario ID parsing #308	2021-04-29 15:02:42 +02:00
Sonja Happ	1984cc65b8	load scenarios upon mounting users page #308	2021-04-29 14:36:03 +02:00
irismarie	f7a3a88c57	add multiple users at once to scenario (#308)	2021-04-28 18:25:28 +02:00
irismarie	68a13f738a	show infrastructure page to admin users (while hidden for others)	2021-04-27 11:45:20 +02:00
irismarie	8d1322795c	Merge branch 'master' into feature-whitelabel	2021-04-27 11:17:38 +02:00
irismarie	9ed3cf98ee	update logo	2021-04-22 15:30:59 +02:00
irismarie	78a78584ed	minor text changes	2021-04-22 14:36:03 +02:00
irismarie	be618b94ce	users add button style	2021-04-22 12:11:12 +02:00
irismarie	11b6d13653	logo positioning, page routing corrections	2021-04-22 12:07:54 +02:00
irismarie	052db03e03	added welcome page for villasweb brand	2021-04-22 11:59:53 +02:00
irismarie	deb4a21ae9	fix buttons on infrastructure page, replace 'ikey' with 'childkey'	2021-04-21 17:28:18 +02:00
irismarie	564ba577dd	Merge branch 'feature-whitelabel' of git.rwth-aachen.de:acs/public/villas/web into feature-whitelabel	2021-04-21 17:09:08 +02:00
Sonja Happ	c84c75c15d	Merge branch 'master' into feature-whitelabel	2021-04-21 13:42:35 +02:00
Sonja Happ	dda126a68a	minor package fix	2021-04-21 12:33:51 +02:00
Sonja Happ	fd970e3375	CI: deactivate cache and artifacts	2021-04-21 12:30:15 +02:00
Sonja Happ	f2d0006021	Merge branch 'master' into feature-whitelabel ... # Conflicts: # package-lock.json # package.json # src/app.js # src/common/icon-button.js # src/ic/ics.js # src/scenario/scenario.js # src/scenario/scenarios.js # src/user/users.js	2021-04-21 11:47:36 +02:00
Sonja Happ	7b44a8f0d0	Merge branch 'master' of git.rwth-aachen.de:acs/public/villas/web	2021-04-21 11:25:14 +02:00
Sonja Happ	02a0591e7b	Merge branch 'scenario-is-locked' into 'master' ... Lock scenarios for non-admin users See merge request acs/public/villas/web!82	2021-04-21 09:20:24 +00:00
Sonja Happ	c1c8ea2ed8	disable signal autoconf button for locked scenarios #309	2021-04-20 16:42:43 +02:00
irismarie	22cce5d99e	Merge branch 'master' into scenario-is-locked	2021-04-20 12:59:26 +02:00
irismarie	c64d7d8917	#309, allow duplication of locked scenario	2021-04-20 12:58:58 +02:00
Sonja Happ	d5b338c461	package updates	2021-04-19 17:05:47 +02:00
irismarie	d07b5c68c8	use IconButton in Table, remove tooltips for locked buttons	2021-04-16 19:37:47 +02:00
irismarie	18af356dd5	visualize hover over button	2021-04-16 17:46:28 +02:00
irismarie	1a118de0a5	hide tooltips for locked buttons	2021-04-16 17:42:58 +02:00
irismarie	608acb4577	use IconButton in DashboardButtonGroup	2021-04-16 17:40:15 +02:00
irismarie	1b2e5d0bdd	show locked state on Dashboard page	2021-04-16 14:08:52 +02:00
irismarie	8e51c56fc6	add locking button in scenarios table	2021-04-15 11:23:10 +02:00
irismarie	bddbadf9ac	show/change locked status of scenario	2021-04-14 13:16:13 +02:00
irismarie	15a1e2f4af	removed dummy logo	2021-04-14 10:27:05 +02:00
irismarie	34fd4f73c3	login waiting gif, branding fixes	2021-04-14 10:07:09 +02:00
irismarie	59d7094bab	disable signal buttons, #309	2021-04-13 17:54:50 +02:00