rahul shukla
|
8fbf2b7b79
|
conflict resolve
|
2018-09-19 15:36:32 +05:30 |
|
rahul shukla
|
670e466478
|
conflict
|
2018-09-19 15:25:01 +05:30 |
|
rahul shukla
|
1e2681adb3
|
product-detail page responsive
|
2018-09-19 15:22:10 +05:30 |
JItendra Singh
|
6dbdb9f306
|
Merge pull request #9 from bagisto/prashant
Prashant
|
2018-09-19 12:34:08 +05:30 |
prashant-webkul
|
e3d1805043
|
Merged with master
|
2018-09-19 12:33:06 +05:30 |
|
prashant-webkul
|
a24c789a3c
|
before merge
|
2018-09-19 12:30:24 +05:30 |
|
JItendra Singh
|
919041da2b
|
Merge pull request #8 from bagisto/jitendra
Checkout page
|
2018-09-19 12:29:26 +05:30 |
jitendra
|
acd048aaf6
|
Checkout page
|
2018-09-19 12:28:15 +05:30 |
|
prashant-webkul
|
a122a8ea9f
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-09-17 15:13:39 +05:30 |
|
prashant-webkul
|
ec6d777b25
|
Cart Working by adding the products as guest and logged in user and merging in case of guest user to logged in. Ready for next phase of checkouts.
|
2018-09-17 13:57:32 +05:30 |
|
rahul shukla
|
9743a6b1e1
|
conflict
|
2018-09-15 15:57:19 +05:30 |
|
rahul shukla
|
4f42f6d4d3
|
conflict
|
2018-09-15 15:31:16 +05:30 |
|
rahul shukla
|
94eb52389e
|
product-detail
|
2018-09-15 15:19:58 +05:30 |
|
prashant-webkul
|
dbfe16e3bd
|
Rework the merge function else all would be fine
|
2018-09-15 14:46:16 +05:30 |
|
rahul shukla
|
ceabaf4198
|
responive pages
|
2018-09-15 13:42:19 +05:30 |
|
prashant-webkul
|
477dded06e
|
Product details page layout is fixed
|
2018-09-15 13:39:56 +05:30 |
|
prashant-webkul
|
9cea4133f7
|
Case of Cart Merging Left
|
2018-09-14 18:45:49 +05:30 |
|
prashant-webkul
|
84a687239d
|
Do not take this pull very reactive
|
2018-09-13 19:10:01 +05:30 |
|
JItendra Singh
|
59593c3d5e
|
Merge pull request #7 from bagisto/prashant
Prashant
|
2018-09-13 17:21:19 +05:30 |
|
prashant-webkul
|
b22e82b8cf
|
Mergingchanges
|
2018-09-13 17:20:12 +05:30 |
|
prashant-webkul
|
0222c97a53
|
Merging changes with master
|
2018-09-13 16:57:13 +05:30 |
|
JItendra Singh
|
ba90c53d33
|
Merge pull request #6 from bagisto/rahul
Rahul
|
2018-09-13 16:48:55 +05:30 |
|
rahul shukla
|
87e5e9a2bc
|
checkout process
|
2018-09-13 16:46:47 +05:30 |
|
rahul shukla
|
58f12f7153
|
Merge branch 'master' of https://github.com/bagisto/bagisto
|
2018-09-13 16:41:07 +05:30 |
|
rahul shukla
|
1be2127591
|
checkout process
|
2018-09-13 16:40:45 +05:30 |
|
prashant-webkul
|
ac093c465b
|
Cart Module being modified accodrding to session
|
2018-09-13 16:36:17 +05:30 |
|
JItendra Singh
|
213944e9d9
|
Merge pull request #5 from bagisto/jitendra
Product detail page completed
|
2018-09-13 16:36:09 +05:30 |
|
jitendra
|
160f92b542
|
Product detail page completed
|
2018-09-13 16:34:56 +05:30 |
|
prashant-webkul
|
4e7b1f157b
|
Merged with master
|
2018-09-12 12:27:01 +05:30 |
|
prashant-webkul
|
398caff7bc
|
Cart Module in progress 70%
|
2018-09-11 16:49:40 +05:30 |
|
JItendra Singh
|
1a7f35b72d
|
Merge pull request #4 from bagisto/jitendra
Conflicts resolved
|
2018-09-11 16:12:30 +05:30 |
|
jitendra
|
9731b499d4
|
Conflicts resolve
|
2018-09-11 16:10:57 +05:30 |
|
jitendra
|
5202729391
|
Configurable options added
|
2018-09-11 16:00:02 +05:30 |
|
rahul shukla
|
276e03169a
|
Merge branch 'master' of https://github.com/bagisto/bagisto
|
2018-09-11 09:45:35 +05:30 |
|
rahul shukla
|
b082d73707
|
customer edit/add & show in admin
|
2018-09-11 09:41:48 +05:30 |
|
JItendra Singh
|
f7d5908705
|
Merge pull request #2 from bagisto/jitendra
Merge changes to master
|
2018-09-10 15:07:22 +05:30 |
|
jitendra
|
4fb084557d
|
Commit to master
|
2018-09-10 15:04:57 +05:30 |
|
prashant-webkul
|
40e04abddf
|
On the new origin
|
2018-09-10 15:01:34 +05:30 |
|
jitendra
|
c38b1fc7b3
|
First commit
|
2018-09-10 14:50:08 +05:30 |
|
rahul shukla
|
d0e0b64445
|
merge conflict
|
2018-09-08 14:22:46 +05:30 |
|
rahul shukla
|
149c98ff03
|
customer & review
|
2018-09-08 14:11:36 +05:30 |
|
prashant-webkul
|
e07be27d8b
|
Merged with master
|
2018-09-06 12:19:22 +05:30 |
|
prashant-webkul
|
29d83d7b5f
|
Cart Packages files
|
2018-09-06 11:50:30 +05:30 |
|
prashant-webkul
|
888dfc6b0f
|
Tax Module completed
|
2018-09-05 16:26:42 +05:30 |
|
prashant-webkul
|
4cf6ab5f00
|
Tax Module Completed with just edit form left.
|
2018-09-04 14:44:32 +05:30 |
|
prashant-webkul
|
df199f0728
|
Taxes, long intended routes, ACL now prevents login if user already logged in.
|
2018-08-31 11:33:11 +05:30 |
|
rahul shukla
|
0c6d92dbfc
|
conflict resolve
|
2018-08-30 18:59:23 +05:30 |
|
JItendra Singh
|
70ddd4a914
|
Merge pull request #28 from jitendra-webkul/jitendra
Product details page added
|
2018-08-30 18:53:32 +05:30 |
|
jitendra
|
0c8b5a03e2
|
Product details page added
|
2018-08-30 18:52:15 +05:30 |
|
rahul shukla
|
23653a7922
|
conflict resolve
|
2018-08-30 18:05:43 +05:30 |