Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

co2
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

c0ed714b

Commit c0ed714b authored 7 years ago by Raph El

Downloads
- Plain Diff

Merge branch 'terla' of https://github.com/pixelhumain/co2 into terla

parents ddca8880 4950e579

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

assets/js/default/circuit.js 268 additions, 364 deletions

assets/js/default/circuit.js
assets/js/default/shoppingCart.js 97 additions, 0 deletions

assets/js/default/shoppingCart.js
components/CommunecterController.php 1 addition, 0 deletions

components/CommunecterController.php
controllers/AppController.php 1 addition, 1 deletion

controllers/AppController.php
controllers/PodController.php 3 additions, 1 deletion

controllers/PodController.php
views/admin/terla/circuits.php 33 additions, 5 deletions

views/admin/terla/circuits.php
views/admin/terla/index.php 10 additions, 3 deletions

views/admin/terla/index.php
views/default/index.php 0 additions, 1 deletion

views/default/index.php
views/element/standalone.php 7 additions, 6 deletions

views/element/standalone.php
views/pod/availableCalendar.php 50 additions, 116 deletions

views/pod/availableCalendar.php
views/pod/circuit.php 156 additions, 0 deletions

views/pod/circuit.php

with 626 additions and 497 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment