2123 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
FrancescoUK	68b28a17e4	Merge branch 'master' into ci3	2016-01-24 10:38:26 +00:00
jekkos	463af45e73	Remove test run in pre_install (travis-ci)	2016-01-24 10:28:00 +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	bd7b4a1c14	Create style.css	2016-01-24 03:04:24 +05:30
cpl2015	c20520c877	Delete style.css	2016-01-24 03:00:29 +05:30
cpl2015	35aec3c34f	Update header.php	2016-01-24 02:59:08 +05:30
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	125ffe9f73	Create home.php	2016-01-24 02:33:51 +05:30
cpl2015	a94f32dc50	Delete home.css	2016-01-24 02:33:08 +05:30
cpl2015	8c338fc223	Create footer.php	2016-01-24 02:32:36 +05:30
cpl2015	ca764a3165	Create header.php	2016-01-24 02:31:54 +05:30
cpl2015	b58547f988	Create home.css	2016-01-24 02:30:23 +05:30
cpl2015	05fbe8b218	Create style.css	2016-01-24 02:26:20 +05:30
cpl2015	823f8f0be3	Create bootstrap.css	2016-01-24 02:24:53 +05:30
cpl2015	b40b06a18e	Delete spacelab	2016-01-24 02:16:38 +05:30
cpl2015	513250cadf	Create spacelab	2016-01-24 02:11:23 +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	81646a00ff	flatly header.php code reformatting (#116)	2016-01-23 10:08:37 +00:00
FrancescoUK	8edd6a2e49	Add favicon to flatly header.php (#116)	2016-01-23 10:05:57 +00:00
FrancescoUK	4cc3eadb97	Apply changes from #226 (#116)	2016-01-22 22:17:29 +00:00
FrancescoUK	4b9d5113d3	Change header template (#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	8eba67ceb8	Merge branch 'master' into ci3 (#284)	2016-01-22 14:57:25 +00:00
jekkos	1148ef1595	Install grunt-cli in docker container (#284)	2016-01-22 14:43:53 +01:00
jekkos	bcbdee3a50	Fix test execution for travis-ci (grunt invocation)	2016-01-22 13:37:30 +01:00
jekkos	cfbb700f0c	Add symlink for node in Dockerfile	2016-01-22 13:10:23 +01:00
FrancescoUK	95f6738d5b	Fix package.json version to be 2.4 (#284)	2016-01-22 11:31:13 +00:00
FrancescoUK	0cde54e985	Merge branch 'master' into ci3 (#284)	2016-01-22 08:39:24 +00:00
jekkos	a3d3cfad61	Use Dockerfile in travis-ci setup (#284) ... Set version in package.json	2016-01-22 08:18:40 +01:00
FrancescoUK	b89e9c56cc	Merge branch 'master' into ci3 (#284)	2016-01-21 18:38:48 +00:00
jekkos	192955b33d	Fix receipt barcode generation for docker (add php5-gd lib to Dockerfile) (#284) ... Make setup scripts with CI3	2016-01-21 18:30:06 +01:00
jekkos	195c8a0601	Make docker work with 2.4 branch	2016-01-21 16:23:54 +01:00
jekkos	9048d68baf	Make docker work wig	2016-01-21 16:23:17 +01:00
jekkos	2b70762b7a	Use ubuntu trusty for Docker container + add startup scripts (#284) ... Add Grunt concatenate for sql scripts (migrate + db init) (#289)	2016-01-20 18:47:44 +01:00
FrancescoUK	de2d034377	Update database/tables.sql script with new sessions table (#120)	2016-01-19 12:00:51 +00:00
FrancescoUK	f941a45d13	Update Copyright notice (#120)	2016-01-19 11:21:08 +00:00
FrancescoUK	4280e05679	Make the data blob NOT NULL in the SQL upgrade script (#120)	2016-01-19 08:24:58 +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