Commit Graph

48 Commits

Author SHA1 Message Date
Jackk Goh f0d0d47e37 add heroku buildpack for php 2018-04-02 11:21:02 +08:00
Jackk Goh a0fdb9fcf3 preparing for heroku 2018-04-02 11:16:02 +08:00
Jack Goh ede08216a6 Merge branch 'Asif/fixing_bugs' into 'master'
Asif/fixing_bugs

See merge request CIEFWorldwideSdnBhd/IZYIM!2
2018-03-30 04:04:01 +00:00
Asif 646b79044d resolved line 614/615/619/606 2018-03-30 11:41:34 +08:00
Asif 4d70715fb0 debug_msg deleted 2018-03-30 11:31:07 +08:00
Asif 489615bdfa fix conflict 2018-03-30 11:20:08 +08:00
Asif 7b45b30e92 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/IZYIM into Asif/fixing_bugs 2018-03-30 11:16:07 +08:00
Asif b365805718 changed logo position
dashboard link
pop up field
showed order no.
2018-03-30 11:08:25 +08:00
Jack Goh 5e37972b22 Merge branch 'aqeeb/fixbug' into 'master'
Aqeeb/fixbug

See merge request CIEFWorldwideSdnBhd/IZYIM!1
2018-03-30 01:47:04 +00:00
Jack Goh f66d46ccbf Merge branch 'master' into 'Asif/fixing_bugs'
# Conflicts:
#   includes/func.class/logs/2018-03-27.txt
2018-03-30 01:41:23 +00:00
aqeebimtiaz d7e4f9a107 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/IZYIM into aqeeb/fixbug 2018-03-29 17:41:01 +08:00
Asif f4cbc3185a changed dashboard logo
dash board logo link
changed required pop up field lebel
new warehouse delivery note show order
2018-03-29 17:40:56 +08:00
aqeebimtiaz 73a98dd600 merge 2018-03-29 17:40:38 +08:00
Jackk Goh 02ecd69c6a display all shipping order on warehouse receive note 2018-03-28 12:48:29 +08:00
Jackk Goh 5a1ade378a updated server side check item description and packaging quantity persist 2018-03-28 12:20:47 +08:00
Jackk Goh c14bb2b613 fixed update profile, failed on unchanged data 2018-03-27 11:46:37 +08:00
Jackk Goh 770213499f added gitignore 2018-03-26 17:15:48 +08:00
Jackk Goh 471c0a01e5 added validation for phone number 2018-03-26 14:22:15 +08:00
CIEF Dev Team 45614ed0e8 fix conflict 2018-03-24 01:58:57 +00:00
CIEF Dev Team 047f543284 merge 2018-03-24 01:58:20 +00:00
Jackk Goh fa49b34cfc changed spacing on .htaccess 2018-03-24 09:57:55 +08:00
Jackk Goh 61d56ae8ca change drift code 2018-03-24 09:52:30 +08:00
CIEF Dev Team 3692b546c0 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/IZYIM 2018-03-20 08:19:11 +00:00
Jackk Goh b0086fcc1d updated error for chaging staff position
changed role to position in edit staff
2018-03-20 15:58:49 +08:00
CIEF Dev Team 2a2690258d Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/IZYIM 2018-03-15 06:15:51 +00:00
Jackk Goh fad04ceb6b added forgot password feature 2018-03-15 14:13:31 +08:00
Jackk Goh bd1a3f8c4e updated login username to be number only 2018-03-14 13:47:42 +08:00
CIEF Dev Team c700a9e3c4 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/IZYIM 2018-03-14 04:28:31 +00:00
Jackk Goh f2b778ce8a fix user_id not persist 2018-03-14 12:28:14 +08:00
CIEF Dev Team 86608a92a0 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/IZYIM 2018-03-14 04:24:22 +00:00
Jackk Goh 288826de4d added debug code 2018-03-14 12:24:05 +08:00
CIEF Dev Team 75a4c2d817 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/IZYIM 2018-03-14 04:01:22 +00:00
Jackk Goh 7d5b8ac401 fix login bug 2018-03-14 12:01:08 +08:00
CIEF Dev Team 647f953049 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/IZYIM 2018-03-14 03:52:05 +00:00
Jackk Goh 8461966a21 updated ssl
updated sms verification message
2018-03-14 11:51:02 +08:00
CIEF Dev Team 0067cfd46d Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/IZYIM 2018-03-12 01:26:21 +00:00
CIEF Dev Team 66e70db032 merge 2018-03-12 01:26:14 +00:00
Jackk Goh 5c8767e24d logs 2018-03-12 09:24:30 +08:00
Jackk Goh 89239e6fa1 force ssl on htaccess 2018-03-12 09:21:58 +08:00
Jackk Goh d087da7ace update login function with encrpytion 2018-03-10 19:05:17 +08:00
Jackk Goh 24314b5e33 added encrpytion for password 2018-03-09 17:19:45 +08:00
Jackk Goh 8b411ff273 updated verification visible
updated  success registration message
2018-03-09 16:32:46 +08:00
Jackk Goh 2cf2bbc559 added hotjar
moved drif js from php file to js file
changed status code for failed login and register
removed symfony local and icu
2018-03-09 14:33:21 +08:00
Jackk Goh 6de35878ea added drift 2018-03-09 11:51:36 +08:00
CIEF Dev Team b83ae29d66 remove nexmo/client 2018-03-07 07:56:23 +00:00
CIEF Dev Team 4f3377ef02 remove nexmo/client 2018-03-06 21:50:54 +00:00
CIEF Dev Team b90f620ea6 03-03-2017 Meeting Amendments 2018-03-06 21:43:24 +00:00
CIEF Dev Team 4716562987 Initial commit 2018-03-06 13:21:45 +00:00