jekkos 3f12930223 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI ...

Conflicts:
	application/views/partial/header.php
	dist/opensourcepos.js
	dist/opensourcepos.min.js
	templates/spacelab/views/partial/header.php

2016-02-11 08:00:47 +01:00

..

cache

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

2016-01-07 20:16:59 +00:00

config

Restore config.php comment line that somehow was cut out (#116)

2016-02-10 17:25:55 +00:00

controllers

Fix to sales edit server error when customer is '' (#116)

2016-02-10 20:16:20 +00:00

core

Made flatly as default, various header adjustments, added login with bootstrap (#116)

2016-01-24 20:05:36 +00:00

helpers

Make empty table alert info not warning (#116)

2016-02-10 17:25:44 +00:00

hooks

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

2016-01-07 20:16:59 +00:00

language

Make choose file in General Configuration bootstrap (#116)

2016-02-10 23:27:28 +00:00

libraries

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

2016-01-07 20:16:59 +00:00

logs

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

2016-01-07 20:16:59 +00:00

models

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

2016-01-07 20:16:59 +00:00

third_party

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

2016-01-07 20:16:59 +00:00

views

Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI

2016-02-11 08:00:47 +01:00

.htaccess

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

2016-01-07 20:16:59 +00:00

index.html

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

2016-01-07 20:16:59 +00:00