Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge latest version #4

Merged
merged 683 commits into from Aug 9, 2020
Merged

Merge latest version #4

merged 683 commits into from Aug 9, 2020

Conversation

rjcarneiro
Copy link
Owner

No description provided.

exileDev and others added 30 commits April 29, 2020 12:43
@exileDev
#4614 Fixed creating discount requirements with an empty name
0180211
@holydk
Merge pull request #4610 from PRudykIteo/issue-4597-handling-videos
062a2e8 
#4597 handling videos/audios
@DmitriyKulagin
#196 Update some packages to the latest version
f8e9063
@holydk
#4612 Topics search with ignore case
546183b
@holydk
Merge branch 'issue-4612-topics-search-with-ignore-case' into develop
db9b8e4
@AndreiMaz
#4612 Further changes on "topics search with ignore case" (refactoring)
5fa538d
@DmitriyKulagin
Some performance improvements
c720107
@DmitriyKulagin
Merge branch 'Refactoring' into develop
1dc1feb
@skoshelev
#4617 Fixed problem with duplicate inserts based on resource key in t…
fe2266a 
…he ImportResourcesFromXml method
@skoshelev
Performance. Next changes on "Reduced memory using on high load"
6372a3f
@skoshelev
Merge branch 'develop' of https://github.com/nopSolutions/nopCommerce …
de7d83c 
…into develop
#4382 fixed address used for estimate shipping
924190d
@RomanovM
Fix tests
cffb8f3
#4382 cache offered shipping options only for shopping cart
9b8b3e1
#4529 fixed bug when pickup method fee displayed to customer during …
8ca4f22 
…checkout didn't include additional shipping charges
#4531 Added and filled Selected property to ShippingOptionModel
4fbc233
#4531 Pre-select already selected option in Estimate shipping popup
41d5bd9
#4529 further changes in pickup in store fee calculation
80135b5
#4519 fixed condition
73b6a71
#4530 display error messages in Estimate shipping window
9809613
#4576 Display "from 1.99" instead of "1.99" for pickup in store meth…
3616062 
…od in estimate shipping window if we have more that one pickup point
#4531 further changes in pre-selecting already selected option
ee513c9
#4382 use first address from customer's addresses if shipping addres…
fdec0c2 
…s is not selected yet
#4530 further changes in estimate shipping popup
a10c61e
#4530 further changes in estimate shipping error messages displaying
c17aaaf
#4624 moved estimate shipping popup styles to styles.css. Added RTL …
ad7dcf8 
…support
Merge branch 'issue-4382-Shipping-Calculation-Bug' into develop
1512818 
# Conflicts:
#	src/Libraries/Nop.Services/Orders/IOrderTotalCalculationService.cs
#	src/Plugins/Nop.Plugin.Tax.Avalara/Factories/OverriddenShoppingCartModelFactory.cs
#	src/Presentation/Nop.Web/Controllers/ShoppingCartController.cs
#	src/Presentation/Nop.Web/Factories/CheckoutModelFactory.cs
Added source code comments and re-ordered some variables
419b874
@RomanovM
Some minor improvements
dbd89a1
@RomanovM
#405 Move TODO to the work item
b9dddaa
AndreiMaz and others added 28 commits July 13, 2020 19:57
@AndreiMaz
#4929 Google Analytics. Don't send ecommerce data when it's not required
ec872e8
@AndreiMaz
Merge branch '4.30-bug-fixes' into develop
ed9e380
@skoshelev
#4839 Next changes on "Stop using the upgrade.sql"
dfcc6ec
@exileDev
#4793 Added new reserved search engine name for backward compatibilit…
8f9bf67 
…y needs
@exileDev
Merge branch '4.30-bug-fixes' into develop
4980b47
@skoshelev
#4839 Code refactoring on "Stop using the upgrade.sql"
5963421
@skoshelev
#4771Next changes on "Deleted unused locales"
83e8989
@exileDev
#4817 Fixed adding duplicates of related products and cross-sell prod…
a163376 
…ucts (unpublished only)
@exileDev
Merge branch '4.30-bug-fixes' into develop
b528cc6
@skoshelev
#3637 Added possibility to automatically fix plugins warnings (unins…
d25d83f 
…tall)
@skoshelev
Merge branch 'issue-3637-automatically-fix-plugins-warnings' into dev…
8f40031 
…elop
@holydk
Revert "#3792 Added algorithm for balancing a reserved product when c…
a6f315e 
…hoosing delivery from other warehouses"
@holydk
Merge branch '4.30-bug-fixes' into develop
c0e95de
@holydk
#4251 Fix wrong reservation
f569efb
@holydk
Merge branch '4.30-bug-fixes' into develop
cbba5e5
@exileDev
#4866 Fixed getting auto_increment value for MySQL 8.0 and above
d9a1a3c
@exileDev
Merge branch 'mysql-getting-current-table-ident' into 4.30-bug-fixes
d37f9ae
@exileDev
Merge branch '4.30-bug-fixes' into develop
e61e54a
@exileDev
#4872 Added encoding the non-breaking space character into a TinyMCE …
168dd48 
…named entity
@exileDev
Merge branch '4.30-bug-fixes' into develop
ef9f993
@RomanovM
#4870 Fix IPN error in PayPal Standard plugin
ef14689
@RomanovM
Merge bug-fixes
f09ec69
@exileDev
Updated launch settings for using the HTTPS development certificate
bd2117a
@exileDev
Ignore launchSettings.json file
75759f9
@DmitriyKulagin
#4938 Added support for multiple tables on the same page (admin area)
4de4895
@DmitriyKulagin
Merge branch 'issue-4938-multiple-tables' into develop
bb4b687
@RomanovM
#3236 Properly include blog posts and news in the sitemap
4312ca7
@RomanovM
Fix ordering of specification attributes
5e90c01
@rjcarneiro rjcarneiro self-assigned this Aug 9, 2020
@rjcarneiro rjcarneiro merged commit f165417 into rjcarneiro:develop Aug 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rjcarneiro rjcarneiro

Labels
None yet
Projects
None yet
Milestone
No milestone