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

1654 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ricardo Hernandez-Montoya
5c8cc7cc8e deploy only the development branch (review) 2017-06-02 17:14:20 +02:00
Ricardo Hernandez-Montoya
64c7f9f6f3 CoSiFrontEnd doesn't belong here 2017-06-01 14:19:19 +02:00
Ricardo Hernandez-Montoya
7ac2d95aa7 yaml correction 2017-06-01 14:11:20 +02:00
Ricardo Hernandez-Montoya
bcd3f32003 use artifacts instead of cache 2017-06-01 11:21:03 +02:00
Ricardo Hernandez-Montoya
c75ac09aa9 include build directory and nginx in docker build 2017-06-01 11:19:38 +02:00
Ricardo Hernandez-Montoya
342e137560 pass HTTP_PROXY environment to app 2017-06-01 08:35:04 +02:00
Ricardo Hernandez-Montoya
bbfdc3acbb pass proxy as environment variable 2017-05-31 14:29:42 +02:00
Ricardo Hernandez-Montoya
38f2576ce9 Merged ec7efbd11c into ci-config 2017-05-31 11:42:23 +02:00
Ricardo Hernandez-Montoya
013a0b2122 backend production env, database user, unbind db's ports to host 2017-05-31 11:24:01 +02:00
Ricardo Hernandez-Montoya
ee9924e023 point to backend's develop branch 2017-05-31 11:23:07 +02:00
Ricardo Hernandez-Montoya
9105c3fbae set specific docker image and docker-compose versions 2017-05-31 10:14:28 +02:00
Ricardo Hernandez-Montoya
ec7efbd11c removed unused code 2017-05-24 14:41:47 +02:00
Ricardo Hernandez
be1afb1151 Merge branch '67-edit-controls-fix' into 'develop' 
Resolve "While editing a widget, update the rest of the fields after changing one."

See merge request !12
 2017-05-23 13:00:55 +02:00
Ricardo Hernandez-Montoya
125e936e26 chai dependency for tests 2017-05-23 12:59:13 +02:00
Ricardo Hernandez-Montoya
ea119f52e0 test edit control creator 2017-05-23 12:57:48 +02:00
Ricardo Hernandez-Montoya
2a5c164ace updated licenses in edit control modules 2017-05-23 10:59:01 +02:00
Ricardo Hernandez-Montoya
0e7ce1aff0 removed unused js module 2017-05-23 10:57:28 +02:00
Ricardo Hernandez-Montoya
72ffd6cd96 refactoring: extracted control creation 2017-05-23 10:50:30 +02:00
Ricardo Hernandez-Montoya
b076db8b7b fixed simulator property 2017-05-23 10:50:03 +02:00
Ricardo Hernandez
d2f714f084 Merge branch 'image-widget-fix' into 'develop' 
Image widget fix

See merge request !11
 2017-05-19 10:59:20 +02:00
Ricardo Hernandez-Montoya
503560dbbe authenticated (all) files query 2017-05-08 12:28:16 +02:00
Ricardo Hernandez-Montoya
e395b65fc1 fixed imaged widget, load image by id 2017-05-08 12:27:36 +02:00
Ricardo Hernandez-Montoya
e0c5ffbd8f authenticated upload 2017-05-08 12:24:52 +02:00
Ricardo Hernandez-Montoya
e2be97dcd3 default edit image option and no images msg 2017-05-08 10:55:21 +02:00
Ricardo Hernandez-Montoya
a4884bd0fb issue #60: site's title 2017-05-05 09:42:39 +02:00
Ricardo Hernandez
71f3f1a007 Merge branch 'additional-widgets' into 'develop' 
Additional widgets

See merge request !8
 2017-05-05 09:10:45 +02:00
Ricardo Hernandez-Montoya
fa09f9eef7 removed commented rules 2017-05-05 09:08:43 +02:00
Ricardo Hernandez-Montoya
2340850b40 adapt layout to previous changes 2017-05-05 09:07:22 +02:00
Ricardo Hernandez-Montoya
2f74ae557c Merge commit '972416992d82f0a4c727808a7941cf53a74d69a6' 2017-05-04 17:44:33 +02:00
Ricardo Hernandez-Montoya
210a292738 Merge commit 'e0b7ddca551162e21d7f667c9ae2d6516493575f' 2017-05-04 17:00:15 +02:00
Ricardo Hernandez-Montoya
21029dda2b Merge commit 'c31f6ea42cd46de026fad473008b897ed1ce404b' into additional-widgets 2017-05-04 16:42:03 +02:00
Ricardo Hernandez-Montoya
1248c1ef0d Merge commit 'd000c0a35f9e48dea2787a094c358d7dc825ab4d' into additional-widgets 2017-05-04 16:34:10 +02:00
Ricardo Hernandez
972416992d Merge branch '23-add-user-accounts' into 'develop' 
Resolve "Add user accounts"

See merge request !10
 2017-05-04 15:03:13 +02:00
Ricardo Hernandez-Montoya
059512333f handle taken usernames add/edit user 2017-05-03 17:30:40 +02:00
Ricardo Hernandez-Montoya
1c20d0c87d add/edit user simple validation 2017-05-03 17:30:00 +02:00
Ricardo Hernandez-Montoya
39c8a2518a sidebar menu items no wrap and grow 2017-05-03 15:58:58 +02:00
Ricardo Hernandez-Montoya
d218c1854d hide user management section for non-admins 2017-05-03 12:46:53 +02:00
Ricardo Hernandez-Montoya
8fb0166059 human names and consisting roles with back-end 2017-05-03 11:44:08 +02:00
Ricardo Hernandez-Montoya
703fa92d2f include user e-mail 2017-05-03 11:26:11 +02:00
Ricardo Hernandez-Montoya
8f6e1fc439 User edit and remove 2017-05-03 11:05:22 +02:00
Steffen Vogel
9ec1d54a93 add note about default user and password 2017-05-02 18:34:25 +02:00
Steffen Vogel
56fbaca680 remove endian flag from websocket packets 2017-05-02 18:34:25 +02:00
Steffen Vogel
fbe3576892 use new API of VILLASnode to detect running simulators 2017-05-02 18:34:25 +02:00
Ricardo Hernandez-Montoya
a4ea7af429 add users with fixed password 2017-05-02 17:27:04 +02:00
Ricardo Hernandez-Montoya
1a54ae09a2 Allow optional token inclusion in REST API calls 2017-05-02 17:26:47 +02:00
Ricardo Hernandez-Montoya
6a4c31baef List users reusing array-store 2017-05-02 16:29:11 +02:00
Ricardo Hernandez-Montoya
80bd1f102e list users 2017-05-02 14:23:09 +02:00
Ricardo Hernandez-Montoya
2bb1611842 Merge branch 'develop' of rwth-gitlab:VILLASframework/VILLASweb into develop 2017-05-02 11:39:18 +02:00
Ricardo Hernandez-Montoya
56f49da1bb Issue #56: tab jump in tables 2017-05-02 11:38:48 +02:00
Ricardo Hernandez-Montoya
18cff1701a is variable available? 2017-04-28 14:31:20 +02:00