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.

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

Error CS1003 Syntax error, ',' expected \SmartStoreNET.Community.3.1.5\Views\Shared\EditorTemplates\ButtonType.cshtml #1482 #1483

Open
wants to merge 74 commits into
base: 3.x
Choose a base branch
from

Commits on Mar 4, 2016

  1. Merge branch '2.5.x'

    Michael-Herzog committed Mar 4, 2016
    Configuration menu
    Copy the full SHA
    e6d084a View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2016

  1. Configuration menu
    Copy the full SHA
    c26a9ce View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2016

  1. Fix 'occurred' typo

    Fix 'occurred' typo
    coliff committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    d609477 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #907 from coliff/patch-1

    Fix 'occurred' typo
    muratcakir committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    d079cf1 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2016

  1. Merge branch '2.x'

    Michael-Herzog committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    e15dafa View commit details
    Browse the repository at this point in the history

Commits on May 15, 2017

  1. Merge branch '3.x'

    Michael-Herzog committed May 15, 2017
    Configuration menu
    Copy the full SHA
    10e04a8 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2017

  1. Merge branch '3.x'

    Michael-Herzog committed Jun 22, 2017
    Configuration menu
    Copy the full SHA
    4694055 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2017

  1. Configuration menu
    Copy the full SHA
    6b2501e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2017

  1. Configuration menu
    Copy the full SHA
    0d3ebde View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2017

  1. Merge branch '3.x'

    Michael-Herzog committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    163edec View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2017

  1. Configuration menu
    Copy the full SHA
    eb9c56a View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2017

  1. Merge branch '3.x'

    Michael-Herzog committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    8e2d99f View commit details
    Browse the repository at this point in the history
  2. Merge branch '3.x'

    muratcakir committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    22d50f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2017

  1. Configuration menu
    Copy the full SHA
    6e39498 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9b7bbdd View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2017

  1. Configuration menu
    Copy the full SHA
    4e3e3d9 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2017

  1. Configuration menu
    Copy the full SHA
    f2a5beb View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2018

  1. Merge branch '3.x'

    # Conflicts:
    #	src/Presentation/SmartStore.Web/Content/editors/ckeditor/skins/smartstore/editor.css
    #	src/Presentation/SmartStore.Web/Controllers/CatalogHelper.MapProduct.cs
    Michael-Herzog committed Apr 20, 2018
    Configuration menu
    Copy the full SHA
    b3dd5af View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2018

  1. Fixes System.ArgumentException: Expression 'x => x.AccessKey.TrimSafe…

    …()' refers to a method, not a property.
    
    Fixes AmazonPay access data must be saved as multi-store settings
    mgesing committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    7bbc82e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9d93000 View commit details
    Browse the repository at this point in the history
  3. In the context of message templates the BuildUrl method should be use…

    …d instead of WebHelper.GetAbsoluteUrl
    Michael-Herzog committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    00ba240 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2018

  1. Configuration menu
    Copy the full SHA
    c52ac95 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a4578cd View commit details
    Browse the repository at this point in the history
  3. Messaging: OrderPlaced e-mail templates show main product image even …

    …when an attribute combination with a custom image has been selected
    muratcakir authored and Michael-Herzog committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    81bd1e0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    93d7994 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9aa97bc View commit details
    Browse the repository at this point in the history
  6. Fixes no bundle item thumbnail displayed in bundle summary if item is…

    … not individually visible
    mgesing committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    e19d3b1 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2018

  1. Configuration menu
    Copy the full SHA
    4d64942 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2018

  1. Configuration menu
    Copy the full SHA
    8cf0128 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2018

  1. Resolved SSL/TLS issues

    muratcakir authored and Michael-Herzog committed May 7, 2018
    Configuration menu
    Copy the full SHA
    687d327 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2018

  1. Resolves #1442 Message factory should not throw an exception if a tem…

    …plate has been deactivated
    mgesing committed May 9, 2018
    Configuration menu
    Copy the full SHA
    66499a2 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2018

  1. Configuration menu
    Copy the full SHA
    17d5ecf View commit details
    Browse the repository at this point in the history
  2. Web API: Fixes "No NavigationLink factory was found for the navigatio…

    …n property 'WalletHistory'"
    mgesing committed May 16, 2018
    Configuration menu
    Copy the full SHA
    f8e4c53 View commit details
    Browse the repository at this point in the history
  3. Resolves #1449 IgnoreCharges of shipping methods is not working if a …

    …localized name is specified
    mgesing committed May 16, 2018
    Configuration menu
    Copy the full SHA
    a9e8807 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2018

  1. Resolves #1443, #1448. Fixes "The object does not support the propert…

    …y or method 'startsWith'".
    mgesing committed May 17, 2018
    Configuration menu
    Copy the full SHA
    52fd72b View commit details
    Browse the repository at this point in the history

Commits on May 25, 2018

  1. Merge branch '3.x'

    Michael-Herzog committed May 25, 2018
    Configuration menu
    Copy the full SHA
    1e8def9 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into 3.1.x

    # Conflicts:
    #	src/Presentation/SmartStore.Web.Framework/UI/Captcha/CaptchaValidatorAttribute.cs
    #	src/Presentation/SmartStore.Web/Scripts/smartstore.selectwrapper.js
    Michael-Herzog committed May 25, 2018
    Configuration menu
    Copy the full SHA
    0227d72 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2018

  1. GMC: Fixes export the product images if no attribute images are defined.

    Fixes do not export the first image twice for additional images.
    Export image URL of full size image instead of default size image.
    mgesing committed May 28, 2018
    Configuration menu
    Copy the full SHA
    1735e48 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. In a multi-store environment, multiple topics with the same system na…

    …me cannot be resolved reliably
    muratcakir authored and Michael-Herzog committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    77d724f View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2018

  1. Fixes "ArgumentNullException: The value must not be NULL if a topic i…

    …s password protected
    mgesing authored and Michael-Herzog committed Jun 3, 2018
    Configuration menu
    Copy the full SHA
    af16f24 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. Configuration menu
    Copy the full SHA
    81cf844 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. Configuration menu
    Copy the full SHA
    e26fe3c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    49289b8 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. Reverts b08ed02 "Fixes the delivery time in the order notifications m…

    …ay differ from delivery time on the product detail page"
    mgesing committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    fdb5572 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. Minor optimization

    Michael-Herzog committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    9f9067a View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2018

  1. Addendum: In a multi-store environment, multiple topics with the same…

    … system name cannot be resolved reliably
    Michael-Herzog committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    465b09e View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. Fix #1464: MessageModelProvider creates incorrect URLs with duplicate…

    … virtual directory names
    muratcakir authored and Michael-Herzog committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    c86eb7d View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2018

  1. Configuration menu
    Copy the full SHA
    e0c842f View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. Configuration menu
    Copy the full SHA
    a0e9408 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2018

  1. Configuration menu
    Copy the full SHA
    8c88367 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2018

  1. Configuration menu
    Copy the full SHA
    04e778e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7e1bba3 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2018

  1. * Added cache stats to Admin > System Info

    * Removed StoreMapping entity from EfCache policy (way too many single entries)
    muratcakir committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    c001db0 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2018

  1. Configuration menu
    Copy the full SHA
    e38ef05 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7f498ca View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2018

  1. Configuration menu
    Copy the full SHA
    eab86cb View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2018

  1. Configuration menu
    Copy the full SHA
    3e97b0e View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2018

  1. Fixes switching the language always redirected to the home page if SE…

    …O friendly URLs was deactivated
    mgesing authored and Michael-Herzog committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    4ea5350 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    85dea0d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    79fb620 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. Configuration menu
    Copy the full SHA
    ec604cf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2405575 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2018

  1. Configuration menu
    Copy the full SHA
    76b44d1 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2018

  1. Configuration menu
    Copy the full SHA
    b4efc47 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2018

  1. Fixes cookie consent issue

    mgesing committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    3ea6b83 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2018

  1. Fixes in a multi-store, message templates may have loaded the wrong d…

    …isclaimer and conditions-of-use text
    mgesing committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    0fe130d View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2018

  1. Configuration menu
    Copy the full SHA
    f04e4f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2018

  1. Configuration menu
    Copy the full SHA
    1fb3691 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2018

  1. Configuration menu
    Copy the full SHA
    ac89515 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. Import: Fixes invalid conversion "System.Double" to "SmartStore.Core.…

    …Domain.Catalog.QuantityControlType"
    mgesing committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    009fada View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2019

  1. Topics: Fixes "Cannot insert duplicate key row in object 'dbo.UrlReco…

    …rd' with unique index 'IX_UrlRecord_Slug'"
    mgesing committed Jan 2, 2019
    Configuration menu
    Copy the full SHA
    3ed78ca View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2019

  1. Configuration menu
    Copy the full SHA
    ac4ffd6 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2019

  1. Fixes the redirection to the homepage for pages which are loaded whil…

    …e the application is restarted
    Michael-Herzog committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    354657c View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2019

  1. Configuration menu
    Copy the full SHA
    0cfbdf2 View commit details
    Browse the repository at this point in the history