JSON Generations...
Merge branch 'web' of https://github.com/tdubourg/ghome into web
JSON dynamics...
JSON dynamics also :*
task_executor bug select_query fixed
WIP on adding join tables and new operators and all that stuff
corrected the styles and various bugs in new task and device
Merge branch 'web' of github.com:tdubourg/ghome into web
added edit mode to task
Merge branch 'master' into web
still WIP on the join table but some work has been already done. Still need to populate a bit more the join tables according to the sensors we already have
Better with the actual file...
Merge branch 'master' into web
Merge branch 'web' of github.com:tdubourg/ghome into web
changemes of the DB in order to put the dates conditions in the table conditions
Foreign KEY are now enabled (and thus fixing the order of the queries in sql_test_data.txt so that the foreign keys checks are passing)
Mergin master into web
Merge branch 'spy'
merge
add of > and < for the date in the conditions