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

248 Commits

Author SHA1 Message Date
Manuel Raynaud
79dafd109e create tinymce module 2014-01-13 18:07:23 +01:00
Manuel Raynaud
3c19388078 fix propel type in schema file 2014-01-07 11:17:26 +01:00
Etienne Roudeix
26aae5adfc remove cache behavior from product table 2014-01-06 14:20:12 +01:00
Etienne Roudeix
4e847bf5ae fix model 2014-01-06 12:23:01 +01:00
Etienne Roudeix
6a64f827ce fix conflicts 2014-01-06 12:14:56 +01:00
Etienne Roudeix
99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" 
This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
 2014-01-06 11:25:25 +01:00
gmorel
67b89dbecd Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 
Remove submodule
 2013-12-30 01:13:36 +01:00
gmorel
8574e1b36e Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 2013-12-30 00:58:43 +01:00
gmorel
3e12ace045 Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 2013-12-30 00:50:04 +01:00
gmorel
ae1a05eb85 Merge 2013-12-29 04:28:11 +01:00
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
Etienne Roudeix
22efc21bfe dynamic delivery modules on delivery front template 2013-12-20 12:14:20 +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
Etienne Roudeix
5773922314 show coupon codes in back office 2013-12-19 14:50:45 +01:00
Etienne Roudeix
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +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
d6ba2b3d65 Merge branch 'master' into frontend 2013-12-16 15:45:04 +01:00
Etienne Roudeix
65f43b5eff Merge branch 'cleanmaster' into modules 2013-12-16 14:33:15 +01:00
Etienne Roudeix
32d0aa15a6 PaymentModuleInterface::pay method force $order parameter 2013-12-16 12:38:41 +01:00
touffies
0684ec2b42 Rename meta_keyword to meta_keywords 
Add SEO to folder
 2013-12-09 14:52:46 +01:00
touffies
0d5cfd29e0 Add new fields (meta_title, meta_description and meta_keyword) under I18N Product 2013-12-09 14:46:06 +01:00
Franck Allimant
8c864021f5 Added sorting and position ùmanagement to modules. 2013-12-06 18:59:46 +01:00
Franck Allimant
ceb1357dd7 Renamed backoffice to backOffice 2013-12-02 19:05:02 +01:00
Etienne Roudeix
bc9da10d8c change asset origin param name by source 2013-11-28 12:02:53 +01:00
Etienne Roudeix
b0371312e2 assets in modules 2013-11-28 11:47:21 +01:00
Etienne Roudeix
247ed6aa2a Merge branch 'master' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
 2013-11-28 10:34:57 +01:00
Etienne Roudeix
7e83896f96 Merge branch 'master' of github.com:thelia/thelia 2013-11-28 10:30:28 +01:00
Etienne Roudeix
4c754376e7 assets in module 2013-11-28 10:30:08 +01:00
Franck Allimant
33e0a854f2 Implemented mail messages templates and layouts 2013-11-27 21:21:07 +01:00
touffies
fd0301022d Merge branch 'backoffice' into frontend 2013-11-25 10:24:29 +01:00
Etienne Roudeix
b9790efeee Merge branch 'master' into modules 2013-11-25 10:05:01 +01:00
Etienne Roudeix
6b95d34f5a Merge branch 'master' of github.com:thelia/thelia 2013-11-25 10:04:44 +01:00
Etienne Roudeix
2bc1bbed64 asset tests 2013-11-25 10:03:48 +01:00
touffies
85d9c112d3 Replace company_name and contact_email by store_name & store_email 2013-11-22 17:40:04 +01:00
Manuel Raynaud
a85baf6994 remove specific code testing esi integration 2013-11-22 09:43:24 +01:00
Manuel Raynaud
a436adf438 add new route for testing esi tag 2013-11-20 14:45:40 +01:00
Etienne Roudeix
0cc48ecdb7 Merge branch 'master' of github.com:thelia/thelia 2013-11-18 11:32:36 +01:00
Etienne Roudeix
b03bac18d6 assets in modules 2013-11-18 11:32:17 +01:00
Manuel Raynaud
9446b33ee7 load custom router from Front module 2013-11-18 10:51:46 +01:00
OpenStudio
89e0bf8867 move front controller classes to Front module 2013-11-18 10:51:46 +01:00
Manuel Raynaud
597da57252 start Front module 2013-11-18 10:51:46 +01:00
Etienne Roudeix
a4935a556c fix modules bug 2013-11-15 16:35:29 +01:00
Etienne Roudeix
b2bb8791f9 colissimo 2013-11-14 13:55:44 +01:00
Etienne Roudeix
fa127ed4f0 colissimo module 2013-11-14 11:53:29 +01:00
Etienne Roudeix
48409c29a9 Colissimo in progress 2013-11-14 11:21:34 +01:00
Etienne Roudeix
e8b4a4ac74 Colissimo proces 2013-11-14 09:22:56 +01:00