Commit Graph

650 Commits

Author SHA1 Message Date
rahul shukla 5e6131102b issue #866 & #845 2019-04-25 14:11:49 +05:30
rahul shukla 75e74dfb7e issue #867 shipment issue 2019-04-24 17:57:16 +05:30
rahul shukla c4eb615328 issue #842 2019-04-23 18:53:41 +05:30
rahul shukla e52c426600 dashboard & issue #841 2019-04-23 16:20:33 +05:30
jitendra 7a5c3f1bdc Assets compiled for production 2019-04-23 12:58:47 +05:30
rahul shukla 148ff7c1e8 merge with master 2019-04-23 12:36:05 +05:30
Jitendra Singh 025a34d99f
Merge pull request #857 from jitendra-webkul/jitendra
Issue #840 fixed
2019-04-23 10:33:58 +05:30
jitendra c585186a88 Issue #840 fixed 2019-04-23 10:33:10 +05:30
rahul shukla 560d1fb0bc issue #856 2019-04-22 20:52:36 +05:30
rahul shukla 0239b7ec0b issue #846 2019-04-18 20:22:37 +05:30
rahul shukla 148f942c4a issue #848 2019-04-18 19:15:14 +05:30
prateek srivastava 5b01493d26 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-18 13:04:10 +05:30
prateek srivastava 16b2b2a01f scroller fixed 2019-04-18 12:58:35 +05:30
jitendra 580d3ddf65 Resolve conflict 2019-04-18 12:56:36 +05:30
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
prateek srivastava df8f54597a scroller code removed 2019-04-17 12:30:50 +05:30
prateek srivastava eb5bad16ff removed code for scroller 2019-04-17 12:24:41 +05:30
rahul shukla ad6acfa7e0 issue #824 2019-04-16 20:15:28 +05:30
rahul shukla ae6d498f4c merge with master 2019-04-16 19:22:49 +05:30
prateek srivastava 558b416bb6 Merge branch 'development' of https://github.com/prateek-webkul/bagisto into development 2019-04-16 19:22:03 +05:30
rahul shukla 095c045c58 change table of product datagrid to product_flat 2019-04-16 18:59:29 +05:30
rahul shukla a4bb5a036b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 15:55:42 +05:30
Jitendra Singh 3984d92fad
Merge pull request #828 from prashant-webkul/development
Development
2019-04-16 15:46:32 +05:30
Jitendra Singh a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
Issue #803 fixed
2019-04-16 15:41:39 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
rahul shukla d568ea4bbe merge with master 2019-04-16 15:35:54 +05:30
Prashant Singh 53ebbf5a1e Removed product grid events, product grid table is now obselete and maybe used in future for someother purposes. In result we will have a faster product creation and a new grid will be added with product flat table 2019-04-16 14:47:28 +05:30
Prashant Singh 36f6c425c2 Assets compiled for production 2019-04-15 15:14:32 +05:30
Prashant Singh feaaaa89a5 fixed some style issues 2019-04-14 15:30:43 +05:30
rahul shukla 44c898824e removed duplicate entry in product linking 2019-04-12 18:43:42 +05:30
rahul shukla 2a859b7e23 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-10 15:08:15 +05:30
rahul shukla b99b0ad8b5 product attribute & category menu 2019-04-10 15:08:01 +05:30
prateek srivastava f2def6c4bc scroller issue fixed 2019-04-09 19:28:44 +05:30
rahul shukla b6a1a05e66 added permission of add & delete in acl 2019-04-09 18:52:03 +05:30
naresh verma b0296a02e0 inventory source mail 2019-04-09 17:04:20 +05:30
Prashant Singh 1ca1ae5b61 Changed responses for all backend destroy functions and removed dead commented code 2019-04-09 13:17:19 +05:30
Prashant Singh b3bf66c6e2 Base sync with master 2019-04-09 12:53:31 +05:30
Prashant Singh 75ef9cd530 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 12:50:09 +05:30
Prashant Singh 6c74b2ca42 admin assets compiled for production 2019-04-09 06:33:36 +05:30
Prashant Singh 6a4cb016c4 fixed issue #750 2019-04-09 06:31:52 +05:30
Prashant Singh 2df1a84191 Security fix underway need pull from other branches 2019-04-08 19:46:19 +05:30
rahul shukla efd38ab99e issue #718 2019-04-08 19:33:23 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +05:30
Prashant Singh 747f214739 fix in progress for get routes performing actions more than redirect 2019-04-08 04:51:02 +05:30
Prashant Singh 1e6579bedf in fix 2019-04-05 19:38:44 +05:30
Prashant Singh dadbf2bd6a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 10:47:16 +05:30
rahul shukla 4c2a0a08fc email subscription & newsletter verifiaction 2019-04-04 19:34:01 +05:30
Prashant Singh 5c94a8a21f changed name of folder from 'sass' to 'scss' inside packages Admin, Shop & Ui 2019-04-04 14:50:59 +05:30
prateek srivastava 504a5ec038 issue fixed #791 2019-04-03 18:03:11 +05:30
prateek srivastava 1cb03f9ac3 admin scroller bug fixed 2019-04-03 15:23:12 +05:30