Commit Graph

124 Commits

Author SHA1 Message Date
prashant-webkul 0faf88a797 Issue fixed #329, admin changing their details with entering the current password 2018-12-19 13:36:33 +05:30
prashant-webkul 3c8807e7e9 merge conflicts removed 2018-12-18 18:17:01 +05:30
rahul shukla 9cdc16a50b conflict resolve 2018-12-18 13:39:15 +05:30
prashant-webkul c4416bc228 Removed conflicts from the merge with the master 2018-12-18 11:09:54 +05:30
rahul shukla b298a3973a validation in shipping & payment methods and issue #308 & #295 2018-12-14 15:26:01 +05:30
jitendra 2decdeb194 Removed event from menu, acl, config creation 2018-12-14 13:56:05 +05:30
rahul shukla 8cd04be89c shipping & payment methods 2018-12-14 11:56:52 +05:30
prashant-webkul d9f0ddc89d Fixed issues 314 and 315 2018-12-13 18:51:54 +05:30
jitendra 0bdd9e1a2a Refactor Menu system and core config data system 2018-12-13 16:28:28 +05:30
jitendra 7f65c3327a Modify menu system and added decimal validator 2018-12-12 15:09:20 +05:30
prashant-webkul 1e05840c7d Regular merge with master 2018-12-07 15:44:03 +05:30
prashant-webkul 45903d3c0a Mass selection features refactored with a new type of configuration with dynamic routes and implemented mass selection features in reviews, products, currencies and attributes 2018-12-07 14:45:31 +05:30
jitendra 9d41172512 Refactor core config system 2018-12-07 12:38:29 +05:30
rahul shukla b78cc23797 shipping methods #204 popup confirmation for address delete #228 bagisto icon clickable #183 currency rate display & #128 calender clickable 2018-12-07 10:55:33 +05:30
prashant-webkul 48bece3531 datagrid routes are dynamic for all the action types and mass actions also only two type of mass actions are used as of now single button type and select box type for updating boolean columns or may be incement or decrement in the numeric type columns, while there had a new icon for the orders, invoices and shipments datagrid and minor style bug fix on sales index screens, confirm text is not mandatory when clicking on actions now it can be disabled by commenting on the confirm_text in datagrid configurations, mass actions are also route dependent and can be enabled or disabled on specific grids also. 2018-12-03 13:41:35 +05:30
prashant-webkul 7fb67dc161 mass operations and datagrid operations normalization 2018-11-30 20:37:41 +05:30
prashant-webkul 5f81a79796 Subscription newsletter migration restored and subsctiption newsletter datagrid in admin 2018-11-29 18:05:56 +05:30
prashant-webkul 311701b00a tax category sync fix and select rates fixed 2018-11-28 14:05:44 +05:30
jitendra fafbcb432b Issues #175, #176 fixed and added bootstrap.js in main js file 2018-11-28 10:56:54 +05:30
prashant-webkul bf63545895 Bug fix for slider content field, changed to text and datagrid invoices and shipments columns added a/c to relevancy and removed mass actions 2018-11-27 18:56:25 +05:30
jitendra fb0079bf42 Fixed validation error messages 2018-11-27 10:16:35 +05:30
prashant-webkul 1c27444705 merged 2018-11-21 12:04:54 +05:30
prashant-webkul 8c12e35621 Cart Refactored, Email Subscription, UI Bug Fix, Wishlist Order & Invoices Datagrid 2018-11-16 17:21:10 +05:30
jitendra c845fdddb8 Issues fixed 2018-11-13 15:43:09 +05:30
prashant-webkul 3a801a5d72 Pre Loaded 2018-11-05 10:25:05 +05:30
jitendra b4e79a87ca Editor added to the product edit page, slider form page and channel create and edit form 2018-10-30 16:54:24 +05:30
prashant-webkul 1cd59b4b86 Webkul copyright text, Search now working on product names only with a dedicated page for displaying results 2018-10-29 14:51:59 +05:30
prashant-webkul e2c036ced0 Search and Bug fixes 2018-10-29 11:39:09 +05:30
prashant-webkul 2514d748b5 Slider Content Bug Fixed 2018-10-28 18:53:20 +05:30
prashant-webkul 7a157ee17d Slider Backend Fixed 2018-10-28 16:30:15 +05:30
jitendra 9c8c9c2a97 Now compiled asset will store in publishable folder 2018-10-26 12:52:43 +05:30
rahul shukla 007f945b05 conflict resolve 2018-10-26 09:59:33 +05:30
jitendra 7c63dac032 Fixed remaining issues 2018-10-26 09:50:43 +05:30
rahul shukla 781b960fa8 reviews issue 2018-10-25 21:45:28 +05:30
jitendra 930cba9436 Issues fixed 2018-10-25 13:16:45 +05:30
jitendra 0f6bcfde49 Seeders added 2018-10-25 11:01:47 +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
jitendra 13ae5d58c0 Dashboard completed 2018-10-23 17:15:44 +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 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
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 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