Code

Master dev dev#51

Code

Open

skiv wants to merge 123 commits intolitecommerce:masterlitecommerce/core:masterfrom skiv:master-dev-devskiv/core:master-dev-devCopy head branch name to clipboard

+12,156-1,849

Commits

Commits on Aug 30, 2012

• Product classes list

  skiv

  committed
  9cb8c58

  Copy full SHA for 9cb8c58

• Product classes list

  skiv

  committed
  893f2b9

  Copy full SHA for 893f2b9

• Product classes list

  skiv

  committed
  c3bb97e

  Copy full SHA for c3bb97e

• Product classes list

  skiv

  committed
  8994520

  Copy full SHA for 8994520

Commits on Sep 4, 2012

• [*] Address Field models are added initially.

  

  Maxim Mukhin

  committed
  f16a282

  Copy full SHA for f16a282

Commits on Sep 5, 2012

• Merge branch 'core-master-dev' into master-dev-dev

  skiv

  committed
  253f527

  Copy full SHA for 253f527

Commits on Sep 6, 2012

• Product classes

  skiv

  committed
  1a7586d

  Copy full SHA for 1a7586d

• Merge branch 'core-master-dev' into master-dev-dev

  skiv

  committed
  42a9722

  Copy full SHA for 42a9722

• Attributes

  skiv

  committed
  a1a0117

  Copy full SHA for a1a0117

Commits on Sep 7, 2012

• Merge branch 'master-dev' into joy-address-fields-manage

  

  Maxim Mukhin

  committed
  f72e61c

  Copy full SHA for f72e61c

Commits on Sep 12, 2012

• [*] Address fields feature further changes.

  

  Maxim Mukhin

  committed
  9af606d

  Copy full SHA for 9af606d

• [*] Address fields feature further changes.

  

  Maxim Mukhin

  committed
  42b8f7d

  Copy full SHA for 42b8f7d

Commits on Sep 14, 2012

• [*] Checkout is changed for address fields feature. Address clone improvement.

  Show description for f28bf95
  

  Maxim Mukhin

  committed
  f28bf95

  Copy full SHA for f28bf95

• [*] Order details page changes for address fields feature.

  

  Maxim Mukhin

  committed
  2a7e672

  Copy full SHA for 2a7e672

Commits on Sep 19, 2012

• Merge branch '1.1.x' into joy-address-fields-manage

  Show description for 801b57a
  svowl

  committed
  801b57a

  Copy full SHA for 801b57a

Commits on Sep 21, 2012

• Attributes

  skiv

  committed
  f5c6058

  Copy full SHA for f5c6058

• Merge branch 'core-master-dev' into master-dev-dev

  skiv

  committed
  71ddb5e

  Copy full SHA for 71ddb5e

Commits on Sep 27, 2012

• Attributes

  skiv

  committed
  0fcdd0a

  Copy full SHA for 0fcdd0a

• Merge branch 'core-master-dev' into master-dev-dev

  skiv

  committed
  5e3f1dc

  Copy full SHA for 5e3f1dc

• Attributes

  skiv

  committed
  b90f413

  Copy full SHA for b90f413

Commits on Oct 1, 2012

• [*] Address fields refactoring: design of address popup window corrected on admin and customer interfaces; Address fields on checkout page refactored (partly; need to be corrected)

  Show description for 1e375bd
  svowl

  committed
  1e375bd

  Copy full SHA for 1e375bd

• [!] PHP warning fixed

  svowl

  committed
  a1c967e

  Copy full SHA for a1c967e

Commits on Oct 2, 2012

• Attributes

  skiv

  committed
  a5cd5d1

  Copy full SHA for a5cd5d1

• Merge branch 'core-master-dev' into master-dev-dev

  skiv

  committed
  3aeb842

  Copy full SHA for 3aeb842

Commits on Oct 3, 2012

• [*] Add .dev/macro/load-yaml.php

  max-shamaev

  committed
  c7fe88e

  Copy full SHA for c7fe88e

• Attributes

  skiv

  committed
  3d3130d

  Copy full SHA for 3d3130d

• Merge pull request litecommerce#43 from skiv/master-dev-dev

  max-shamaev

  committed
  f88f81f

  Copy full SHA for f88f81f

Commits on Oct 4, 2012

• [*] Address fields manage task. Checkout multiple changes.

  

  Maxim Mukhin

  committed
  5ab701a

  Copy full SHA for 5ab701a

• Merge branch '1.1.x' into master-dev

  svowl

  committed
  81acca1

  Copy full SHA for 81acca1

Commits on Oct 5, 2012

• Attributes

  skiv

  committed
  aa4d6aa

  Copy full SHA for aa4d6aa

• [*] Country/State JS connection total refactoring.

  

  Maxim Mukhin

  committed
  7d8ac06

  Copy full SHA for 7d8ac06

Commits on Oct 8, 2012

• [*] Address field feature changes for Estimate shipping.

  Show description for 9a903da
  

  Maxim Mukhin

  committed
  9a903da

  Copy full SHA for 9a903da

• Merge branch 'master-dev' into svowl-address-fields-manage

  

  Maxim Mukhin

  committed
  646af9b

  Copy full SHA for 646af9b

Commits on Oct 9, 2012

• [+] Upgrade hook is added for profile address fields feature changes.

  Show description for f86b2e6
  

  Maxim Mukhin

  committed
  f86b2e6

  Copy full SHA for f86b2e6

• [!] Bug: Log library was loaded several times.

  

  Maxim Mukhin

  committed
  dc315cf

  Copy full SHA for dc315cf

Commits on Oct 10, 2012

• Merge pull request litecommerce#44 from skiv/master-dev-dev

  Show description for 835b2b7
  max-shamaev

  committed
  835b2b7

  Copy full SHA for 835b2b7

Commits on Oct 11, 2012

• Attributes

  skiv

  committed
  b3a48d0

  Copy full SHA for b3a48d0

• Merge pull request litecommerce#45 from skiv/master-dev-dev

  Show description for 0f24059
  max-shamaev

  committed
  0f24059

  Copy full SHA for 0f24059

• [*] Address fields refactoring.

  

  Maxim Mukhin

  committed
  4903467

  Copy full SHA for 4903467

Commits on Oct 12, 2012

• Merge branch '1.1.x' into master-dev

  svowl

  committed
  af28dda

  Copy full SHA for af28dda

Commits on Oct 15, 2012

• Merge branch 'core-master-dev' into master-dev-dev

  skiv

  committed
  406d256

  Copy full SHA for 406d256

• Attributes

  skiv

  committed
  8553e8a

  Copy full SHA for 8553e8a

• Merge pull request litecommerce#47 from skiv/master-dev-dev

  Show description for 66d730f
  max-shamaev

  committed
  66d730f

  Copy full SHA for 66d730f

• Attributes

  skiv

  committed
  727869e

  Copy full SHA for 727869e

• [*] Address fields changes on the order pages.

  

  Maxim Mukhin

  committed
  9ac0bb1

  Copy full SHA for 9ac0bb1

• [*] Custom state field could not change required state.

  

  Maxim Mukhin

  committed
  f91685a

  Copy full SHA for f91685a

• [*] Empty field value is not allowed now on the shipping settings form.

  

  Maxim Mukhin

  committed
  3445941

  Copy full SHA for 3445941

Commits on Oct 16, 2012

• [*] Small validation fix for service name field.

  

  Maxim Mukhin

  committed
  1cf0acf

  Copy full SHA for 1cf0acf

• E:42290 [!] Bug: Removing address entry had been removed address fields.

  

  Maxim Mukhin

  committed
  deb4acf

  Copy full SHA for deb4acf

• [*] Address field service name validation is added to the "Add address field" form.

  

  Maxim Mukhin

  committed
  c58e3c1

  Copy full SHA for c58e3c1

• [*] Validation alerts hiding is added to popup window close functionality.

  

  Maxim Mukhin

  committed
  0d9fc3f

  Copy full SHA for 0d9fc3f

Commits on Oct 17, 2012

• Merge branch '1.1.x' into master-dev

  svowl

  committed
  83aa9cd

  Copy full SHA for 83aa9cd

• [*] Required address fields checking is added.

  

  Maxim Mukhin

  committed
  3fe3a67

  Copy full SHA for 3fe3a67

• [*] Address fields table width changes.

  

  Maxim Mukhin

  committed
  c22e053

  Copy full SHA for c22e053

Commits on Oct 18, 2012

• [*] Address fields feature changes on the checkout. Required fields.

  

  Maxim Mukhin

  committed
  7c8a6e9

  Copy full SHA for 7c8a6e9

Commits on Oct 19, 2012

• Merge branch 'core-master-dev' into master-dev-dev

  skiv

  committed
  81b8575

  Copy full SHA for 81b8575

• [*] Search functionality changes for address fields feature.

  Show description for 842a371
  

  Maxim Mukhin

  committed
  842a371

  Copy full SHA for 842a371

• E:0042305 [!] Payment method: moduleEnabled property of method didn't change when related to the method module was disabled or enabled. Fixed. (hotfix)

  svowl

  committed
  da42fbd

  Copy full SHA for da42fbd

• [*] Address pattern search changes.

  

  Maxim Mukhin

  committed
  972a3a2

  Copy full SHA for 972a3a2

Commits on Oct 22, 2012

• Product comparison

  skiv

  committed
  4d37f5a

  Copy full SHA for 4d37f5a

Commits on Oct 23, 2012

• Product comparison

  skiv

  committed
  d825f80

  Copy full SHA for d825f80

• [*] Minor refactoring in Core/Marketplace.php

  svowl

  committed
  cad71b7

  Copy full SHA for cad71b7

• Merge branch '1.1.x' into master-dev

  svowl

  committed
  8d85be8

  Copy full SHA for 8d85be8

Commits on Oct 24, 2012

• [*] Paypal module: Corrected pattern for checking error message 10486 to redirect customer back to Paypal server after failed payment (Express Checkout)

  svowl

  committed
  6adc386

  Copy full SHA for 6adc386

Commits on Oct 25, 2012

• Merge branch 'release-1.1.2' into 1.1.x

  

  Sergei Fundaev

  committed
  017d696

  Copy full SHA for 017d696

• Merge branch '1.1.x' into master-dev

  

  Sergei Fundaev

  committed
  fe8f74a

  Copy full SHA for fe8f74a

Commits on Nov 1, 2012

• [!] Percent shipping markup field has wrong type - decimal(4,2). Fixed: changed to decimal(14,2)

  svowl

  committed
  310bd2d

  Copy full SHA for 310bd2d

• E:0042336 [*] Admin did not get any warnings if payment method does not support the current store currency and is not available for customers. Fixed (added warning on the payment list)

  svowl

  committed
  901bccd

  Copy full SHA for 901bccd

• E:0042289 [*] DrupalConnector module: Option General->products_per_page added to the list of disabled options

  svowl

  committed
  273e730

  Copy full SHA for 273e730

• [!] E:42335 Bug: ID was not unique on the marketplace page.

  

  Maxim Mukhin

  committed
  4b73bc7

  Copy full SHA for 4b73bc7

• E:0042184 [!] Import products issue: import routime breaks with internal error if CSV-file contains products with same cleanURLs. Fixed.

  svowl

  committed
  5c8a20b

  Copy full SHA for 5c8a20b

Commits on Nov 2, 2012

• E:42186 [!] Button tags had wrong content.

  

  Maxim Mukhin

  committed
  3cbbcc1

  Copy full SHA for 3cbbcc1

Commits on Nov 6, 2012

• E:0042349 [!] Paypal module: PHP error on add-to-cart event if payment_method still unknown. Fixed.

  svowl

  committed
  1e39b5a

  Copy full SHA for 1e39b5a

• Merge pull request litecommerce#48 from skiv/master-dev-dev

  Show description for a7ec03b
  max-shamaev

  committed
  a7ec03b

  Copy full SHA for a7ec03b

• Product comparison

  skiv

  committed
  a0064c1

  Copy full SHA for a0064c1

• Attributes

  skiv

  committed
  9aec2df

  Copy full SHA for 9aec2df

• Merge pull request litecommerce#50 from skiv/master-dev-dev

  Show description for 48de006
  max-shamaev

  committed
  48de006

  Copy full SHA for 48de006

• Merge branch 'master-dev' into 1.1.x

  

  Sergei Fundaev

  committed
  e554e85

  Copy full SHA for e554e85

Commits on Nov 7, 2012

• [!] Bug: Transparency attribute was not on the appropriate element.

  

  Maxim Mukhin

  committed
  73195d2

  Copy full SHA for 73195d2

• Attributes

  skiv

  committed
  9110c32

  Copy full SHA for 9110c32

• Attributes

  skiv

  committed
  5803717

  Copy full SHA for 5803717

• Merge pull request litecommerce#52 from skiv/master-dev-dev

  Show description for dc4ec32
  max-shamaev

  committed
  dc4ec32

  Copy full SHA for dc4ec32

• E:0042271 [*] Phone orderig payment method is enabled by default

  svowl

  committed
  f1a95bd

  Copy full SHA for f1a95bd

• E:0042371 [!] Bug: e parameter didn't affected getValue() method in XLite\View\FormField\Input\Text\Float widget. Fixed.

  svowl

  committed
  049cfe4

  Copy full SHA for 049cfe4

Commits on Nov 8, 2012

• Attributes

  skiv

  committed
  ff51e81

  Copy full SHA for ff51e81

• Merge pull request litecommerce#53 from skiv/master-dev-dev

  Show description for c32b558
  max-shamaev

  committed
  c32b558

  Copy full SHA for c32b558

• E:0042350 [!] SalesTax module: tax is not calculated on shipping cost. Fixed.

  svowl

  committed
  bcfffb4

  Copy full SHA for bcfffb4

• [*] Small design changes.

  

  Maxim Mukhin

  committed
  5cabb8b

  Copy full SHA for 5cabb8b

• Attributes

  skiv

  committed
  ec9eeb0

  Copy full SHA for ec9eeb0

• Merge pull request litecommerce#54 from skiv/master-dev-dev

  Show description for 2d7eb53
  max-shamaev

  committed
  2d7eb53

  Copy full SHA for 2d7eb53

• E:0042241 [!] Tests on PaypalWPS module corrected

  svowl

  committed
  1ec9628

  Copy full SHA for 1ec9628

• E:0042386 [!] Tests updated (SQL dump Repo/sql/module/setup.sql is corrected)

  svowl

  committed
  d6b1024

  Copy full SHA for d6b1024

Commits on Nov 9, 2012

• [*] Address fields default values are added.

  

  Maxim Mukhin

  committed
  27a292d

  Copy full SHA for 27a292d

Commits on Nov 12, 2012

• [!] Bug: Street address line had no default value.

  

  Maxim Mukhin

  committed
  b24b99c

  Copy full SHA for b24b99c

• Attributes

  skiv

  committed
  2a1c515

  Copy full SHA for 2a1c515

• Merge pull request litecommerce#55 from skiv/master-dev-dev

  Show description for 7cd55ed
  max-shamaev

  committed
  7cd55ed

  Copy full SHA for 7cd55ed

Commits on Nov 13, 2012

• Attributes

  skiv

  committed
  a33274a

  Copy full SHA for a33274a

• Merge pull request litecommerce#56 from skiv/master-dev-dev

  Show description for 053838e
  max-shamaev

  committed
  053838e

  Copy full SHA for 053838e

• Attributes

  skiv

  committed
  798dd57

  Copy full SHA for 798dd57

• Merge pull request litecommerce#57 from skiv/master-dev-dev

  Show description for 86d90d1
  max-shamaev

  committed
  86d90d1

  Copy full SHA for 86d90d1

• Attributes

  skiv

  committed
  f38824c

  Copy full SHA for f38824c

• [!] Bug: Wrong directory was used for the temporary file storing event.

  

  Maxim Mukhin

  committed
  f6726b1

  Copy full SHA for f6726b1

Commits on Nov 14, 2012

• [!] Bug: Wrong file path was used.

  

  Maxim Mukhin

  committed
  7e659cc

  Copy full SHA for 7e659cc

• [*] post_rebuild hook has been corrected.

  

  Sergei Fundaev

  committed
  e1e3975

  Copy full SHA for e1e3975

• [*] post_rebuild hook corrected

  

  Sergei Fundaev

  committed
  9670692

  Copy full SHA for 9670692

• [*] upgrade hook: LC_DIR_TMP -> LC_DIR_VAR

  

  Sergei Fundaev

  committed
  7d2eb35

  Copy full SHA for 7d2eb35

• [*] Address fields: upgrade hook has been corrected.

  

  Sergei Fundaev

  committed
  b32d782

  Copy full SHA for b32d782

• Merge pull request litecommerce#58 from skiv/master-dev-dev

  Show description for 72f8aef
  max-shamaev

  committed
  72f8aef

  Copy full SHA for 72f8aef

• Attributes

  skiv

  committed
  643013b

  Copy full SHA for 643013b

• Merge pull request litecommerce#59 from skiv/master-dev-dev

  Show description for aad9492
  max-shamaev

  committed
  aad9492

  Copy full SHA for aad9492

• E:0042148 [*] Order invoice templates for email newsletter have been corrected.

  svowl

  committed
  cfa4f79

  Copy full SHA for cfa4f79

Commits on Nov 15, 2012

• Attributes

  skiv

  committed
  7efe1ac

  Copy full SHA for 7efe1ac

• Merge pull request litecommerce#60 from skiv/master-dev-dev

  Show description for 62363f7
  max-shamaev

  committed
  62363f7

  Copy full SHA for 62363f7

• [+] Attributes are added

  

  Sergei Fundaev

  committed
  e80e5d0

  Copy full SHA for e80e5d0

• Merge branch '1.1.x' into svowl-address-fields-manage

  

  Maxim Mukhin

  committed
  d2074f3

  Copy full SHA for d2074f3

• Merge branch '1.1.x' of github.com:litecommerce/core into 1.1.x

  

  Maxim Mukhin

  committed
  b8f8bdd

  Copy full SHA for b8f8bdd

Commits on Nov 16, 2012

• [!] Minor fix in Model/Payment/Method.php

  svowl

  committed
  eb1d2a3

  Copy full SHA for eb1d2a3

• Merge branch 'master-dev-dev' into s-comparison

  skiv

  committed
  8a5c627

  Copy full SHA for 8a5c627

• [!] Cyrillic symbols in attributes values were displayed wrong.

  

  Sergei Fundaev

  committed
  cf27935

  Copy full SHA for cf27935

• [*] Added hidden URL to clear marketplace cache

  svowl

  committed
  8649bc3

  Copy full SHA for 8649bc3

• Merge branch '1.1.x' of github.com:litecommerce/core into 1.1.x

  svowl

  committed
  6a87ef9

  Copy full SHA for 6a87ef9

• [*] Attributes: oops.

  

  Sergei Fundaev

  committed
  d1488ab

  Copy full SHA for d1488ab

Commits on Nov 26, 2012

• Merge branch 's-comparison' into master-dev-dev

  skiv

  committed
  d2da685

  Copy full SHA for d2da685