jekkos 554f2b32db Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI ...

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

2016-03-07 21:33:26 +01:00

..

barcodes

Make NULL to be null all over the code for consistency purposes (#120)

2016-01-16 22:08:43 +00:00

configs

fix stock_config error message (#116)

2016-03-05 21:08:20 +00:00

customers

Only accept .csv for import excel functionality (#116)

2016-03-01 18:01:53 +01:00

employees

Trigger employee form validation for all tabs (#116)

2016-03-01 17:48:33 +01:00

errors

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

giftcards

Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI

2016-03-07 21:33:26 +01:00

item_kits

Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI

2016-03-07 21:33:26 +01:00

items

Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI

2016-03-07 21:33:26 +01:00

partial

Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI

2016-03-07 21:33:26 +01:00

people

Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI

2016-03-07 21:33:26 +01:00

receivings

Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI

2016-03-07 21:33:26 +01:00

reports

bootstrapisation of #table_action_header in all views, tidy up css styles changed px to em (#116)

2016-03-07 19:09:57 +00:00

sales

Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI

2016-03-07 21:33:26 +01:00

suppliers

Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI

2016-03-07 21:33:26 +01:00

barcode_sheet.php

Add barcode generation for EAN8 and EAN13 (#111, #246)

2015-12-26 11:42:58 +01:00

home.php

Change to bootstrap notification bars, cleanup old css files, moved styles to ospos.css, fixed ospos_print.css (#116)

2016-02-08 19:30:26 +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

login.php

fix font issue, split bootstrap.min.css out of opensourcepos.min.css, grunt upgrades header.php and login.php (#329, #116)

2016-02-21 19:14:04 +00:00

no_access.php

Add route for no_access controller with just one parameter

2015-01-25 15:46:42 +01:00