Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1389 commits
Select commit Hold shift + click to select a range
2ff963a
PayPal Plus: Rendering payment wall
mgesing Apr 16, 2016
67b9f80
PayPal Plus: Integrating third party payment methods
mgesing Apr 18, 2016
006e9c3
Merge branch '2.x' into feature/paypal-plus
mgesing Apr 18, 2016
2384d47
PayPal Plus: Newtonsoft.Json 8.0.3, rest API provider base, checkout …
mgesing Apr 18, 2016
7aeb45e
PayPal Plus: Payment execution
mgesing Apr 19, 2016
e14ae4c
Localization & SEO: language switcher now takes language specific SEO…
muratcakir Apr 19, 2016
1954599
PayPal Plus: Integrating pay upon invoice and manual bank transfer
mgesing Apr 20, 2016
ca6ea80
PayPal Plus: Refunding
mgesing Apr 20, 2016
a8be8ce
PayPal Plus: Rest API has different endpoints for different intents
mgesing Apr 20, 2016
6c3d3cb
PayPal Plus: Void and capturing
mgesing Apr 20, 2016
aaba7de
PayPal Plus: Getting started with webhooks (IPN not supported by rest…
mgesing Apr 21, 2016
2332bc0
PayPal Plus: Webhook implementation
mgesing Apr 22, 2016
6e8982e
PayPal Plus: Setup instruction on configuration page
mgesing Apr 22, 2016
6045fc4
PayPal Plus: Testing... Cancel URL ambiguous. Getting undocumented ps…
mgesing Apr 23, 2016
750eeaf
PayPal Plus: Render full description on top of the payment wall
mgesing Apr 23, 2016
dbdbd4e
PayPal Plus: Payment wall for mobile devices
mgesing Apr 23, 2016
d72cc1b
PayPal Plus: Display payment fee above payment wall
mgesing Apr 25, 2016
2a28010
Merge branch 'feature/paypal-plus' into 2.x
mgesing Apr 25, 2016
ee2dc12
Fixed: Export deployment emails were always send manually
mgesing Apr 25, 2016
b64540f
Spelling correction
mgesing Apr 25, 2016
9cc3066
PayPal Plus: Payment instruction not displayed
mgesing Apr 25, 2016
067d0ea
Fixed exception when downloading mail attachment of a file that does …
mgesing Apr 25, 2016
81eb465
Export email attachments needs to be stored in database because the t…
mgesing Apr 25, 2016
f648a63
Manually notifying gift card recipient threw an exception
mgesing Apr 25, 2016
cdebfbe
Loading shipping by weight grid failed under SQL CE
mgesing Apr 26, 2016
a0ab77b
Sending test email: Localization and output of full error message (po…
mgesing Apr 28, 2016
413b2a8
CSS: reduced throbber title size a bit
muratcakir Apr 28, 2016
9f1aa39
Prevent double init of import mapping select boxes
muratcakir Apr 28, 2016
8ada5fb
Removed old, unused method
mgesing Apr 29, 2016
0808445
Resolves #940 Import mapping: SeName not available in AvailableEntity…
mgesing Apr 29, 2016
df53d68
Resolves #938 Import: Make both fields Skip & Take nullable
mgesing Apr 29, 2016
3c5dd9b
Resolves #937 Impex UI: allow execution of import/export per button i…
mgesing Apr 29, 2016
0da3f51
Validate import skip and take: Should not be less zero
mgesing Apr 29, 2016
d376d7f
Import: explicit NULL fields should be enclosed in brackets
muratcakir Apr 29, 2016
d8655dc
Import: minor code cleanup
muratcakir Apr 29, 2016
79b03ca
Improved column mapping: Explicitly ignored columns are now handled b…
mgesing Apr 30, 2016
088e6d1
Minor change to last commit
mgesing May 1, 2016
87bf9c5
Resolves #945 Import: the DB columns 'Gtin' and 'ManufacturerPartNumb…
mgesing May 2, 2016
bbd55c3
Resolves #946 wrong weight display in shopping cart
Michael-Herzog May 2, 2016
e31d37b
Import mapping UI: don't generate all select elements on page init (p…
mgesing May 2, 2016
1335c6b
Import mapping UI: don't generate all select elements on page init (p…
mgesing May 2, 2016
43c34eb
Minor refactoring in StoreMappingService
muratcakir May 2, 2016
0185679
Import: added HasDataValue() method to ImportRow class
muratcakir May 2, 2016
5798cbb
Import: refactored DataImporter class (use dependency injection for c…
muratcakir May 2, 2016
0ccec12
(Perf) Import > ProductImporter: store mappings are saved in batches
muratcakir May 2, 2016
5f6b954
Import: proper handling of field defaults (only transient entities sh…
muratcakir May 2, 2016
0dedd1e
Import: forgot to remove code comments
muratcakir May 2, 2016
899dbe0
(Perf) Import: do not autocommit during ProcessProductMappings
muratcakir May 2, 2016
393de9e
Import: proper import of store mappings
muratcakir May 2, 2016
05071f4
Import: fixed last commit
muratcakir May 2, 2016
ff39b6f
Import: Further refactoring of ProductImporter
muratcakir May 3, 2016
89ecc6e
Resolves #939 Import mapping UI: don't generate all select elements o…
mgesing May 3, 2016
4db9e2f
Import: minor fixes in ProductImporter
muratcakir May 3, 2016
8121bf4
Import: more refactoring in DataImporter class (use dependency inject…
muratcakir May 3, 2016
71a2b15
Fixes #943 Impex: do not require a value for 'Limit', if 'Skip' has b…
muratcakir May 3, 2016
9233899
Fixed last commit
muratcakir May 3, 2016
9d95ab1
Import: made private methods in ProductImporter protected virtual
muratcakir May 3, 2016
e6da594
Resolves #944 Import > column mapping: disable "Default Value" for un…
mgesing May 3, 2016
f9fced4
Import: EntityDisplayName should not be null
muratcakir May 3, 2016
3b95757
Merge branch '2.x' of https://github.com/smartstoreag/SmartStoreNET i…
muratcakir May 3, 2016
38ab512
Import: refactored CategoryImporter
muratcakir May 3, 2016
a090ec5
Resolves #951 Import Mapping UI: in edit mode, preselect chosen optio…
mgesing May 4, 2016
df79dcc
Resolves #949 Import: ProcessSlugs does not process explicitly specif…
mgesing May 4, 2016
4c1271d
Giving new customer address export more abstract column names
mgesing May 4, 2016
a4b841a
Fixed: Customer import creates customer role duplicates for inserted …
mgesing May 4, 2016
c12395d
Import: added method overloads to test for the existence of any index…
muratcakir May 4, 2016
75444f1
Import: more Importer refactoring
muratcakir May 4, 2016
7b1bb9c
Resolves #953 GMC feed does not generate the sale price if the sale p…
mgesing May 5, 2016
dbd659a
Resolves #952 Import: don't create import profile when uploaded file …
mgesing May 5, 2016
7872474
#875 Implement column mapping support for customer address import (pa…
mgesing May 6, 2016
bbbebf5
Import: removed entity parameter from ImportRow<T>.SetProperty() meth…
muratcakir May 6, 2016
e577924
Some renaming
mgesing May 6, 2016
36a15b0
Import: more refactoring
muratcakir May 6, 2016
f32bd3d
Swap source and mapped name when persisting import column mappings
mgesing May 6, 2016
81da798
Import: minor refactoring in NewsLetterSubscriptionImporter
muratcakir May 6, 2016
9ce9ab6
Import: refactoring in CustomerImporter
muratcakir May 6, 2016
3a809aa
Minor change in SwapColumnMappingValues migration
muratcakir May 6, 2016
6703cd4
AddMapping needs no validation anymore. One source column mapped to m…
mgesing May 7, 2016
6a5f0fe
Changed commit "Minor change in SwapColumnMappingValues migration". I…
mgesing May 7, 2016
de324ff
Resolves #955 Import: CustomerImporter > import avatar in a separate …
mgesing May 7, 2016
ca2b413
Fixed customer address import not functioning. Also resolves #956.
mgesing May 9, 2016
735a2fe
Import: minor refactoring in CustomerImporter
muratcakir May 9, 2016
c11d804
Minor fix for last commit
muratcakir May 9, 2016
f5ae81e
Resolves #947 Import: Explicitly ignoring of properties only works if…
mgesing May 10, 2016
69702e0
Importer: Coding conventions > renamed bool GetDataValue(string, out …
muratcakir May 10, 2016
a4b8d81
Resolves #957 Import: the explicit '[NULL]' column value must also be…
mgesing May 10, 2016
5dbb522
Resolves #913 Use HTML5 Input types (tel, email)
mgesing May 10, 2016
70ae373
Updated changelog
mgesing May 10, 2016
2af497e
Minor refactoring in ImportRow
muratcakir May 10, 2016
8260239
ProcessLocalizations should not check value
muratcakir May 11, 2016
f2aa91f
Made EntityImporterBase generic & added DbContext property to IImport…
muratcakir May 11, 2016
317d990
More refactoring in EntityImporter
muratcakir May 11, 2016
2a4cfc9
Resolves #477 Implement option to specify the number of exported and …
mgesing May 11, 2016
398b773
build.bat: added new lookup folders for vcvarsall.bat
muratcakir May 11, 2016
b9da0cd
Unit testing
mgesing May 11, 2016
917906f
Fixes #961: "Open Redirection Vulnerability"
muratcakir May 11, 2016
e91fa05
Added shortcut extensions methods to ICommonServices for resolution o…
muratcakir May 11, 2016
bb91768
Mobile devices: Fixed "Uncaught Error: Syntax error, unrecognized exp…
mgesing May 11, 2016
78b5cf1
Import refactoring: added DataExchangeSettings to ImportExecuteContext
muratcakir May 11, 2016
581496a
Import refactoring: removed IImportExecuteContext interface (the conc…
muratcakir May 11, 2016
18651fd
Import refactoring: CreateDataSegmenter() > DataSegmenter
muratcakir May 11, 2016
224b3c9
Import: correct import handling of (localized) SeName
muratcakir May 11, 2016
87c7edb
Further changes to fix for "Open Redirection Vulnerability"
muratcakir May 11, 2016
9cf5dea
Minor fix
mgesing May 12, 2016
62dd2ef
DevTools should generate an exception when calling installation page
mgesing May 12, 2016
9b3fdbb
Installation: Fixes "No constructor was found that had all the depend…
mgesing May 12, 2016
788e08d
Minor fix
Michael-Herzog May 12, 2016
6abe5db
Renamed AutoCompleteSearchThumbPictureSize as it was only used for va…
Michael-Herzog May 12, 2016
37d67f7
Refactored last commit
Michael-Herzog May 12, 2016
1f49bc0
Download nor sample download were removable when editing product
mgesing May 12, 2016
52d2416
Copied product must not share sample download of source product. Coul…
mgesing May 12, 2016
e7837c8
Import: ProcessSlugs() does not always fetch SeName from source
muratcakir May 12, 2016
f0b0d80
Importer refactoring: moved ProcessSlugs() and ProcessStoreMappings()…
muratcakir May 12, 2016
1fc4648
Importer refactoring: moved ProcessLocalizations() to base class (DRY)
muratcakir May 12, 2016
f4d6733
Importer: removed generic type parameter from EntityImporterBase
muratcakir May 12, 2016
042592d
Importer: reordered members in some files
muratcakir May 12, 2016
81a440a
Updated changelog
muratcakir May 12, 2016
94038d8
Resolves #963 Import: ColumnMapping > lock SeName default value field
mgesing May 13, 2016
8e207d6
Resolves #921 Specification attribute options with single quotation m…
mgesing May 13, 2016
811246b
Added paging to frontend order list
mgesing May 13, 2016
cd037cd
Export refactoring: removed ExportExecuteContext interface (the concr…
muratcakir May 13, 2016
8b626c4
Fixed a broken unit test
muratcakir May 13, 2016
ca6ea78
Export refactoring: renamed ExportDataStreams to ExportDataUnit
muratcakir May 13, 2016
8186b1e
Export refactoring: renamed ExportExecuteContext.Segmenter to DataSeg…
muratcakir May 13, 2016
97a6f80
Resolves #964 Import: make column mapping UI perfectly fit into 1024p…
mgesing May 14, 2016
66ec39c
Resolves #965: Export abortion by user deletes the current (uncomplet…
mgesing May 15, 2016
d5d1d2a
Localization of task executor exception log message
mgesing May 15, 2016
b73c29e
Export all in preview displayed wrong message
mgesing May 17, 2016
49b01a0
Coding style
muratcakir May 17, 2016
033cd19
Enhanced help link generator method
muratcakir May 17, 2016
969ed98
#964 Import: make column mapping UI perfectly fit into 1024px screen …
mgesing May 18, 2016
0f839d0
Resolves #968 Import: column mapping table > clicking outside mapping…
mgesing May 18, 2016
f4bd48c
Trace logger should not create new files if the original is locked
mgesing May 18, 2016
6b1e5c9
System warnings: Output more information when sitemap is not reachable
mgesing May 19, 2016
a18abd6
Improvements to last commit
mgesing May 19, 2016
a08b83d
Resolves #859 Make checkout attributes suitable for multi-stores
mgesing May 19, 2016
6acca50
Moved some misplaced project files
muratcakir May 18, 2016
a80ca88
Added paging to backend checkout attribute list
mgesing May 19, 2016
b0b0259
Reduced email sender timeout from 100 to 10 sec.
muratcakir May 19, 2016
6efb44c
Changed the folder name of an export profile into a root path
mgesing May 20, 2016
0d4b633
Validate export folder path
mgesing May 20, 2016
eacd9e7
File system publisher: Improved determination of the destination folder
mgesing May 20, 2016
9cea6b5
Added new export deployment type "public folder"
mgesing May 20, 2016
82020c6
Removed confusing export deployment ZIP option. It is now using the p…
mgesing May 20, 2016
836f475
Improved export publisher code
mgesing May 20, 2016
12133ed
Moving deployment publisher into export folder
mgesing May 20, 2016
e9c7baf
Clearing up export folder only when all deployments succeeded
mgesing May 20, 2016
fb9ed21
Display result info about last execution of an export deployment
mgesing May 21, 2016
81b6537
Forgot a method
mgesing May 21, 2016
7666907
Improved export deployment
mgesing May 23, 2016
6c7819d
Looking in subfolders for export files requires files to be filtered …
mgesing May 23, 2016
2cac84b
Made TaskScheduler initialization more fault tolerant
muratcakir May 23, 2016
2221cb1
Improved export file download dialog
mgesing May 24, 2016
3df4795
Updated changelog
mgesing May 24, 2016
3880d01
Updated a string resource
mgesing May 24, 2016
4efec98
Display public zip url in export file dialog
mgesing May 24, 2016
d97073e
Minor change
mgesing May 24, 2016
a5f376c
Export file dialog should only display public file URLs of files crea…
mgesing May 25, 2016
52cdf6e
Export file dialog can display items even if there are no export file…
mgesing May 25, 2016
abcc435
Weight wasn't displayed for bundle items in order summary
Michael-Herzog May 25, 2016
595ef7a
Added file dialog for export deployment
mgesing May 25, 2016
964d2b5
Event log grid: sort by updated date, THEN by created date
muratcakir May 25, 2016
6ff7024
Logging: log exception message before stack trace
muratcakir May 25, 2016
b5bb45d
Added WebHelper.GetPublicIPAddress() helper method
muratcakir May 25, 2016
63e6eaf
Improved export file counting code
mgesing May 26, 2016
4c28efd
Testing export deployment file dialog
mgesing May 26, 2016
40f5f27
A HTTP GET should not change business data
mgesing May 27, 2016
3326cec
An auto inserted public export deployment should not use existing sub…
mgesing May 27, 2016
a947a44
#971 Product is added to cart automatically if it has a non-required …
mgesing May 27, 2016
00eebbe
Localized a hard coded string
mgesing May 27, 2016
b5f967e
Resolves #973 Bundle item upload is nowhere linked
mgesing May 28, 2016
7f72a74
CK HTML editor: Enabled native context menu in source mode
mgesing May 28, 2016
b197f15
Improved TaskScheduler polling
muratcakir May 27, 2016
bf189be
Fixed PAngV calculation ajax call
muratcakir May 30, 2016
e0bdc37
Added helper to create HttpWebRequest instances for safe local calls …
muratcakir May 30, 2016
ae9142a
Strip html out of short description for bundle items
Michael-Herzog May 31, 2016
93958b1
Resolves #977 Show PAngV base/delivery amount also
mgesing May 31, 2016
fa9ed8e
Fixed: Base price in product list ignored PriceDisplayType (catalog s…
mgesing May 31, 2016
c073be3
DRY: use StringExtensions.RemoveHtml()
muratcakir May 31, 2016
45db3df
Base price info template should be localizable. Closes #977.
mgesing May 31, 2016
06ba5bb
Enhanced safe local http call helper
muratcakir May 31, 2016
1bb75a8
TaskScheduler could fail polling when primary store url is an externa…
muratcakir Jun 1, 2016
2eb3c1c
Minor fix in string extension
mgesing Jun 2, 2016
2531037
Private messages: Fixes "No route in the route table matches the supp…
mgesing Jun 3, 2016
e2d903b
Localized some hard coded strings
mgesing Jun 3, 2016
fb2d4cc
DRY Fix: Merged GetOverrideKeys & UpdateSettings with their correspon…
Michael-Herzog Jun 3, 2016
c86f744
Minor improvements
mgesing Jun 6, 2016
fa2388e
Flag to exclude data from XML export
mgesing Jun 6, 2016
9952273
Confirm order: Do not display empty cart or empty order summary toget…
mgesing Jun 7, 2016
21d76ad
Re-post payment should friendly output exceptions
mgesing Jun 7, 2016
9b6b5b3
Obsolete because of client-side validation
Michael-Herzog Jun 7, 2016
e1e35e7
SEO fix: Google doesn't like review pages without reviews
Michael-Herzog Jun 8, 2016
16cc815
Addendum to the last commit
Michael-Herzog Jun 9, 2016
414ecfc
PayPal Plus: minor correction
mgesing Jun 9, 2016
698a89b
Minor change
mgesing Jun 10, 2016
fe245b3
Updated changelog
mgesing Jun 11, 2016
2768f18
Updated changelog
mgesing Jun 13, 2016
3e7abd6
Export mail notification: Download link not working if SSL is enabled
mgesing Jun 13, 2016
7a06b15
Export: _IsChild indicates that current row is a child row (e.g. an a…
mgesing Jun 15, 2016
373c19d
Product details: Select attribute and gift card values by query strin…
mgesing Jun 16, 2016
9b922b5
Display friendly error message if the rendering of an export provider…
mgesing Jun 16, 2016
965ac71
Smarter import of plugin resource files (de-DE > de > de-* > en-US > …
muratcakir Jun 17, 2016
f4f0da6
Updated changelog
muratcakir Jun 17, 2016
c6baefa
(Perf) Faster language resource file import
muratcakir Jun 17, 2016
1a810e2
Minor enhancements in data layer
muratcakir Jun 17, 2016
9069036
Reviewed "Product details: Select attribute and gift card values by q…
mgesing Jun 18, 2016
3b10ce6
Updated licensing component
mgesing Jun 18, 2016
4571fd8
Revert "Minor enhancements in data layer"
muratcakir Jun 18, 2016
7158f24
Export: Some improvements
mgesing Jun 20, 2016
59186e1
Update README.md
Michael-Herzog Jun 21, 2016
d604fd1
Duplicate entry in changelog
mgesing Jun 21, 2016
30713d2
Enabled import context to accept strings as progress messages
Michael-Herzog Jun 21, 2016
e10d4f8
Removed promotion feeds node from admin menu
Michael-Herzog Jun 21, 2016
3b58ca0
Cart and mini cart should not have different item order
mgesing Jun 21, 2016
ee9a7c0
Minor perf improvement
mgesing Jun 21, 2016
2a8f648
Discount rule has spent amount including sub total option can cause w…
mgesing Jun 22, 2016
c375315
CronExpression.GetFriendlyDescription() should not throw exception wh…
muratcakir Jun 22, 2016
ecc787a
Updated changelog
muratcakir Jun 22, 2016
c2ef041
Updated ua-parser-regexes.yaml
muratcakir Jun 22, 2016
97918a5
Resolves #986 File uploads possible through /content/filemanager/inde…
mgesing Jun 22, 2016
8e1c3f4
Delete old static files of file manager by migration
mgesing Jun 23, 2016
e79c397
Resolves #950 make contact form comply with current German law
Michael-Herzog Jun 23, 2016
da1e3d1
Increased version number to 2.6.0
Michael-Herzog Jun 23, 2016
f15dcc2
PayPal PLUS throws an exception if an initially empty configuration p…
mgesing Jun 30, 2016
ab3c8b1
Export all product categories rather than all of current store (cause…
mgesing Jul 4, 2016
dfb6e11
SKU, EAN, MPN of last attribute combination was exported for all comb…
mgesing Jul 4, 2016
07a38ef
GMC: Id should be unique when exporting attribute combinations as pro…
mgesing Jul 4, 2016
7526f3f
GMC: No special price exported when the special price period was not …
mgesing Jul 4, 2016
1a6ff6f
GMC: Attribute price adjustments were ignored when exporting attribut…
mgesing Jul 7, 2016
783bf87
GMC: Associated products that are not individually visible are not ex…
mgesing Jul 11, 2016
d9455aa
Fixes "Cannot insert the value NULL into column 'IsPublic', table 'db…
mgesing Jul 11, 2016
e6ef17b
Export: Projected customer id was ignored in price calculation
mgesing Jul 13, 2016
e654f15
Revert "Export: Projected customer id was ignored in price calculation"
mgesing Jul 13, 2016
53d6141
Awarded reward points should be rounded towards zero rather than to n…
mgesing Aug 12, 2016
972e217
Added PayPal partner attribution Id as request header
mgesing Aug 17, 2016
6cf721e
PayPal PLUS: Integration review through PayPal
mgesing Sep 1, 2016
a3d5797
PayPal PLUS: Integration review through PayPal (part 2)
mgesing Sep 3, 2016
c798768
PayPal PLUS: Generic attribute caching problem. Fixes "Item amount mu…
mgesing Sep 6, 2016
b3a4be2
Resolves #1030 Order export: does not export the data of the attribut…
mgesing Sep 28, 2016
4f42740
Order export does not export shipping address
mgesing Oct 4, 2016
71e7bd5
Filter shows wrong number of products if "Include products from subca…
mgesing Oct 6, 2016
77092c4
PayPal PLUS: Excluding tax issue. Fixes "Transaction amount details (…
mgesing Oct 20, 2016
36a2384
PayPal PLUS: Still faced with rounding issues
mgesing Dec 19, 2016
a91cadc
PayPal PLUS: Fixes "Cannot perform runtime binding on a null referenc…
mgesing Jan 25, 2017
f2b938b
More reliable recognition of anonymous visitors (bad bots, cookie-rej…
muratcakir Feb 28, 2017
351eda2
Caching fix for last commit (duplicate guest customer roles)
muratcakir Mar 6, 2017
ff21b94
Fixes compilation error
mgesing Mar 24, 2017
bf85a07
PayPal Express: Fixes net price issue
mgesing Apr 28, 2017
b78a251
PayPal PLUS: /v1/payments/payment/<id>/payment-instruction not workin…
mgesing May 2, 2017
e76cce4
Facebook login out of function due to Facebook API changes (always re…
mgesing Aug 14, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
160 changes: 131 additions & 29 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@ local.properties
# PDT-specific
.buildpath

###########
## Symlinks
###########

*-sym.*
*-symdir/
[Ee]xternal[Ff]iles/
/src/Plugins/*-sym
/src/Presentation/SmartStore.Web/Themes/*-sym

###########################################################
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
Expand All @@ -43,23 +33,48 @@ local.properties
# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# Build results
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
# build/
x86/
bld/
[Bb]in/
[Oo]bj/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
Expand All @@ -79,6 +94,7 @@ x64/
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Visual C++ cache files
Expand All @@ -93,6 +109,7 @@ ipch/
*.psess
*.vsp
*.vspx
*.sap

# Guidance Automation Toolkit
*.gpState
Expand All @@ -108,8 +125,16 @@ _TeamCity*
*.dotCover

# NCrunch
*.ncrunch*
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/
Expand All @@ -128,31 +153,58 @@ DocProject/Help/html
publish/

# Publish Web Output
*.Publish.xml
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
/src/packages
*.publishproj

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Windows Azure Build Output
csx
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Microsoft Azure ApplicationInsights config file
ApplicationInsights.config

# Windows Store app package directory
AppPackages/
BundleArtifacts/

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
# sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# RIA/Silverlight projects
Generated_Code/
Expand All @@ -165,12 +217,42 @@ UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

###################
## Windows detritus
###################
# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe

# FAKE - F# Make
.fake/

# Windows image file caches
Thumbs.db
Expand All @@ -185,6 +267,21 @@ $RECYCLE.BIN/
# Mac crap
.DS_Store


###########
## Symlinks
###########

*-sym.*
*-symdir/
[Ee]xternal[Ff]iles/
/src/Plugins/*-sym
/src/Presentation/SmartStore.Web/Themes/*-sym


###########
## Specific
###########
# Backups
[Bb]ackup/
[Bb]ackups/
Expand All @@ -194,22 +291,27 @@ _[Bb]ackups/
*.orig
Kopie von*

###########
## Specific
###########
/build
/src/Presentation/SmartStore.Web/Plugins
/src/Presentation/SmartStore.Web/App_Data/_temp/
/src/Presentation/SmartStore.Web/App_Data/ExportProfiles/
/src/Presentation/SmartStore.Web/App_Data/ImportProfiles/
/src/Presentation/SmartStore.Web/App_Data/Settings.txt
/src/Presentation/SmartStore.Web/App_Data/InstalledPlugins.txt
/src/Presentation/SmartStore.Web/App_Data/Licensing.key
/src/Presentation/SmartStore.Web/App_Data/Licenses.lic
/src/Presentation/SmartStore.Web/Media

# Import/Export
/src/Presentation/SmartStore.Web/Content/files/[Ee]xport[Ii]mport/*.*
/src/Presentation/SmartStore.Web/[Ee]xchange/*

# Media
/src/Presentation/SmartStore.Web/Media/[Tt]humbs
/src/Presentation/SmartStore.Web/Media/[Uu]ploaded

# Tools
/src/Tools/SmartStore.WebApi.Client/packages
/src/Tools/SmartStore.WebApi.Client/SmartStore.WebApi.Client.sln

src/SmartStoreNET.Packager.sln
Log.txt
12 changes: 3 additions & 9 deletions CREDITS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ copyright notices, and licenses.

51Degrees
---------------------------------------------
WebSite: http://http://51degrees.mobi/
WebSite: http://51degrees.mobi/
Copyright: Copyright 2010 - 2013 51Degrees.mobi Limited
License: Mozilla Public License 2.0 (MPL-2.0)

Expand Down Expand Up @@ -44,7 +44,7 @@ License: MIT

AutoMapper
---------------------------------------------
WebSite: http://http://www.automapper.org
WebSite: http://www.automapper.org
Copyright: Copyright � 2008-2013 Jimmy Bogard and other contributors
License: MIT

Expand All @@ -58,7 +58,7 @@ License: Apache License 2.0 (Apache)

DotNetOpenAuth
---------------------------------------------
Website: http://http://dotnetopenauth.net/
Website: http://dotnetopenauth.net/
Copyright: Copyright (c) 2011, Outercurve Foundation
License: MS-PL

Expand Down Expand Up @@ -145,12 +145,6 @@ Copyright: Copyright (c) 2007 James Newton-King
License: MIT


LESS CSS for .NET
---------------------------------------------
Website: http://www.dotlesscss.org/
License: Apache License v2.0


GeoLite Free by MaxMind
---------------------------------------------
Website: http://www.maxmind.com
Expand Down
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ SmartStore.NET is a free, open source, full-featured e-commerce solution for com

**SmartStore.NET includes all essential features to create multilingual and multi-currency stores** targeting desktop or mobile devices and enabling SEO optimized rich product catalogs with support for an unlimited number of products and categories, variants, bundles, datasheets, ESD, discounts, coupons and many more.

A comprehensive set of tools for CRM & CMS, sales, marketing, payment & shipping handling among others makes SmartStore.NET a powerful all-in-one solution fulfilling all your needs... totally FREE!
A comprehensive set of tools for CRM & CMS, sales, marketing, payment & shipping handling, etc. makes SmartStore.NET a powerful all-in-one solution fulfilling all your needs... totally FREE!

**SmartStore.NET delivers a beautiful and configurable shop frontend out-of-the-box** built with a design approach on the highest level, including components like `Twitter Bootstrap`, `Less CSS` and others. The innovative ShopBar, a powerful layered navigation, reviews & ratings, an optimized checkout process... they all provide a perfect shopping experience to your buyers.
**SmartStore.NET delivers a beautiful and configurable shop front-end out-of-the-box**, built with a design approach on the highest level, including components like `Twitter Bootstrap`, `Less CSS` and others. The innovative ShopBar, a powerful layered navigation, reviews & ratings, an optimized checkout process... they all provide a perfect shopping experience for your buyers.

The state-of-the-art architecture of SmartStore.NET - with `ASP.NET 4.5` + `MVC 5`, `Entity Framework 6` and Domain Driven Design approach - makes it easy to extend, extremely flexible and essentially fun to work with ;-)

* **Website:** [http://www.smartstore.com/net](http://www.smartstore.com/net)
* **Website:** [http://www.smartstore.com/en/net](http://www.smartstore.com/en/net)
* **Forum:** [http://community.smartstore.com](http://community.smartstore.com)
* **Marketplace:** [http://community.smartstore.com/marketplace](http://community.smartstore.com/marketplace)

* **Documentation:** [SmartStore.NET Documentation in English](http://docs.smartstore.com/display/SMNET/SmartStore.NET+Documentation+Home)

## Highlights

Expand All @@ -26,7 +26,7 @@ The state-of-the-art architecture of SmartStore.NET - with `ASP.NET 4.5` + `MVC
* State of the art architecture thanks to `ASP.NET 4.5`, `ASP.NET MVC 5`, `Entity Framework 6` and Domain Driven Design
* Easy to extend and extremely flexible thanks to modular design
* (NEW) A powerful theming engine lets you create themes & skins with minimum effort thanks to theme inheritance
* Consistent and sophisticated use of modern components such as `jQuery`, `Twitter Bootstrap`, `LESS` & more in the frontend and backend.
* Consistent and sophisticated use of modern components such as `jQuery`, `Twitter Bootstrap`, `LESS` & more in the front and back end.
* Easy shop management thanks to modern and clean UI
* Out of the box shop design on the highest level
* Revolutionary Shopbar for the best shopping experience
Expand Down Expand Up @@ -54,18 +54,18 @@ The state-of-the-art architecture of SmartStore.NET - with `ASP.NET 4.5` + `MVC
* and many more...

## Project Status
SmartStore.NET V2.1 has been released on November 24. 2014. The highlights are:

* Drastically **simplified plugin development, debugging & deployment**
* **Theme inheritance**: create derived child themes with minimum effort by overriding only small parts (static files and even variables)
* New backend design and cleaner frontend theme
* More comfortable catalog management & product editing
* New payment plugins `Pay with Amazon` & `Accarda-Kar`
* **Preview Mode**: virtually test themes and shops more easily
* **Simplified checkout** process
* **New Image Gallery** component in public product details page
* Support for **hierarchical SEO slugs**, e.g.: samsung/galaxy/s5/16gb/white
* Support for new EU VAT regulation for digital goods (2008/8/EG directive)
SmartStore.NET V2.5.0 has been released on March 03, 2016. The highlights are:

* New import/export framework (profiles, filters, mapping, projections, scheduling, deployment... just everything!)
* TaskScheduler: Rewritten from scratch to be suitable for Web Farms (including support for cron expressions)
* Payment and shipping methods by customer roles
* Restrict payment methods to countries
* Restrict payment methods to shipping methods
* Email attachment support for message templates
* Attach order invoice PDF automatically to order notification emails
* Overall performance increase
* Lots of bug fixes



##Try it online
Expand Down
4 changes: 2 additions & 2 deletions SmartStoreNET.Tasks.Targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

<!-- General -->
<UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v12.0\Web\Microsoft.Web.Publishing.Tasks.dll"/>
<UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll"/>

<!-- Initialization -->

Expand Down Expand Up @@ -44,7 +44,7 @@
<BuildPlatform Condition="$(BuildPlatform) == ''">x86</BuildPlatform>

<xVersion>$(BUILD_NUMBER)</xVersion>
<Version>2.1.1</Version>
<Version>2.6.0</Version>
<ZipDirectory>$(StageFolder)</ZipDirectory>
<ZipVersionFileSuffix Condition="$(Version) != ''">.$(Version)</ZipVersionFileSuffix>
<ZipVersionFileSuffix Condition="$(Version) == ''"></ZipVersionFileSuffix>
Expand Down
Loading