Commit Graph

49 Commits

Author SHA1 Message Date
gmorel
c1a79028a1 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
  add PropelDataCollector to debugbar, still missing some informations
  remove unused class
  integrate debugbar module
  remove htmlpurifier
  modify insert.sql including debugBar module
  add new event and new tag
  Started category modification
  Factorized modal dialogs javascript
  Factorized creation and confirmation modal dialogs
  create controller adding delivery module in session
  create Delivery loop
  Working :
  Continuing categories administration...
  Working :
  create base loop for delivery and payment entities
  remove htmlpurifier dependency
  country id can be an argument for calculate method
  Working :
  Working :
  fix typo
  ...

Conflicts:
	composer.lock
	core/lib/Thelia/Controller/Admin/CategoryController.php
	templates/admin/default/assets/less/thelia/variables.less
2013-09-08 00:08:02 +02:00
Manuel Raynaud
9ebf16f1f6 remove htmlpurifier 2013-09-07 16:36:41 +02:00
gmorel
49be95a2e7 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
  Working :
  Working :
  Working :
  Working :
  Fixed minor visual glitches
  Working : Resize countries flag + Add bootstrap-switch
  fix test suite
  clear asset cache in cache:cler command
  Added a 'development mode' to assetic smarty plugin
  rewriting router
  use good Request object
  Added Tools\URL test case, and a test case superclass for initializing Tools\URL
  remove unused UrlWritin controller
  create router for rewriting matching
  customer substitutions
  fix typo in front id
  Working : For attributes on labels
  Working : For attributes on labels
  add label_attr attribute to form smarty plugin
  start refactorin rewriting routing
  ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/less/thelia/bootstrap-editable.less
	templates/admin/default/categories.html
2013-09-06 19:38:08 +02:00
Manuel Raynaud
f6ab8888f3 start creating debugbar 2013-09-05 17:43:12 +02:00
gmorel
4a62419bf6 Working
- fix composer.json
2013-09-02 17:30:48 +02:00
gmorel
33b8ceb24e Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh
2013-09-02 17:25:25 +02:00
Manuel Raynaud
fd80139a9c change symfony/icu version for compatibility 2013-09-02 15:25:01 +02:00
gmorel
5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
2013-09-02 09:19:24 +02:00
Manuel Raynaud
932bf00532 update propel version and dependencies 2013-09-01 19:26:13 +02:00
gmorel
a9944c73f2 WIP Coupon
Use of the Serializer Symfony Component
2013-08-22 15:18:43 +02:00
Manuel Raynaud
ab5e845ad3 start refactoring customer update process 2013-08-16 12:09:08 +02:00
Manuel Raynaud
ca954a3b81 fix insert.sql syntax and downgrade propel version for validator
compatibility
2013-08-16 11:45:03 +02:00
franck
bceb65dad6 Reverted symfony/validator from 2.3 to 2.2, because of failures in
dependencies.
2013-08-15 11:27:30 +02:00
Manuel Raynaud
14bc1663bf Merge branch 'cart'
Conflicts:
	composer.lock
	core/lib/Thelia/Model/Base/Attribute.php
	core/lib/Thelia/Model/Base/AttributeAv.php
	core/lib/Thelia/Model/Base/AttributeCombination.php
	core/lib/Thelia/Model/Base/AttributeCombinationQuery.php
	core/lib/Thelia/Model/Base/Cart.php
	core/lib/Thelia/Model/Base/CartItem.php
	core/lib/Thelia/Model/Base/CartItemQuery.php
	core/lib/Thelia/Model/Base/Currency.php
	core/lib/Thelia/Model/Base/CurrencyQuery.php
	core/lib/Thelia/Model/Base/Product.php
	core/lib/Thelia/Model/Base/ProductPrice.php
	core/lib/Thelia/Model/Base/ProductPriceQuery.php
	core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php
	core/lib/Thelia/Model/Map/CartItemTableMap.php
	core/lib/Thelia/Model/Map/CurrencyTableMap.php
	core/lib/Thelia/Model/Map/ProductPriceTableMap.php
	core/lib/Thelia/Model/Map/ProductTableMap.php
	install/thelia.sql
	local/config/schema.xml
2013-08-01 10:52:17 +02:00
Manuel Raynaud
b415149116 Update composer.json 2013-08-01 00:53:28 +02:00
Manuel Raynaud
e923de8114 Update composer.json 2013-08-01 00:43:27 +02:00
Manuel Raynaud
fd15934b65 update smarty 2013-07-29 15:47:05 +02:00
Manuel Raynaud
0c1c4b1822 change default locale to en_US 2013-07-10 10:34:13 +02:00
Manuel Raynaud
1a6cde1c65 update composer.lock file 2013-07-09 11:47:24 +02:00
franck
abdff9bc1a Merge branch 'admin'
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
2013-07-08 11:27:37 +02:00
Manuel Raynaud
6fa6756000 Merge branch 'master' of github.com:thelia/thelia 2013-07-08 09:25:56 +02:00
franck
162084140e Merge remote-tracking branch 'origin/master' into admin
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
2013-07-06 10:34:09 +02:00
Manuel Raynaud
7d3d36231f update composer php verification 2013-07-05 16:11:05 +02:00
franck
f02ade10f8 Added SimplePie to dependencies 2013-07-05 11:48:21 +02:00
Etienne Roudeix
55a309c00a Merge branch 'master' into loops
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
2013-07-05 11:16:55 +02:00
Manuel Raynaud
5fda702b8d migrte propel to propel 2 2013-07-04 19:31:09 +02:00
franck
18e49e7ebe Introduction of loop scopes. 2013-07-02 19:18:41 +02:00
Etienne Roudeix
ad47ab7cac set execution right // no more troubles
change composer required PHP version from 5.4 to 5.3
2013-06-20 15:21:16 +02:00
franck
89abfaad48 Integration of Assetic in SmartyParser, extended it to Admin (we can now
use loops !), added the Thelia ControllerResolver and fixed config and
routing accordingly.²:wq
2013-06-19 02:07:43 +02:00
franck
088f5a3402 Intégration de Assetic 2013-06-17 15:29:13 +02:00
franck
156f281162 Merge branch 'franck' into admin
Conflicts:
	composer.lock
	core/lib/Thelia/Core/Thelia.php
2013-06-10 16:35:49 +02:00
franck
0b40f1a525 Changement emplacmement templates 2013-06-10 15:36:02 +02:00
franck
f9068878c7 Debut du travail sur le B.O. 2013-06-07 15:31:05 +02:00
Manuel Raynaud
c4d8aef962 update composer dependencies and add filsesystem component 2013-06-03 12:18:16 +02:00
Manuel Raynaud
20d1655c9d rename plugins to modules 2013-05-16 11:13:09 +02:00
Manuel Raynaud
079168c0f2 change php compat to 5.4 2013-05-15 14:51:45 +02:00
Manuel Raynaud
5b4daf0659 create a faker for adding some fixtures 2013-04-30 14:12:52 +02:00
Manuel Raynaud
5c401020f9 integrate symfony-cmf/Routing component using chainRouter 2013-04-18 16:30:31 +02:00
Manuel Raynaud
9666511727 change php version compat 2013-04-10 14:50:45 +02:00
Manuel Raynaud
266e0bd5eb change Tpex integration 2013-04-08 17:06:04 +02:00
Manuel Raynaud
8433c5d555 refactor propel configuration 2013-03-26 17:25:10 +01:00
Manuel Raynaud
f8cbfbd858 update symfony component version 2013-03-25 15:36:47 +01:00
Manuel Raynaud
6f08dbcd28 include Tpex as submodule 2013-02-19 14:19:57 +01:00
Manuel Raynaud
d4bc75bc12 integrate Thelia/Tpex 2013-02-18 21:40:59 +01:00
Manuel Raynaud
4764118f3a update propel in V.1.6.8 2013-02-18 14:39:45 +01:00
Manuel Raynaud
3b08bad735 fix propel version in composer file and exclude some directory in
phpunit code-coverage parameter
2013-02-16 09:25:22 +01:00
Manuel Raynaud
b952888b14 start to implement action controller. 2013-02-07 17:40:27 +01:00
Manuel Raynaud
ec35cf998e add class-loader component, needed for HttpKernel component in dev mode 2013-02-05 11:28:36 +01:00
Manuel Raynaud
9309c75e07 remove symfony classLoader component, using composer autoloader with
dump optimized option
2013-02-04 14:55:20 +01:00