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
1718 commits 17 branches 5 tags 29 MiB
Commit graph

1718 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sonja Happ
31e1da9ee1 add https:// scheme to result and model files in start action, closes #301 2021-03-17 09:06:08 +01:00
irismarie
ea82a19bab adapt to new color scheme 2021-03-16 16:48:45 +01:00
Sonja Happ
f1178d376c set default size of edit widget dialogs to sm, fix appearance of color control, fix missing import in plot color control 2021-03-16 16:16:40 +01:00
Sonja Happ
01be84132b Dirty fix for widget context menu position in dashboard edit mode 2021-03-16 15:31:24 +01:00
Sonja Happ
84dbb81cb0 Merge branch 'master' into react-update 
# Conflicts:
#	src/app.js
#	src/dashboard/dashboard.js
#	src/ic/ic-dialog.js
#	src/user/login.js
 2021-03-16 14:40:21 +01:00
Sonja Happ
63747a6468 catch error if IC raw status is no JSON object 2021-03-16 14:31:04 +01:00
irismarie
984d3f1a5e branding needs to be applied separately for login page 2021-03-16 12:20:42 +01:00
irismarie
90c13c0247 move brand http code to one file 2021-03-16 12:03:44 +01:00
irismarie
9733dcbb51 move footer to branding 2021-03-16 11:55:30 +01:00
irismarie
604e603384 Merge branch 'master' into feature-whitelabel 2021-03-16 11:41:13 +01:00
irismarie
1f490e34e5 bugfix: redirect to correct logout link when ext auth disabled 2021-03-16 11:35:30 +01:00
Sonja Happ
fbebbd7a14 API browser: do async request in componentDidMount instead of deprecated componentWillMount 2021-03-16 11:25:04 +01:00
irismarie
985bac405e changed the singleton implementation of branding, added borderradius 2021-03-16 11:23:11 +01:00
Sonja Happ
772462ead9 WIP: code cleanup for context menu; still not working in dashboard edit mode 2021-03-16 10:54:06 +01:00
Sonja Happ
7ae15348c9 WIP: fix for react context menu (new version of react-contexify with breaking changes). Position of context menu in edit mode not correct yet 2021-03-15 17:23:21 +01:00
Sonja Happ
b0d96c3de9 move queries of config endpoint to componentDidMount for compatibility with React life cycle management, update a few packages 2021-03-15 16:15:10 +01:00
Sonja Happ
391213bba4 add missing import of Form from react-bootstrap 2021-03-12 16:30:19 +01:00
Sonja Happ
42ccaf9ba3 - package clean up: remove unused packages, update packages (except for flux and react) 
- remove test folder (not used anymore)
 2021-03-12 16:06:43 +01:00
Sonja Happ
16bc6c762d IconButton: rename key prop to overlaykey to avoid ambiguity with keyword 'key' 2021-03-12 15:05:39 +01:00
irismarie
715b7cf69a changed login page 2021-03-12 14:28:28 +01:00
irismarie
79a96490ed changed the logo 2021-03-11 15:42:17 +01:00
Iris Marie Köster
d93115e6d0 Upload New File 2021-03-11 13:44:48 +00:00
Iris Marie Köster
77359f821b Upload New File 2021-03-11 13:43:31 +00:00
irismarie
455c0047fd separate brands 2021-03-11 14:39:12 +01:00
irismarie
3e104e68f4 Merge branch 'master' into feature-whitelabel 2021-03-10 16:44:42 +01:00
irismarie
aef66f625a 'fix' which corrects error, table still looks funny 2021-03-10 16:40:52 +01:00
irismarie
5f18a9841a manual merge with master (other layout changes) 2021-03-09 17:17:15 +01:00
irismarie
d82f24dc3f icon & font 2021-03-09 16:23:56 +01:00
Iris Marie Köster
71cf864902 Upload New File 2021-03-09 15:03:28 +01:00
irismarie
dd713628b6 cleanup side menu 2021-03-09 14:19:38 +01:00
irismarie
81916e9275 change style for brands 2021-03-09 14:18:32 +01:00
Steffen Vogel
4b41bc3c23 smaller bug fixes 2021-03-09 00:25:17 +01:00
Steffen Vogel
f4d1c99766 refactor EditSignalMapping to EditSignalMappingDialog 2021-03-08 23:58:40 +01:00
Steffen Vogel
58de859f0a various code cleanups 2021-03-08 23:58:40 +01:00
Steffen Vogel
c95cb5beab refactor FormControl et al. to Form.Control 2021-03-08 23:53:08 +01:00