Thing dans co2 #209
Open
Thing dans co2 #209
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nouveau fichier : docs/specs/Thing.md modifié : views/thing/graph.php
modifié : config/CO2/params.json modifié : docs/specs/Thing.md modifié : views/thing/graph.php modifié : views/thing/index.php
modifié : controllers/ThingController.php modifié : views/thing/graph.php
Conflicts: config/CO2/params.json
modifié : views/thing/index.php modifié : views/thing/scklastestreadings.php
modifié : components/CommunecterController.php modifié : config/CO2/params.json modifié : controllers/ThingController.php modifié : views/thing/graph.php modifié : views/thing/index.php modifié : views/thing/manage.php
nouveau fichier : views/app/thing.php
modifié : components/CommunecterController.php modifié : controllers/ThingController.php modifié : views/app/thing.php
…lhumain-master
Conflicts: assets/js/co.js
modifié : views/thing/scklastestreadings.php
…lhumain-master
modifié : views/thing/scklastestreadings.php
…lhumain-master
modifié : views/app/thing.php modifié : views/thing/graph.php modifié : views/thing/manage.php modifié : views/thing/scklastestreadings.php
…lhumain-master
config/CO2/thing.json ; controllers/AppController.php ; views/app/thing.php ; views/thing/ : graph.php , manage.php, scklastestreadings.php ;
…lhumain-master
modifié : views/thing/graph.php
…lhumain-master
…lhumain-master
modifié : config/CO2/thing.json modifié : controllers/ThingController.php modifié : views/app/thing.php modifié : views/thing/graph.php modifié : views/thing/manage.php
…lhumain-master Conflicts: config/CO2/params.json controllers/AppController.php
modifié : config/CO2/params.json
…lhumain-master
…lhumain-master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.