Commit Graph

46 Commits

Author SHA1 Message Date
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
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
gmorel
86d6a0fa05 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:36:52 +02:00
Manuel Raynaud
2dee65727d set good module delivery id in session 2013-09-06 16:12:57 +02:00
Manuel Raynaud
012432dad0 clear asset cache in cache:cler command 2013-09-06 09:58:35 +02:00
gmorel
6cba95f4ee Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (32 commits)
  refactor name for updating actions
  choose UPDATE word for name actions
  add update address action and create tests
  404 not found management
  Working Fix unset namespace
  modify travis script
  test rewriting exception
  Fixed minor bug in Currencies
  Finished currency edition
  Added route methods
  address action implementation
  hot fix
  rewriting
  add address create controller and event
  Added AdminUtilities Smarty plugin, optimized templates
  update customer model createOrUpdate method
  update address model
  fix redirect process in viewListener
  refactor reset_install script
  refactor install process, database management in dedicated class
  ...

Conflicts:
	local/config/schema.xml
	reset_install.sh
2013-09-04 15:42:38 +02:00
Manuel Raynaud
15a91a9fd9 refactor install process, database management in dedicated class 2013-09-03 11:09:27 +02:00
Manuel Raynaud
9f96b830e7 create task for reloaded database 2013-09-03 11:07:32 +02:00
gmorel
273e6144aa Working
- Add parameters to command
2013-09-02 16:57:34 +02:00
Manuel Raynaud
ef8e98d415 add some phpdoc 2013-09-01 11:32:05 +02:00
franck
07849aa614 Added command for creating admin users on console 2013-08-28 14:23:50 +02:00
franck
38c2dc319a Merge branch 'master' of https://github.com/thelia/thelia 2013-08-26 09:59:26 +02:00
franck
803e93f61c Fixed typo 2013-08-26 09:59:01 +02:00
Etienne Roudeix
86b11096ba Merge branch 'master' into loops
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
2013-08-21 09:19:56 +02:00
franck
f028d2b2db Added image-cache:clear console command 2013-08-15 21:18:16 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
Manuel Raynaud
078b1e0d57 apply cs-fixer 2013-08-14 09:29:04 +02:00
franck
3d5caa2341 Fix source header alignment 2013-07-17 15:06:53 +02:00
Manuel Raynaud
3857827b98 check if database name is not empty in install process 2013-07-12 15:58:36 +02:00
Manuel Raynaud
b55833b2e2 add some output in module commands 2013-07-12 10:22:59 +02:00
Manuel Raynaud
2941292fdd integrate namespace into schema.xml skeleton 2013-07-12 09:46:35 +02:00
Manuel Raynaud
8e975a9b62 fix missing argument for sprintf method 2013-07-12 09:08:51 +02:00
Manuel Raynaud
ac170ac25f generate sql from generat model command 2013-07-11 17:15:32 +02:00
Manuel Raynaud
2d13a28fbf create command for generating sql from mosule schema 2013-07-11 17:06:12 +02:00
Manuel Raynaud
3c18acb3fc don't needed to call Propel Application 2013-07-11 16:49:21 +02:00
Manuel Raynaud
98589cc2b6 generate Model using Propel command in Thelia app 2013-07-11 16:44:18 +02:00
Manuel Raynaud
1a7c9b2fd2 fix test issue 2013-07-11 15:57:26 +02:00
Manuel Raynaud
6fa815d174 add possibility to render a block on command output 2013-07-11 12:54:38 +02:00
Manuel Raynaud
6baac9e36c create test for module:generate command 2013-07-11 11:11:16 +02:00
Manuel Raynaud
945a97ae78 initialize module part 2013-07-11 10:28:58 +02:00
Manuel Raynaud
9db64bbe78 complete install command and fix travis file 2013-07-09 10:52:37 +02:00
Manuel Raynaud
dcdebde287 Merge branch 'admin'
Conflicts:
	composer.lock
2013-06-26 11:05:48 +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
Manuel Raynaud
36618668fc fix typo 2013-06-10 18:10:21 +02:00
Manuel Raynaud
5564de29ab complete phpdoc for install command 2013-06-06 17:04:19 +02:00
Manuel Raynaud
58c1a759ca remove database name in sql command 2013-06-06 12:02:25 +02:00
Manuel Raynaud
c2a6fbecef check some permission before starting install process 2013-06-06 11:54:32 +02:00
Manuel Raynaud
b3c0397a55 add help message to thelia:install command 2013-06-05 14:57:54 +02:00
Manuel Raynaud
0717c6a48f ask information connection again if they are wrong 2013-06-05 14:48:42 +02:00
Manuel Raynaud
785b450537 create new command allowing to install thelia using cli tools 2013-06-05 14:23:05 +02:00
Manuel Raynaud
bf7ab3c3b8 remove unused namespace in CacheClear class 2013-06-04 15:19:44 +02:00
Manuel Raynaud
e055058cb4 import ContainerAwareCommand from SymfonyFramework bundle 2013-06-03 15:29:01 +02:00
Manuel Raynaud
e7c06c2158 import ContainerAwareCommand from SymfonyFramework bundle 2013-06-03 15:28:04 +02:00
Manuel Raynaud
adea29bd5c rename cache:clear command 2013-06-03 15:24:22 +02:00
Manuel Raynaud
fa3f8a3bf9 complete cache:clear command 2013-06-03 15:00:07 +02:00
Manuel Raynaud
af086a55da implement command process 2013-06-03 13:12:34 +02:00