TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,787 Commits 1 Branch 0 Tags
f8ac32a4a01306dffec40a305da46cedd7a4c272
Commit Graph

477 Commits

Author SHA1 Message Date
gmorel
f8ac32a4a0 Refactor : Coupon effect inputs are now more customisable 
Adding effect to be stored as serialised in JSON
 2013-12-29 01:23:50 +01:00
gmorel
8f9b86ff6a Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (121 commits)
  set cartItem in cart add and update events
  need to unescape breadcrumb strings after been in array
  update readme file
  update insert.sql with new release version
  change changelog file format
  Prevent product and content création at catalog root
  dynamic delivery modules on delivery front template
  complete changelog
  Finished merging modules with master
  Revert "Merge branch 'cleanmaster' into modules"
  use TaxEngine::getDeliveryCountry in delivery loop
  refacto getTaxCountry which is actually getDeliveryCountry
  make it magic last stand
  change loop in shipping zone template using module insteadof delivery
  Fixed template loop
  Refactored templates processing
  complete readme file
  change email address of core contributors
  fix getPosition folder test
  add coupon tests
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
 2013-12-25 14:14:20 +01:00
gmorel
69d255f782 new branch coupon 2013-12-25 14:12:54 +01:00
Franck Allimant
afea985549 Merge branch 'modules' of https://github.com/thelia/thelia into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/CartItem.php
	core/lib/Thelia/Model/Base/CartItemQuery.php
	core/lib/Thelia/Model/Base/CouponOrder.php
	core/lib/Thelia/Model/Base/Order.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
	core/lib/Thelia/Model/Base/OrderQuery.php
 2013-12-20 14:30:50 +01:00
Franck Allimant
882cf554d1 Finished merging modules with master 2013-12-20 11:47:34 +01:00
Franck Allimant
9092e39296 Merge branch 'master' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
 2013-12-20 11:32:01 +01:00
Etienne Roudeix
b3ac365b45 Revert "Merge branch 'cleanmaster' into modules" 
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
 2013-12-20 11:16:42 +01:00
Etienne Roudeix
d0ff5260f7 Merge branch 'cleanmaster' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
 2013-12-20 11:16:35 +01:00
Franck Allimant
3a2ad352cc Refactored templates processing 2013-12-20 00:49:08 +01:00
Etienne Roudeix
8c121dd455 add coupon tests 2013-12-19 15:37:15 +01:00
Etienne Roudeix
1ba60103f3 coupon in orders + model review : backquote use 2013-12-18 17:46:42 +01:00
Manuel Raynaud
0c24a8afc0 Merge branch 'master' into modules 
Conflicts:
	templates/backOffice/default/product-edit.html
 2013-12-17 10:48:59 +01:00
Manuel Raynaud
30eab4f416 fix object identifier presence 2013-12-16 15:53:02 +01:00
Manuel Raynaud
d6ba2b3d65 Merge branch 'master' into frontend 2013-12-16 15:45:04 +01:00
Etienne Roudeix
977bbb55fa Merge branch 'cleanmaster' into modules 2013-12-16 11:32:54 +01:00
Etienne Roudeix
86f1e06e42 document repositioning after delation 2013-12-16 11:32:05 +01:00
Etienne Roudeix
c5e69ebbb9 Merge branch 'cleanmaster' into modules 2013-12-16 10:56:40 +01:00
Etienne Roudeix
583cbe95b6 document positioning 2013-12-16 10:55:18 +01:00
Etienne Roudeix
536c88b4f8 Merge branch 'cleanmaster' into modules 
Conflicts:
	core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
 2013-12-16 09:57:35 +01:00
Manuel Raynaud
f4c5f23d00 Change AdminLog logging request behavior, fixing issue #145 2013-12-14 14:16:45 +01:00
Etienne Roudeix
297f197fed Merge branch 'cleanmaster' into modules 2013-12-12 15:45:45 +01:00
Etienne Roudeix
c9e052188c images are positionable 2013-12-12 15:41:35 +01:00
Etienne Roudeix
93537b8d71 in progress : reorder image 2013-12-12 15:30:10 +01:00
Etienne Roudeix
02b9d2e509 Merge branch 'cleanmaster' into modules 2013-12-10 15:57:37 +01:00
touffies
0684ec2b42 Rename meta_keyword to meta_keywords 
Add SEO to folder
 2013-12-09 14:52:46 +01:00
Etienne Roudeix
cc4fce9add Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-09 10:29:49 +01:00
Franck Allimant
8c864021f5 Added sorting and position ùmanagement to modules. 2013-12-06 18:59:46 +01:00
Franck Allimant
e96088080d Merge branch 'master' into modules 2013-12-06 17:16:14 +01:00
Etienne Roudeix
14e7181d06 rewritten url update 2013-12-06 16:35:14 +01:00
Franck Allimant
0fcbb409e3 Factorized URL desactivation in UrlRewritingTrait::markRewritenUrlObsolete() 2013-12-06 12:26:39 +01:00
Etienne Roudeix
926ff410d1 fix #128 2013-12-06 11:50:29 +01:00
Franck Allimant
5857c07ef0 Fixed issue 118 2013-12-05 15:57:56 +01:00
Franck Allimant
de0542b33c Changed direct accesses to verifyStok by calls to checkAvailableStock 2013-12-05 13:02:13 +01:00
Franck Allimant
0a7b8f05d0 Added checkAvailableStock(), changed getPassedUrlView() to 
getObsoleteRewrittenUrlView()
 2013-12-05 13:01:09 +01:00
Etienne Roudeix
81fa5a291c fix tax rules issue 2013-11-28 15:31:09 +01:00
gmorel
94e2d7881d Merge branch 'master' of git://github.com/thelia/thelia into french_translation 
* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email
 2013-11-27 22:22:26 +01:00
Franck Allimant
33e0a854f2 Implemented mail messages templates and layouts 2013-11-27 21:21:07 +01:00
gmorel
e7038c9369 Spelling rewritten with 2 t 2013-11-27 20:37:40 +01:00
Etienne Roudeix
48409c29a9 Colissimo in progress 2013-11-14 11:21:34 +01:00
Etienne Roudeix
be9aba9fb8 fix stuff + module management 2013-11-08 15:11:45 +01:00
Etienne Roudeix
422a80fcce module modification 2013-11-08 11:26:06 +01:00
Franck Allimant
361e4a9d74 Implementing translations (still in progress) 2013-11-06 10:49:03 +01:00
Etienne Roudeix
06ee460e8a Merge branch 'master' of github.com:thelia/thelia 2013-11-04 16:16:21 +01:00
Etienne Roudeix
969c077f81 admin home stats and information 2013-11-04 16:15:48 +01:00
Franck Allimant
2aefb87db7 Finished log configuration. All loggers are currentrly working 2013-11-01 16:15:19 +01:00
Etienne Roudeix
e5f5570d2b Merge branch 'master' of github.com:thelia/thelia 2013-10-31 11:20:42 +01:00
Etienne Roudeix
083dde5e93 admin home stats 2013-10-30 16:32:24 +01:00
Franck Allimant
a11a013eb0 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-30 15:44:57 +01:00
Franck Allimant
0cabe7b9e8 Combination creation management 2013-10-30 15:44:32 +01:00
Etienne Roudeix
52fa6783f3 datepicker in admin logs 2013-10-30 12:00:48 +01:00