merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,465 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

5465 Commits

Author SHA1 Message Date
Jitendra Singh 25f929eef1
Merge pull request #3194 from jitendra-webkul/1.0 
Migrate to laravel 7
 2020-06-09 12:56:18 +05:30
Pranshu Tomar 5b398574ae Migrate to laravel 7 2020-06-09 12:54:46 +05:30
Jitendra Singh 39a849d319
Merge pull request #3188 from thyseus/patch-1 
Remove redundant filter in cart rule index page
 2020-06-09 12:04:11 +05:30
Jitendra Singh d60af666ac
Merge pull request #3189 from shubhwebkul/master 
Issue #3172 resolved
 2020-06-09 12:03:46 +05:30
Shubham Mehrotra bfd36ab55f Merge branch 'master' of https://github.com/bagisto/bagisto 2020-06-08 21:38:20 +05:30
Shubham Mehrotra ed59f3ae9d #3172 2020-06-08 21:37:59 +05:30
Herbert Maschke 5c2db445b8
Remove redundant filter in cart rule index page 2020-06-08 13:00:53 +02:00
Jitendra Singh bfeff060c2
Merge pull request #3187 from jitendra-webkul/1.0 
Issue #3160 fixed
 2020-06-08 16:12:35 +05:30
Pranshu Tomar d2ff59cc15 Issue #3160 fixed 2020-06-08 16:10:53 +05:30
Jitendra Singh 473acae380
Merge pull request #3124 from Haendlerbund/cronjob-deactivating-booking-events 
Automatically deactivate expired event products
 2020-06-08 12:11:37 +05:30
Jitendra Singh e55f235814
Merge pull request #3181 from shubhwebkul/master 
minified file jquery-ez-plus.js for velocity
 2020-06-08 10:54:37 +05:30
Shubham Mehrotra 161fb5853c Merge branch 'master' of https://github.com/bagisto/bagisto 2020-06-05 19:40:16 +05:30
Shubham Mehrotra bd8315dafb minified jquery-ez-plus file 2020-06-05 19:39:48 +05:30
Jitendra Singh ee708f9df4
Merge pull request #3180 from jitendra-webkul/1.0 
Issue #3070 fixed
 2020-06-05 18:43:37 +05:30
Pranshu Tomar 31b9ae7e3e Issue #3070 fixed 2020-06-05 18:41:38 +05:30
Jitendra Singh 7621cad185
Merge pull request #3178 from jitendra-webkul/1.0 
Issue #3171 fixed
 2020-06-05 16:24:13 +05:30
Pranshu Tomar 502beab0dd Issue #3171 fixed 2020-06-05 16:23:09 +05:30
Jitendra Singh c64c282b50
Merge pull request #3177 from jitendra-webkul/1.0 
Fixed typo in customer group price migration
 2020-06-05 16:18:29 +05:30
Pranshu Tomar d5a803cf14 Fixed typo in customer group price migration 2020-06-05 16:17:53 +05:30
Jitendra Singh 8cb442ae45
Merge pull request #3176 from phillipcodes/patch-4 
fix typo
 2020-06-05 15:43:51 +05:30
phillipcodes 8867eccd90
fix typo 2020-06-05 11:59:52 +02:00
Jitendra Singh c5dd54ff68
Merge pull request #3175 from Haendlerbund/fix-search-when-missing-term 
bugfix: add default value for search term
 2020-06-05 12:18:48 +05:30
Florian Bosdorff 351c38c9e8 add default value for search term 2020-06-05 08:08:31 +02:00
Jitendra Singh 8a529ce0a8
Merge pull request #3166 from Haendlerbund/copy-cart-rules 
make a prefix to the copied cart rule ('copy of XXX')
 2020-06-05 11:34:06 +05:30
Florian Bosdorff baa9e3f571 fix tiny issues due to code guidelines 2020-06-05 07:54:47 +02:00
Jitendra Singh 1b60f1b072
Merge pull request #3142 from MattApril/typo 
Fixed case sensitivity typo in Bundle class
 2020-06-04 19:59:12 +05:30
Jitendra Singh 0fd5e76e33
Merge pull request #3149 from bhumikaisarani/master 
Update 503.blade.php
 2020-06-04 19:56:05 +05:30
Florian Bosdorff 9219c283fb Merge branch 'bagisto/master' into haendlerbund/copy-cart-rules 2020-06-04 13:05:55 +02:00
Jitendra Singh 303b8765c2
Merge pull request #3173 from ilyasokay/language-development 
Added Turkish Translation
 2020-06-04 12:22:58 +05:30
Jitendra Singh e1332241b6
Merge pull request #3174 from jitendra-webkul/1.0 
Issue #3113 fixed
 2020-06-04 12:11:58 +05:30
Pranshu Tomar fb74d35ad5 Issue #3113 fixed 2020-06-04 12:11:06 +05:30
İlyas Okay bc5a906a00 Turkish Language added and English language duplicate rows deleted. 2020-06-03 18:22:47 +03:00
İlyas Okay ad9c85a0f5 Turkish Language added and English language duplicate rows deleted. 2020-06-03 18:11:28 +03:00
Jitendra Singh d75059254b
Merge pull request #3134 from Haendlerbund/cart-rule-validator-extension 
Cart rule validator extension
 2020-06-03 19:39:04 +05:30
Jitendra Singh 1e81e4b97d
Merge pull request #3165 from shubhwebkul/master 
check if product_id exists
 2020-06-03 19:31:28 +05:30
Jitendra Singh 9294eb81b3
Merge pull request #3167 from Haendlerbund/extend-editor-functionality 
Extend CMS editor functionality
 2020-06-03 19:29:30 +05:30
İlyas Okay 77e0610c89 Turkish Language added and English language duplicate rows deleted. 2020-06-03 16:22:23 +03:00
Jitendra Singh b209aac3e7
Merge pull request #3168 from jitendra-webkul/1.0 
Issue #3164 fixed
 2020-06-03 13:25:39 +05:30
Pranshu Tomar 0de17f4711 Issue #3164 fixed 2020-06-03 13:25:02 +05:30
phillipmohr 9fbd436892 add table, lists, link and hr functionality to editor 2020-06-03 09:44:19 +02:00
Herbert Maschke 6ee005dda0 make a prefix to the copied cart rule ('copy of XXX') and properly save related channels and customer groups after replication 2020-06-03 09:24:40 +02:00
Shubham Mehrotra c8e987f1e9 check if product_id exists 2020-06-03 12:14:24 +05:30
Annika Wolff 51851a077a fix compatibility issue to AbstractType 2020-06-03 07:37:26 +02:00
Annika Wolff 4104a7b2ba Merge bagisto/master into cart-rule-validator-extension 2020-06-03 07:36:43 +02:00
Annika Wolff b8a6619c81 Merge 'cart-rule-validator-extension' of bagisto into cart-rule-validator-extension 2020-06-03 07:16:39 +02:00
Annika Wolff ca6933d3a8 add english translation to foreign languages 2020-06-03 07:15:56 +02:00
Annika Wolff f99ecf6086
Refactor some changes 
Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>
 2020-06-03 07:12:22 +02:00
Jitendra Singh bac17a08fb
Merge pull request #3163 from jitendra-webkul/1.0 
Fixed bundle type class compatablity issue
 2020-06-02 18:53:54 +05:30
Pranshu Tomar 8e64676197 Fixed bundle type class compatablity issue 2020-06-02 18:49:20 +05:30
Jitendra Singh 0b4b09b670
Merge pull request #3162 from bagisto/1.0 
Added customer group price
 2020-06-02 18:14:42 +05:30