 Jack Goh
|
87442520a9
|
Fix test
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking
# Conflicts:
# app/Http/Controllers/BookingController.php
# vendor/composer/autoload_classmap.php
# vendor/composer/autoload_static.php
|
2018-06-13 15:57:08 +08:00 |
|
|
Jack Goh
|
84019bace1
|
ignore some vendorfiles
|
2018-06-13 14:44:41 +08:00 |
|
|
Jack Goh
|
90fcbcda73
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking
# Conflicts:
# app/Http/Controllers/Auth/ResetPasswordController.php
# vendor/composer/autoload_classmap.php
# vendor/composer/autoload_static.php
|
2018-06-13 14:43:30 +08:00 |
|
|
Jack Goh
|
d71fff0b9d
|
Merge branch 'arief/user-frontend' into 'master'
Arief/user frontend
See merge request CIEFWorldwideSdnBhd/exchange!11
|
2018-06-12 08:31:33 +00:00 |
|
 Mohd Arief
|
31813d627e
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into arief/user-frontend
|
2018-06-12 12:08:02 +08:00 |
|
|
Mohd Arief
|
ec4d72c316
|
solve merge conflict
|
2018-06-12 12:05:07 +08:00 |
|
|
Jack Goh
|
bdb6ebcb2f
|
rollback readme
|
2018-06-12 09:48:11 +08:00 |
|
|
Jack Goh
|
dac3e600db
|
Update readme.md
|
2018-06-12 01:47:30 +00:00 |
|
|
Jack Goh
|
a3cb5344ee
|
updated readme
|
2018-06-12 09:46:42 +08:00 |
|
|
Mohd Arief
|
a2262ee3c9
|
Update loading features to login page
|
2018-06-11 16:29:30 +08:00 |
|
|
Mohd Arief
|
007d426f63
|
booking page done until upload
update the countdown function
|
2018-06-11 14:16:16 +08:00 |
|
|
Jack Goh
|
6c089b5989
|
Merge branch 'feature/forgot-password' into 'master'
Feature/forgot password
See merge request CIEFWorldwideSdnBhd/exchange!8
|
2018-06-09 01:57:18 +00:00 |
|
 Mouhamed Lamine
|
337f1d3733
|
Forgot Password
|
2018-06-08 19:09:58 +08:00 |
|
|
Mouhamed Lamine
|
65225369ca
|
Forgot Password
|
2018-06-08 18:13:36 +08:00 |
|
|
Mohd Arief
|
08ea62c411
|
booking page done except upload
|
2018-06-08 11:55:39 +08:00 |
|
|
Jack Goh
|
929266a09c
|
updated only booking belongs to user can update or delete the booking
phpfmt booking controller
removed example test
moved booking test to feature
|
2018-06-07 17:30:54 +08:00 |
|
|
Jack Goh
|
f405f461dd
|
fix view welcome not found
added env example
remove ignored files
|
2018-06-07 17:05:28 +08:00 |
|
 Nazri
|
6e54771ca2
|
upload po test
|
2018-06-05 10:15:43 +08:00 |
|
|
Nazri
|
d7025b7f86
|
update logic
|
2018-05-31 10:38:45 +08:00 |
|
|
Mohd Arief
|
372fa49794
|
added booking confirmation (frontend)
|
2018-05-31 09:42:52 +08:00 |
|
|
Nazri
|
cc3ea574f8
|
add logic, test
|
2018-05-30 16:33:11 +08:00 |
|
|
Nazri
|
7381252c57
|
fix discussion 2
|
2018-05-30 13:24:22 +08:00 |
|
|
Nazri
|
11ccbd6a91
|
fix discussion
|
2018-05-30 12:24:30 +08:00 |
|
|
Nazri
|
4210cdc19d
|
upload purchase order
|
2018-05-28 17:24:13 +08:00 |
|
|
Nazri
|
5c1a4d28c4
|
customer booking bank slip
|
2018-05-28 10:58:40 +08:00 |
|
|
Mohd Arief
|
ce20c2b68f
|
booking popup done
|
2018-05-25 15:06:00 +08:00 |
|
|
Mohd Arief
|
1b64a3d744
|
user-dashboard completed
|
2018-05-24 16:23:06 +08:00 |
|
|
Jack Goh
|
d8a45377b9
|
Merge branch 'arief/booking' into 'master'
booking test merge request
See merge request CIEFWorldwideSdnBhd/exchange!4
|
2018-05-24 07:49:13 +00:00 |
|
|
Nazri
|
54f79b74dc
|
new booking controller update
|
2018-05-24 15:45:55 +08:00 |
|
|
Nazri
|
7e0a0aefa9
|
booking controller update
|
2018-05-24 15:14:33 +08:00 |
|
|
Nazri
|
6fe24714a3
|
booking test updated
|
2018-05-23 12:11:28 +08:00 |
|
|
Nazri
|
f84951f973
|
booking test
|
2018-05-23 11:49:32 +08:00 |
|
|
Nazri
|
90e88039f4
|
add verification status
|
2018-05-22 17:29:12 +08:00 |
|
|
Mohd Arief
|
b2fc9f8605
|
fix test
|
2018-05-21 12:45:54 +08:00 |
|
 jack
|
97f00bf724
|
.env in gitignore
|
2018-05-21 11:40:31 +08:00 |
|
|
jack
|
0d6beb81cf
|
added element ui
updated user frontend
|
2018-05-19 18:37:48 +08:00 |
|
|
jack
|
8f3a6d82e5
|
updated booking to create for current user
updated test to pass
|
2018-05-19 16:11:19 +08:00 |
|
|
jack
|
2783e874bf
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into arief/booking
# Conflicts:
# database/seeds/DatabaseSeeder.php
|
2018-05-19 13:03:09 +08:00 |
|
|
jack
|
3a9b949245
|
changed ordertest to bookingtest
updated databaseseeder to use class
updated booking seeder
|
2018-05-19 12:59:28 +08:00 |
|
|
Mohd Arief
|
315ed64520
|
added booking seeder
updated booking controller
added test for booking
|
2018-05-19 12:33:48 +08:00 |
|
|
jack
|
e539e0b388
|
fixed login and register frontend
|
2018-05-19 12:01:26 +08:00 |
|
|
jack
|
d23d1defda
|
added user role seeder
updated user seeder for better memorization name
|
2018-05-19 10:54:14 +08:00 |
|
|
Mohd Arief
|
18d2ba4543
|
input data inside database using seeder
|
2018-05-17 15:13:29 +08:00 |
|
|
jack
|
40830f327d
|
added dockerignore
added wait for db before app started
|
2018-05-17 12:26:32 +08:00 |
|
|
Mohd Arief
|
204af7cf5e
|
merge master
|
2018-05-15 12:35:52 +08:00 |
|
|
Mohd Arief
|
254077476e
|
edit the unit test
|
2018-05-15 11:18:06 +08:00 |
|
|
Mohd Arief
|
bc6f948314
|
added unit testing
|
2018-05-15 10:59:26 +08:00 |
|
|
jack
|
06aa931eb5
|
added wait for mysql to start in docker
fix role not found on register/login
|
2018-05-14 12:45:30 +08:00 |
|
|
jack
|
d5694be293
|
ignore files that listed in gitignore
|
2018-05-14 11:29:12 +08:00 |
|
|
Jack Goh
|
68bbbcbda1
|
Merge branch 'nazri/settingnrate' into 'master'
Nazri/settingnrate
See merge request CIEFWorldwideSdnBhd/exchange!2
|
2018-05-14 03:24:46 +00:00 |
|