1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-23 00:00:02 +01:00
Commit graph

1351 commits

Author SHA1 Message Date
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
4b41bc3c23 smaller bug fixes 2021-03-09 00:25:17 +01:00
f4d1c99766 refactor EditSignalMapping to EditSignalMappingDialog 2021-03-08 23:58:40 +01:00
58de859f0a various code cleanups 2021-03-08 23:58:40 +01:00
c95cb5beab refactor FormControl et al. to Form.Control 2021-03-08 23:53:08 +01:00
96c346e0e1 fix padding of Swagger API UI 2021-03-08 22:42:36 +01:00
13c0c0970c align action buttons in table to the right 2021-03-08 22:42:22 +01:00
17aa021d1e make table headings more compact 2021-03-08 22:40:35 +01:00
e9a80292d2 fix hover style of table edit actions 2021-03-08 22:27:53 +01:00
46ce71e738 make tables more compact 2021-03-08 22:27:33 +01:00
f1fbea22a7 remove broken responsive layout 2021-03-08 22:22:27 +01:00
35a8842de5 cosmetic code cleanups 2021-03-08 22:20:57 +01:00
dd548af370 introduce new IconButton component 2021-03-08 22:17:11 +01:00
d789ecae04 add link to SLEW project website 2021-03-08 22:09:54 +01:00
2c5cdd84b2 harmonize ID column in various tables 2021-03-08 19:20:31 +01:00
49be3f1c49 improve styling of side-menu 2021-03-08 18:45:12 +01:00
b2755048d5 rename "Infrastructure Components" menu entry to "Infrastructure" to be more concise and match router path 2021-03-08 18:44:42 +01:00
39c31498c0 use new Form components 2021-03-08 17:41:32 +01:00
9ff1495058 fix broken disable property of ICAction (closes #293) 2021-03-08 17:40:45 +01:00
dccbc2e56c cosmetic code cleanups 2021-03-08 17:40:07 +01:00
74c16e3ae2 cosmetic code changes 2021-03-08 16:05:33 +01:00
facd4f137e rename "User Management" to "Users" to be more in line with "Scenarios" and "Infrastructure Components" 2021-03-08 14:58:55 +01:00