jekkos e302086b13 Merge branch 'master' into feature/composer ...

Conflicts:
	.travis.yml
	application/controllers/Login.php
	application/views/partial/header.php
	public/dist/opensourcepos.min.js

2016-08-19 12:09:38 +02:00

..

bootstrap_tables_locale.php

Install CI langauges in system/language as before (#624)

2016-08-18 13:33:02 +02:00

datepicker_locale.php

Fixed translation strings typos in datepicker_locale

2016-07-04 18:59:56 +01:00

daterangepicker.php

Fixed daterangepicker translation

2016-06-27 16:33:52 +01:00

footer.php

Fix decimal parsing, add php5-intl locale support (#458)

2016-07-07 20:56:51 +02:00

header_js.php

Try to fix travis docker setup + remove jquery validator override (#788, #616)

2016-08-10 15:26:18 +02:00

header.php

Merge branch 'master' into feature/composer

2016-08-19 12:09:38 +02:00

lang_lines.php

Fix close button in stock details (#14)

2016-07-04 18:03:25 +02:00

print_receipt.php

Hide delete button from Takings print, fix null value for margins, add a missing / (#507)

2016-05-05 22:31:24 +01:00

stock_locations.php

Small code optimisation: pre increment is faster than post increment (#709)

2016-07-01 18:58:04 +01:00