555 Commits

Author	SHA1	Message	Date
FrancescoUK	445222bcdd	Merge branch 'master' into ci3	2016-02-07 18:03:44 +00:00
FrancescoUK	345d2d95d8	Remove dbbackup on logout (#318)	2016-02-05 18:42:04 +00:00
FrancescoUK	d07ed0c09f	Merge remote-tracking branch 'jekkos/develop/2.4' into ci3	2016-02-05 16:57:27 +00:00
jekkos	36cf19b1b9	Properly save company_name in customer form	2016-02-04 23:09:03 +01:00
jekkos	67d9ca1e41	Merge branch 'master' into develop/2.4 ... Conflicts: Dockerfile	2016-01-29 17:34:53 +01:00
FrancescoUK	3425920cb6	Merge branch 'master' into ci3	2016-01-28 09:05:35 +00:00
jekkos	847c4a67c9	Add integration test for making sale (#305)	2016-01-26 20:27:07 +01:00
FrancescoUK	8e5b8712c0	Merge branch 'master' into ci3	2016-01-25 09:20:04 +00:00
jekkos	2520970698	Fix comment for autogenerated sql files (#301, #258)	2016-01-25 08:42:15 +01:00
FrancescoUK	d48dc8b87b	Merge branch 'master' into ci3	2016-01-24 22:44:45 +00:00
FrancescoUK	8f72756737	Add a live clock functionality (#298) fix Gruntfile.js (#297)	2016-01-24 22:34:05 +00:00
FrancescoUK	4ccab6b8b5	Code reformatting (#296)	2016-01-24 10:27:41 +00:00
FrancescoUK	1849ee807c	Add favicon (#296)	2016-01-24 10:27:15 +00:00
FrancescoUK	4dd3c64e9d	Code reformatting	2016-01-22 22:16:50 +00:00
FrancescoUK	b400393a90	Code reformatting	2016-01-22 22:14:42 +00:00
FrancescoUK	1f9cb92697	Add favicon	2016-01-22 19:14:57 +00:00
FrancescoUK	59fe366479	Add favicon	2016-01-22 19:05:07 +00:00
FrancescoUK	830f714a44	Change sessions to be stored in database and add SQL upgrade script 2.3.4 to 2.4 (#120)	2016-01-18 23:01:42 +00:00
FrancescoUK	f8c9acd88f	Fix to custom fields that cannot be null on Items save (#120)	2016-01-18 20:15:24 +00:00
FrancescoUK	c2eaf88d74	Upgrade to CI 3.0.4 (#120)	2016-01-17 18:33:26 +00:00
FrancescoUK	b72d620b15	Added comments to some controller functions and improved spacing to improve readibility of code (#120)	2016-01-17 17:56:54 +00:00
FrancescoUK	dce413631c	Make NULL to be null all over the code for consistency purposes (#120)	2016-01-16 22:08:43 +00:00
FrancescoUK	5468127e2f	Further review and fixes to input->post(...) (#120)	2016-01-16 22:04:12 +00:00
FrancescoUK	d66e6ab6ef	Fix to items search not working due to input->post returning null (#120)	2016-01-15 22:53:09 +00:00
FrancescoUK	a3929d2c6f	Merge remote-tracking branch 'jekkos/master' into ci3 ... # Conflicts: # application/config/database.php.tmpl	2016-01-15 18:57:11 +00:00
jekkos	301fbf4427	Merge pull request #283 from ais-one/ais-one-php7-fix ... php7 fixes	2016-01-13 17:59:01 +01:00
Aaron Gong	2f0666325f	PHP7 Fix ... Use __construct as constructor instead of Class name	2016-01-13 15:59:37 +08:00
Aaron Gong	d0c765ce20	PHP7 fix ... Change driver from mysql to mysqli	2016-01-13 15:58:20 +08:00
jekkos	2d0b20499e	Set correct locale for Dutch (Belgium)	2016-01-11 18:53:57 +01:00
FrancescoUK	5b01e60ed2	Merge branch 'master' #274 change into ci3	2016-01-10 13:13:55 +00:00
jekkos	26ff81ab71	Generate languages for German (Swiss) #274	2016-01-09 17:29:57 +01:00
Thorsten	da3349765a	Add de_CH language (by nano-riff #274)	2016-01-09 16:46:00 +01:00
FrancescoUK	b470fbfb3d	Fix merge miss in constants.php (#120)	2016-01-07 20:57:57 +00:00
FrancescoUK	1f86842757	Complete CI 3.0.3 upgrade since it wasn't done in full (#120)	2016-01-07 20:16:59 +00:00
FrancescoUK	de47b11880	Remove application/errors, upgrade Step 8 (#120)	2016-01-07 19:09:53 +00:00
FrancescoUK	6b2b3969ec	EXT constant deprecated, upgrade Step 20 (#120)	2016-01-07 19:09:53 +00:00
FrancescoUK	14c5a0823b	Follow upgrade guideline Step 9 (#120)	2016-01-07 19:09:53 +00:00
FrancescoUK	98b5c8da28	Fix reports error due to report.php now being Report.php (#120)	2016-01-07 19:09:53 +00:00
FrancescoUK	cd7060afed	Change config language to be 'en' consistent with the OSPOS language identifiers (#120) ... However language support doesn't work properly at the moment.	2016-01-07 19:09:53 +00:00
FrancescoUK	347609d20c	Upgrade config.php and database.php.tmpl to CI 3.0.3 versions (#120) ... Apparently the upgrade wasn't complete.	2016-01-07 19:09:53 +00:00
FrancescoUK	0340dc7ffc	Remove application/config.php and database.php (#120)	2016-01-07 19:06:35 +00:00
Toni Haryanto	d8057830c6	Upgrade to Code Igniter 3.0.3 (#120)	2016-01-07 19:06:35 +00:00
jekkos	4ddde65b41	Bump version to 2.3.4 ... Update dutch translation for company_name Fix timeformat for date filtering in items module	2016-01-07 19:53:52 +01:00
FrancescoUK	3bd778737f	#271 fix to error witn xampp due to a spurious "git"	2016-01-04 22:09:38 +00:00
FrancescoUK	240c96a185	#267 remove warning due to junk dirs being inside a language/xx one	2016-01-04 19:44:15 +00:00
FrancescoUK	810000e37c	#265 do not override 404 handler in routes.php	2016-01-04 18:23:16 +00:00
jekkos	9e2d89c528	Show discounted price instead of discount itself on receipt	2016-01-04 17:19:50 +01:00
jekkos	1601d679fd	Takings not using proper permission (#262)	2016-01-04 17:04:33 +01:00
jekkos	ad194bd4c0	Fix typo in english translation (#260)	2016-01-01 16:46:58 +01:00
jekkos	1779685d31	Encode text before storing it as session variable (#254)	2015-12-30 08:10:14 +01:00