Guillermo Gutierrez Morote 4bf2ff4ff0 Merge branch 'master' into 'db_persistence' ... # Conflicts: # .gitignore # city_model_structure/city.py # requirements.txt # unittests/test_energy_systems_water_to_water_hp.py		2023-01-09 21:36:44 +00:00
..
building_energy	change units in monthly energy balance exporter	2022-12-01 15:33:14 -05:00
energy_systems	Merge branch 'master' into 'db_persistence'	2023-01-09 21:36:44 +00:00
formats	reorganized the exports factories	2022-11-25 12:34:11 -05:00
db_factory.py	Added documentation for database setup	2022-12-07 19:06:17 -05:00
energy_building_exports_factory.py	reorganized the exports factories	2022-11-25 12:34:11 -05:00
energy_systems_factory.py	Included an option for return dictionary when output file is None	2022-08-18 16:45:55 -04:00
exports_factory.py	Merge remote-tracking branch 'origin/master' into geojson	2022-11-25 12:49:39 -05:00
user_factory.py	Added user authentication capabilities to hub	2022-12-08 20:54:47 -05:00