575 Commits

Author	SHA1	Message	Date
FrancescoUK	09831faaf4	Fix reports listing font size (#116)	2016-02-07 23:16:54 +00:00
FrancescoUK	a5e66eabed	Fix reports listing missing </div> issue (#116)	2016-02-07 23:11:27 +00:00
FrancescoUK	25f8a34b23	Change buttons in all the forms to use bootstrap button class (#116)	2016-02-07 23:04:59 +00:00
FrancescoUK	2ea14273b8	Merge branch 'ci3' into bootstrapUI	2016-02-07 18:07:54 +00:00
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	8a22f1c889	Merge branch 'ci3' into bootstrapUI	2016-02-05 17:03:57 +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	8698026e86	Fix indentation	2016-01-28 09:32:46 +00:00
FrancescoUK	ec5d0ab4f7	Merge branch 'ci3' into bootstrapUI	2016-01-28 09:31:19 +00: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	342b889371	Merge branch 'ci3' into bootstrapUI	2016-01-25 09:44:08 +00: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	f52c5b0843	Add a live clock functionality to flatly and spacelab templates (#298) (#116)	2016-01-24 22:57:13 +00: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	4fd7948987	Made flatly as default, various header adjustments, added login with bootstrap (#116)	2016-01-24 20:05:36 +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
cpl2015	d9e18551b5	Update receiving.php	2016-01-24 02:52:22 +05:30
cpl2015	144da1ed6b	Update theme.php	2016-01-24 02:34:36 +05:30
cpl2015	216432f4b6	Update manage.php	2016-01-24 01:38:02 +05:30
cpl2015	2b5825f841	Update form.php	2016-01-24 01:34:59 +05:30
cpl2015	46987845b3	Update form.php	2016-01-24 01:34:12 +05:30
cpl2015	e1cead8241	Update form.php	2016-01-24 01:30:49 +05:30
cpl2015	63f72b046d	Update receiving.php	2016-01-24 01:24:14 +05:30
cpl2015	3fe39bbf73	Update register.php	2016-01-24 01:19:50 +05:30
FrancescoUK	4cc3eadb97	Apply changes from #226 (#116)	2016-01-22 22:17:29 +00:00
FrancescoUK	206751de0e	Overriding view files (#116)	2016-01-22 22:17:29 +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