Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Thing dans co2 #209

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open

Thing dans co2 #209

wants to merge 69 commits into from

Commits on Mar 16, 2017

  1. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    45e4347 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2017

  1. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    022d573 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    ca58385 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    5764fe5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    10eea6c View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2017

  1. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 18, 2017
    Configuration menu
    Copy the full SHA
    7486fd3 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2017

  1. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    5f9b084 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    010eaff View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2017

  1. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    400cd6d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    8847202 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    0cda37e View commit details
    Browse the repository at this point in the history

  2. Ajout de thing graph dans CO2

    @Danzal974
    Danzal974 committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    5a73600 View commit details
    Browse the repository at this point in the history

  3. modifié : docs/bugs.org 

    	nouveau fichier : docs/specs/Thing.md
	modifié :         views/thing/graph.php
    @Danzal974
    Danzal974 committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    28452cd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    96337fe View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2017

  1. modifié : views/thing/graph.php

    @Danzal974
    Danzal974 committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    86ea1ea View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2017

  1. modif thing/manage

    @Danzal974
    Danzal974 committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    2548cfb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    92d7afb View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2017

  1. nouveau fichier : assets/js/thing/graph.js 

    	modifié :         config/CO2/params.json
	modifié :         docs/specs/Thing.md
	modifié :         views/thing/graph.php
	modifié :         views/thing/index.php
    @Danzal974
    Danzal974 committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    6e29d26 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    4976eb0 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2017

  1. modifié : assets/js/sig/map_initializer.js 

    	modifié :         controllers/ThingController.php
	modifié :         views/thing/graph.php
    @Danzal974
    Danzal974 committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    9f74e91 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master' 

    Conflicts:
	config/CO2/params.json
    @Danzal974
    Danzal974 committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    741811c View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2017

  1. modifié : assets/js/thing/graph.js 

    	modifié :         views/thing/index.php
	modifié :         views/thing/scklastestreadings.php
    @Danzal974
    Danzal974 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    9abdace View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    8753c6b View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2017

  1. modifié : assets/js/thing/graph.js

    @Danzal974
    Danzal974 committed Apr 7, 2017
    Configuration menu
    Copy the full SHA
    4881729 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Apr 7, 2017
    Configuration menu
    Copy the full SHA
    f13294e View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2017

  1. modifié : assets/js/thing/graph.js 

    	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
    @Danzal974
    Danzal974 committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    6342d47 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    003d722 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2017

  1. nouveau fichier : config/CO2/thing.json 

    	nouveau fichier : views/app/thing.php
    @Danzal974
    Danzal974 committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    a170195 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    5504814 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2017

  1. modifié : assets/js/co.js 

    	modifié :         components/CommunecterController.php
	modifié :         controllers/ThingController.php
	modifié :         views/app/thing.php
    @Danzal974
    Danzal974 committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    d18179d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master' 

    Conflicts:
 assets/js/co.js

Modifié : assets/js/co.js
 assets/js/default/editInPlace.js
 controllers/AppController.php
 views/app/referencement.php
 views/app/search.php
 views/element/about.php
 views/element/profilSocial.php
    @Danzal974
    Danzal974 committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    1b104a8 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2017

  1. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    f4bd20b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    4258897 View commit details
    Browse the repository at this point in the history

  3. modifié : assets/js/co.js 

    	modifié :         controllers/AppController.php
    @Danzal974
    Danzal974 committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    a0d8839 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    14bfd38 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'pixelhumain-master' 

    Conflicts:
	controllers/AppController.php
    @Danzal974
    Danzal974 committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    ab004f8 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. thing.manage 2 updates features done

    @Danzal974
    Danzal974 committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    262cb54 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2017

  1. refactor thing metadata dans poi

    @Danzal974
    Danzal974 committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    6d5e95f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master

Conflicts:
	assets/js/co.js
    @Danzal974
    Danzal974 committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    da4424e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    2cea822 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'pixelhumain-master' 

    Conflicts:
	assets/js/co.js
    @Danzal974
    Danzal974 committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    a5b49db View commit details
    Browse the repository at this point in the history

Commits on May 3, 2017

  1. modifié : views/thing/manage.php 

    	modifié :         views/thing/scklastestreadings.php
    @Danzal974
    Danzal974 committed May 3, 2017
    Configuration menu
    Copy the full SHA
    b6edc85 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed May 3, 2017
    Configuration menu
    Copy the full SHA
    378d152 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed May 3, 2017
    Configuration menu
    Copy the full SHA
    1119bc5 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2017

  1. modifié : views/thing/scklastestreadings.php

    @Danzal974
    Danzal974 committed May 6, 2017
    Configuration menu
    Copy the full SHA
    0cf4e85 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2017

  1. modifié : views/thing/graph.php 

    modifié : views/thing/scklastestreadings.php
    @Danzal974
    Danzal974 committed May 9, 2017
    Configuration menu
    Copy the full SHA
    74c9b47 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed May 9, 2017
    Configuration menu
    Copy the full SHA
    f048fe5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed May 9, 2017
    Configuration menu
    Copy the full SHA
    8244438 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2017

  1. modifié : config/CO2/thing.json 

    modifié : views/app/thing.php
modifié : views/thing/graph.php
modifié : views/thing/manage.php
modifié : views/thing/scklastestreadings.php
    @Danzal974
    Danzal974 committed May 12, 2017
    Configuration menu
    Copy the full SHA
    e913d59 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed May 12, 2017
    Configuration menu
    Copy the full SHA
    43f2d4f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed May 12, 2017
    Configuration menu
    Copy the full SHA
    b37bf26 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2017

  1. modifié : assets/js/thing/graph.js ; 

    config/CO2/thing.json ;
controllers/AppController.php ;
views/app/thing.php ;
views/thing/ : graph.php , manage.php, scklastestreadings.php ;
    @Danzal974
    Danzal974 committed May 24, 2017
    Configuration menu
    Copy the full SHA
    fc30c8e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed May 24, 2017
    Configuration menu
    Copy the full SHA
    503f5a9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed May 24, 2017
    Configuration menu
    Copy the full SHA
    2c27da6 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2017

  1. modifié : assets/js/thing/graph.js 

    	modifié :         views/thing/graph.php
    @Danzal974
    Danzal974 committed May 26, 2017
    Configuration menu
    Copy the full SHA
    cb26fd4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed May 26, 2017
    Configuration menu
    Copy the full SHA
    ee4b41f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed May 26, 2017
    Configuration menu
    Copy the full SHA
    8713eab View commit details
    Browse the repository at this point in the history

Commits on May 28, 2017

  1. Refrator (en cours) de graphe pour corriger le probleme des axis.

    @Danzal974
    Danzal974 committed May 28, 2017
    Configuration menu
    Copy the full SHA
    cc307fd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed May 28, 2017
    Configuration menu
    Copy the full SHA
    7d9af8e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed May 28, 2017
    Configuration menu
    Copy the full SHA
    6c72105 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2017

  1. modifié : assets/js/thing/graph.js 

    	modifié :         config/CO2/thing.json
	modifié :         controllers/ThingController.php
	modifié :         views/app/thing.php
	modifié :         views/thing/graph.php
	modifié :         views/thing/manage.php
    @Danzal974
    Danzal974 committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    2ea9e51 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master

Conflicts:
	config/CO2/params.json
	controllers/AppController.php
    @Danzal974
    Danzal974 committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    8cb0175 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    7eb5c0a View commit details
    Browse the repository at this point in the history

  4. modifié : assets/js/thing/graph.js 

    	modifié :         config/CO2/params.json
    @Danzal974
    Danzal974 committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    1920b6a View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. modifié : docs/specs/Thing.md

    @Danzal974
    Danzal974 committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    99ce7ef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    bfd46dd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    044fd1f View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2017

  1. Merge branch 'master' of https://github.com/pixelhumain/co2 into pixe… 

    …lhumain-master
    @Danzal974
    Danzal974 committed Jun 24, 2017
    Configuration menu
    Copy the full SHA
    e3d7f53 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pixelhumain-master'

    @Danzal974
    Danzal974 committed Jun 24, 2017
    Configuration menu
    Copy the full SHA
    25c8397 View commit details
    Browse the repository at this point in the history