TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,192 Commits 1 Branch 0 Tags
484bc2a70c8b265ce7eca147256eb42bb5950c67
Commit Graph

328 Commits

Author SHA1 Message Date
Manuel Raynaud
56663c85a1 create changelog and migration script for next version 2014-03-03 17:42:12 +01:00
Manuel Raynaud
c30abacfbc prepare 2.0.0-RC1 version 2014-03-03 15:09:59 +01:00
Manuel Raynaud
3244e88585 create lost password email 2014-02-11 16:13:30 +01:00
Manuel Raynaud
a51c54db26 x default position value 2014-02-09 15:49:19 +01:00
Franck Allimant
4125ed1bce process_assets is now 0 by default 2014-02-04 10:00:30 +01:00
Franck Allimant
726d7ffe91 Fixed image generation for products, which was broken. 2014-02-03 23:17:52 +01:00
Manuel Raynaud
cb47041e1f create admin in the faker for the test suite 2014-01-31 13:05:04 +01:00
Manuel Raynaud
fa195733fe specify column position in admin table when updating to 2.0.0-beta4 2014-01-29 16:05:54 +01:00
Manuel Raynaud
40b8109f32 prepare for new Version : 2.0.0-beta4 2014-01-29 15:47:23 +01:00
Franck Allimant
3363200607 Improved languages management, added many country flags. Fix #183 2014-01-27 23:22:02 +01:00
Franck Allimant
3c151ac68e Fixed UTF-8 encoding 2014-01-27 17:40:59 +01:00
Franck Allimant
8970b0614f Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	install/thelia.sql
 2014-01-27 17:13:43 +01:00
Franck Allimant
1f379f60ab Added indexes to category table 2014-01-27 17:11:23 +01:00
Manuel Raynaud
7d54636b1d change thelia.sql file charset to utf8 2014-01-27 17:08:54 +01:00
Manuel Raynaud
c90c8ff9db force charset in sql file 2014-01-27 16:56:05 +01:00
Franck Allimant
c5cc6aae76 Added administrator preferred locale (see issue #183) 2014-01-27 14:29:37 +01:00
Franck Allimant
09e6985eb4 Added locale attribute to administrator 2014-01-27 13:12:16 +01:00
Manuel Raynaud
2cee70a2b7 refactor count loop for having better performance has mentionned in #193 2014-01-23 14:43:05 +01:00
Manuel Raynaud
1b2c1d53ac remove some unused variables 2014-01-22 15:50:40 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Franck Allimant
5d92ea0bab TaxManager is now a service in the container. 2014-01-22 01:18:28 +01:00
Manuel Raynaud
34da3937dc fix typo in insert.sql file 2014-01-14 11:30:59 +01:00
Manuel Raynaud
79dafd109e create tinymce module 2014-01-13 18:07:23 +01:00
Manuel Raynaud
46b9919ab5 update thelia version for next beta version 2014-01-10 16:46:57 +01:00
Manuel Raynaud
798129a094 update default VAT 2014-01-10 15:21:20 +01:00
Manuel Raynaud
4d1a82e7a7 add new thelia version in migration script 2014-01-08 15:49:06 +01:00
Manuel Raynaud
366454ebe8 create sql script for migrations 2014-01-08 14:16:32 +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
e606a6f8ce Coupon : Condition module refactor 
Less crappy unmaintainable javascript
More logic in extendable php
 2014-01-05 00:00:15 +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
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
Manuel Raynaud
f0116b31f1 update insert.sql with new release version 2013-12-20 15:26:29 +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
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
touffies
0684ec2b42 Rename meta_keyword to meta_keywords 
Add SEO to folder
 2013-12-09 14:52:46 +01:00
Franck Allimant
e262bbc9ea Added config variable titles 2013-12-05 12:57:28 +01:00
gmorel
ffc699fa7f Merge branch 'master' of git://github.com/thelia/thelia 
* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email
  add REF to product_sale_element loop and fix product tempalte
  Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
  Add correct url(subdiretory included) in config page
  Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
 2013-11-28 20:58:24 +01:00
Franck Allimant
33e0a854f2 Implemented mail messages templates and layouts 2013-11-27 21:21:07 +01:00
gmorel
67a38bca20 Merge branch 'master' of git://github.com/thelia/thelia 
* 'master' of git://github.com/thelia/thelia:
  Check if store_country has a value
  Fixed double '/' in generated assets URLs
  Add validation for Store configuration
  Use Store contact information
  Call the wrong AdminResources in saveAction
  Action buttons smaller
  Replace company_name and contact_email by store_name & store_email
  Add a new admin page to manage the basic store configurations
  Add routing for Store Configuration
  Add argument Title on Content Loop & Folder Loop
 2013-11-25 22:43:04 +01:00
gmorel
19aa1c798d Coupon : Fix namespace issues 2013-11-24 22:27:26 +01:00
gmorel
90b5fbde05 Refactor removing Manager notion 2013-11-23 20:18:04 +01:00
touffies
85d9c112d3 Replace company_name and contact_email by store_name & store_email 2013-11-22 17:40:04 +01:00
gmorel
968bddbcf9 Fix Coupon/Condition refactor 2013-11-19 13:15:23 +01:00
Manuel Raynaud
d6bf64f7a6 change max weight in faker 2013-11-18 15:04:00 +01:00
Manuel Raynaud
b39f0fd936 Front module is activated by default 2013-11-18 10:51:46 +01:00
David
54d5e98971 Corrected the French translation of "Miss" in the Register form dropdown 
Corrected French translation of Miss from "Madamemoiselle" to "Mademoiselle"
 2013-11-17 01:01:01 +01:00
Etienne Roudeix
48409c29a9 Colissimo in progress 2013-11-14 11:21:34 +01:00