Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity
1703 commits 17 branches 5 tags 29 MiB
Commit graph

1703 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sonja Happ
e1068c06f7 Merge branch 'master' into ic-page-customization 2021-04-21 12:16:23 +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
irismarie
dbfd39e2e4 move schemas to separate files 2021-04-20 18:05:11 +02: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
423a257713 [WIP] add start parameters from template 2021-04-16 13:51: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
Laura Fuentes Grau
0fde0d9581 ICs clean up: delete unnecessary code 2021-04-13 19:55:48 +02:00
irismarie
59d7094bab disable signal buttons, #309 2021-04-13 17:54:50 +02:00
irismarie
662e3949ad changed button for signal autoconf, see #250 2021-04-13 15:22:19 +02:00
irismarie
c20f783689 lock scenarios as admin user, see #309 2021-04-09 19:22:12 +02:00
Laura Fuentes Grau
715ca76bae only open websockets of ICs with configured input or output signals #278 2021-04-06 18:40:16 +02:00
irismarie
726f6767d7 remove IconKey warning ('key' prop is special, doesn't get forwarded) 2021-04-01 14:21:02 +02:00
irismarie
b4d9c67112 Merge branch 'master' of git.rwth-aachen.de:acs/public/villas/web 2021-04-01 12:57:21 +02:00
irismarie
bbb5984e42 error fix: remove ic dialog completely 2021-04-01 12:57:03 +02:00
irismarie
c5420cc4a5 move IC dialog to new page 2021-04-01 12:54:05 +02:00
Sonja Happ
b7dd98d5d2 Merge remote-tracking branch 'origin/master' 2021-03-26 14:18:02 +01:00
Sonja Happ
cfb40a2f0a fix: align creation of new IC with backend data model 2021-03-26 14:17:54 +01:00
irismarie
468b4c66f8 fixes #307; table should be simplyfied (#270) 2021-03-25 17:22:54 +01:00
Sonja Happ
1fe9663373 CI: Update node version to current LTS 2021-03-25 15:49:41 +01:00
Sonja Happ
7dbd000534 Merge branch 'react-update' into 'master' 
update to React 17, Flux 4.0.0

See merge request acs/public/villas/web!76
 2021-03-25 13:53:34 +00:00
Sonja Happ
395f7650da Merge branch 'master' into react-update 2021-03-25 14:22:00 +01:00
Sonja Happ
b4aca1b286 Fix a bug in config table for externally managed ICs 2021-03-25 14:21:40 +01:00
Sonja Happ
b39db51275 Merge branch 'master' into react-update 
# Conflicts:
#	package-lock.json
#	package.json
#	src/app.js
#	src/dashboard/dashboard.js
 2021-03-25 13:23:44 +01:00
Sonja Happ
1b25a37e2f upgrade node version in Dockerfile 2021-03-25 13:00:40 +01:00
Sonja Happ
51689cf77f Merge branch 'refactor-scenario' into 'master' 
Modularize scenario.js file

See merge request acs/public/villas/web!79
 2021-03-25 11:50:39 +00:00
irismarie
3e5462af01 test building/running slew brand somewhere else 2021-03-25 12:02:33 +01:00
irismarie
e0d7fe5538 manual merge of master 2021-03-25 11:47:39 +01:00
irismarie
a2fc68ee5e add logo box, improved slew logos 2021-03-25 11:27:55 +01:00
irismarie
ac3fa5dced disallow routing 2021-03-19 19:23:38 +01:00
irismarie
c7948f0658 remove config.js, get recover pw contact from backend 2021-03-19 18:26:56 +01:00
Sonja Happ
eaefeeb310 modularize scenario.js file #270 2021-03-19 16:40:54 +01:00
Sonja Happ
a4ca694b47 assign a fixed width to each table column in scenario, test if it makes a difference for #307 2021-03-19 14:08:40 +01:00
irismarie
eaf1d13967 template that forces brand designer to make changes 2021-03-19 14:06:27 +01:00
irismarie
ce3037e4ce RWTH color scheme 2021-03-19 11:46:19 +01:00
irismarie
d2cd5adc14 error handling, style changes 2021-03-19 09:42:50 +01:00
Sonja Happ
f69e3e230e check if jwt is expired and redirect to logout if so #298 2021-03-18 16:28:27 +01:00
Sonja Happ
0cf3294816 make upload button in edit files dialog fully clickable; close #289 2021-03-18 14:41:02 +01:00