jekkos 139100db35 Merge branch 'master' into feature/bootstrap-tables ...

Conflicts:
	application/models/Item.php
	application/views/reports/date_input_excel_export.php
	application/views/reports/excel_export.php
	application/views/reports/inventory_summary_input.php
	application/views/reports/specific_input.php

2016-05-12 20:34:24 +02:00

..

cache

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-03-08 17:44:59 +00:00

config

Remove specific input view for excel export (#535)

2016-05-10 19:04:24 +02:00

controllers

Only show item suggestions with associated id in register and receiving (#540)

2016-05-12 08:19:15 +02:00

core

better support of templates in Gruntfile.js and fix glyphicon issue (#409 #448)

2016-04-09 22:57:03 +01:00

helpers

Collapse rows in detailed report after delete (#507, #293)

2016-05-12 18:02:26 +02:00

hooks

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-03-08 17:44:59 +00:00

language

Fix sale and receiving edit and delete in detailed report (#507, #293)

2016-05-11 17:57:37 +02:00

libraries

fixed error reporting, fixed table_helper, added translations, fixed bootstrap grid, various fixes (#472)

2016-04-30 21:34:23 +01:00

logs

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-03-08 17:44:59 +00:00

models

Fix sale and receiving edit and delete in detailed report (#507, #293)

2016-05-11 17:57:37 +02:00

third_party

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-03-08 17:44:59 +00:00

views

Merge branch 'master' into feature/bootstrap-tables

2016-05-12 20:34:24 +02:00

.htaccess

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-03-08 17:44:59 +00:00

index.html

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-03-08 17:44:59 +00:00