rahul shukla
|
8d9627c194
|
customer changes
|
2018-10-25 10:38:51 +05:30 |
|
rahul shukla
|
52999c971e
|
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
|
2018-10-25 10:19:17 +05:30 |
jitendra
|
c8e8240080
|
Merged Changes
|
2018-10-25 10:16:55 +05:30 |
|
jitendra
|
a95f56325c
|
Issue fixed
|
2018-10-25 09:44:23 +05:30 |
|
rahul shukla
|
de0ea34e8a
|
conflict resolve
|
2018-10-23 17:24:27 +05:30 |
prashant-webkul
|
2c32f510b2
|
merged with master
|
2018-10-23 17:19:13 +05:30 |
JItendra Singh
|
56e8597c6f
|
Merge pull request #68 from bagisto/jitendra
Dashboard completed
|
2018-10-23 17:16:22 +05:30 |
|
prashant-webkul
|
96b40bf2c3
|
Products DataGrid
|
2018-10-23 17:16:00 +05:30 |
|
jitendra
|
13ae5d58c0
|
Dashboard completed
|
2018-10-23 17:15:44 +05:30 |
|
prashant-webkul
|
5016e03b1c
|
Products datagrid mechanism is normailized to single table due to greate overhead in fetching total attributes for products.
|
2018-10-22 18:48:46 +05:30 |
|
prashant-webkul
|
701c8e3602
|
Wishlist move to cart code is tested and its working fine
|
2018-10-22 16:10:05 +05:30 |
|
rahul shukla
|
399ba55982
|
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
|
2018-10-22 11:18:29 +05:30 |
|
rahul shukla
|
5dc60d0fe1
|
customer group
|
2018-10-22 11:17:42 +05:30 |
|
prashant-webkul
|
806ffb460f
|
Order Datagrid, Datagrid Currency Capabilities via wrapper and UI fixes in storefront navigation bar, admin panel menu item, datagrid actions checks before rendering of datagrid
|
2018-10-18 16:34:55 +05:30 |
|
prashant-webkul
|
d33b5c276e
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-18 15:52:47 +05:30 |
prashant-webkul
|
40ecc72b04
|
Merge pull request #67 from bagisto/jitendra
Jitendra
|
2018-10-18 15:52:22 +05:30 |
|
jitendra
|
1d5e1f5a21
|
Cart issues fixed
|
2018-10-18 15:21:08 +05:30 |
|
prashant-webkul
|
6865545172
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-18 13:50:46 +05:30 |
|
JItendra Singh
|
6c0dfa6a96
|
Merge pull request #65 from bagisto/jitendra
Front currency switcher, currency edit page and locale edit page added
|
2018-10-18 13:49:45 +05:30 |
|
jitendra
|
12d68fcb57
|
Front currency switcher, currency edit page and locale edit page added
|
2018-10-18 13:49:03 +05:30 |
|
rahul shukla
|
bd752c7e3e
|
conflict
|
2018-10-18 12:55:00 +05:30 |
|
prashant-webkul
|
db2b647de3
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-18 12:45:36 +05:30 |
|
prashant-webkul
|
51026b0dfd
|
Mergin
|
2018-10-18 12:45:32 +05:30 |
|
JItendra Singh
|
14140d647a
|
Merge pull request #64 from bagisto/jitendra
user on 404 page fixed
|
2018-10-18 11:55:13 +05:30 |
|
jitendra
|
258262935a
|
user on 404 page fixed
|
2018-10-18 11:54:36 +05:30 |
|
rahul shukla
|
b5be4cf320
|
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
|
2018-10-18 10:33:45 +05:30 |
|
rahul shukla
|
dde2a626e6
|
laoder changes
|
2018-10-18 10:33:00 +05:30 |
|
prashant-webkul
|
3a1029290f
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-17 19:50:55 +05:30 |
|
prashant-webkul
|
8c7626b2b2
|
before merge
|
2018-10-17 19:50:25 +05:30 |
|
jitendra
|
b02d87626a
|
Get current channel code updated
|
2018-10-17 19:27:51 +05:30 |
|
prashant-webkul
|
84bc6c0c60
|
merged
|
2018-10-17 16:17:46 +05:30 |
|
jitendra
|
9756480f42
|
Theme issue fixed
|
2018-10-17 16:17:03 +05:30 |
|
prashant-webkul
|
11e7db8f85
|
Before merge with masteer
|
2018-10-17 16:03:57 +05:30 |
|
jitendra
|
b0a12d85a3
|
COnflict resloved
|
2018-10-17 16:03:25 +05:30 |
|
jitendra
|
faab00c3b8
|
Bug fixed
|
2018-10-17 16:00:31 +05:30 |
|
rahul shukla
|
541264f86a
|
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
|
2018-10-17 15:16:35 +05:30 |
|
JItendra Singh
|
db0f32ac37
|
Merge pull request #57 from bagisto/jitendra
Channel logo and favicon implementation added
|
2018-10-17 15:16:01 +05:30 |
|
jitendra
|
892bf53cc9
|
Channel logo and favicon implementation added
|
2018-10-17 15:15:18 +05:30 |
|
rahul shukla
|
b329567370
|
conflict
|
2018-10-17 15:14:22 +05:30 |
|
rahul shukla
|
8009b5c647
|
error & loader
|
2018-10-17 13:10:08 +05:30 |
|
prashant-webkul
|
5fb2f78039
|
Merged with Master
|
2018-10-17 12:56:34 +05:30 |
|
prashant-webkul
|
3a3c89484d
|
before merge
|
2018-10-17 12:53:01 +05:30 |
|
jitendra
|
d3b73f517c
|
Sales email templates added
|
2018-10-17 12:51:47 +05:30 |
|
prashant-webkul
|
c05ea63603
|
Before Merge
|
2018-10-17 12:30:48 +05:30 |
|
prashant-webkul
|
ddc57abdfa
|
Datagrid UI and Configuration fixes
|
2018-10-17 11:27:40 +05:30 |
|
prashant-webkul
|
f195b335b6
|
Data Grid Configuration Fixes
|
2018-10-16 18:56:30 +05:30 |
|
prashant-webkul
|
91a4fabcfb
|
Grid Sort Fixes
|
2018-10-16 17:18:45 +05:30 |
|
rahul shukla
|
ec03cbd63e
|
conflict resolve
|
2018-10-15 16:16:50 +05:30 |
|
jitendra
|
7f1675e37c
|
Order cancel implemented
|
2018-10-15 16:09:09 +05:30 |
|
rahul shukla
|
5cc562d972
|
reviews
|
2018-10-15 14:32:26 +05:30 |