Markus Grigull
|
3e55659854
|
Add simulator editing and moving
|
2017-07-08 00:23:01 +02:00 |
|
Markus Grigull
|
c5e4642797
|
Add simulators to nodes
|
2017-07-07 10:25:07 +02:00 |
|
Markus Grigull
|
cf83d4d969
|
Add node dialogs and backend
|
2017-07-06 11:41:26 +02:00 |
|
Ricardo Hernandez
|
4edaa958e3
|
Merge branch 'gitlab-ci-fix' into 'develop'
Gitlab ci fix
See merge request !14
|
2017-06-30 12:09:01 +02:00 |
|
Ricardo Hernandez-Montoya
|
003ab30cab
|
deploy only on develop branch
|
2017-06-30 12:03:37 +02:00 |
|
Ricardo Hernandez-Montoya
|
266573f456
|
pip upgrade, install specific docker-compose version
|
2017-06-30 10:58:14 +02:00 |
|
Ricardo Hernandez-Montoya
|
95be14cef7
|
Docker upgrade
|
2017-06-30 10:37:15 +02:00 |
|
|
|
7dfed9e632
|
try newer docker-compose
|
2017-06-28 14:56:32 +02:00 |
|
|
|
0191f81486
|
fix docker-compose file
|
2017-06-28 13:28:50 +02:00 |
|
|
|
d6019fe07a
|
fix GitLab-CI deployment
|
2017-06-28 13:23:53 +02:00 |
|
|
|
1ad7441caa
|
fix: more inconsistencies (#70)
|
2017-06-28 13:19:10 +02:00 |
|
|
|
efd1c26e19
|
fix GitLab-CI
|
2017-06-28 13:10:59 +02:00 |
|
|
|
01f79aea93
|
fix: make dialog buttons upper / lower case spelling consistent (closes #70)
|
2017-06-28 13:07:06 +02:00 |
|
|
|
01f3b2d8ac
|
fix: invalid dialog title (closes #69)
|
2017-06-28 13:06:28 +02:00 |
|
|
|
f7979ab250
|
simplified GitLab-CI config
|
2017-06-28 13:05:27 +02:00 |
|
|
|
2b2052e203
|
add some sample data and a script to save / restore it
|
2017-06-28 12:10:19 +02:00 |
|
|
|
5640b01bbf
|
fix URL of git submodule in order to fix GitLab-CI
|
2017-06-28 09:00:45 +02:00 |
|
|
|
830c8715a0
|
added note about docker usage
|
2017-06-28 02:46:24 +02:00 |
|
|
|
dfa5259156
|
add react-script proxy support
|
2017-06-28 02:44:57 +02:00 |
|
|
|
3a988506bf
|
fix: npm gave some deprecation warnings
|
2017-06-28 02:44:27 +02:00 |
|
|
|
b4dce489fa
|
fix: simulators always appear offline
|
2017-06-28 02:43:24 +02:00 |
|
|
|
38863ee166
|
start VILLASnode services and use frontend to proxy WebSocket endpoint
|
2017-06-28 02:42:43 +02:00 |
|
|
|
6af5fa4346
|
add RabbitMQ broker as a new service to our docker compose
|
2017-06-28 00:39:45 +02:00 |
|
|
|
e685d4d872
|
use a docker volume for mongodb persistence
not every docker installation can mount /opt/database
|
2017-06-28 00:39:01 +02:00 |
|
|
|
1b3fb81872
|
move git submodule of backend
|
2017-06-28 00:37:37 +02:00 |
|
Markus Grigull
|
86a6bac55e
|
Add node component
|
2017-06-27 09:58:10 +02:00 |
|
Ricardo Hernandez
|
b57d0699e3
|
Merge branch 'ci-config' into 'develop'
Gitlab CI config
See merge request !13
|
2017-06-02 17:19:57 +02:00 |
|
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 |
|
