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

148 commits

Author SHA1 Message Date
irismarie
81b1199123 remove log 2021-05-20 16:28:53 +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
irismarie
ec04fdc81b Merge branch 'master' into feature-whitelabel 2021-04-30 13:39:57 +02:00
irismarie
b0fddfba14 standardize 'New Dialog', creating new entity 2021-04-29 16:05:01 +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
11b6d13653 logo positioning, page routing corrections 2021-04-22 12:07:54 +02:00
irismarie
deb4a21ae9 fix buttons on infrastructure page, replace 'ikey' with 'childkey' 2021-04-21 17:28:18 +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
c1c8ea2ed8 disable signal autoconf button for locked scenarios #309 2021-04-20 16:42:43 +02:00
irismarie
c64d7d8917 #309, allow duplication of locked scenario 2021-04-20 12:58:58 +02:00
irismarie
d07b5c68c8 use IconButton in Table, remove tooltips for locked buttons 2021-04-16 19:37:47 +02:00
irismarie
608acb4577 use IconButton in DashboardButtonGroup 2021-04-16 17:40:15 +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
34fd4f73c3 login waiting gif, branding fixes 2021-04-14 10:07:09 +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
irismarie
726f6767d7 remove IconKey warning ('key' prop is special, doesn't get forwarded) 2021-04-01 14:21:02 +02:00
irismarie
c5420cc4a5 move IC dialog to new page 2021-04-01 12:54:05 +02:00
irismarie
468b4c66f8 fixes #307; table should be simplyfied (#270) 2021-03-25 17:22:54 +01:00
irismarie
a2fc68ee5e add logo box, improved slew logos 2021-03-25 11:27:55 +01:00
irismarie
d2cd5adc14 error handling, style changes 2021-03-19 09:42:50 +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
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
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
16bc6c762d IconButton: rename key prop to overlaykey to avoid ambiguity with keyword 'key' 2021-03-12 15:05:39 +01: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
irismarie
dd713628b6 cleanup side menu 2021-03-09 14:19:38 +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
13c0c0970c align action buttons in table to the right 2021-03-08 22:42:22 +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
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
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