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
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
jekkos
d67f08d842
Add (temp) fix for cur_page conuter in CI pagination libary ( #120 )
...
Fix .htaccess file
2016-01-18 19:23:44 +00:00
FrancescoUK
3c22f9069b
Restore padding in pagination links, now it uses css ( #120 )
2016-01-17 19:02:08 +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
b5cc1542b6
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2016-01-13 18:58:40 +01:00
jekkos
1a77960daa
Update README.md with instructions for Docker setup
2016-01-13 18:57:44 +01: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
a1ad99cc0d
Add Dockerfile. Ospos is now containerized. Pull image from
...
docker build -t me/ospos git://github.com/jekkos/opensourcepos.git
then run
docker run -it me/opensourcepos
And head to port 80 to login to a new ospos install.
2016-01-13 08:45:10 +01: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
cpl2015