Commit Graph

80 Commits

Author SHA1 Message Date
Manuel Raynaud
2f4158d1f6 fix cs 2013-12-18 10:04:13 +01:00
Manuel Raynaud
64c5991838 tweak httpFoundation cache part for compatibility with
Thelia\HttpFoundation part
2013-11-20 14:45:40 +01:00
Franck Allimant
46d95664a0 Fixed typo 2013-11-19 15:35:15 +01:00
Manuel Raynaud
0e74337a7b fix class name in module generation 2013-11-15 11:49:51 +01:00
Franck Allimant
85ea937570 Optimisation of THELIA_* constants usage 2013-11-08 11:22:26 +01:00
Manuel Raynaud
2d291cf5a0 refactor how to assign template to parser 2013-11-06 11:12:39 +01:00
Quentin Dufour
3e1a08dc6c Correcting some typos 2013-11-04 17:37:23 +01:00
Franck Allimant
a295fee0d3 Changed ModulesAdmin dir into AdminIncludes - Updated debug bar module 2013-10-31 11:36:56 +01:00
Manuel Raynaud
eae231148e Merge branch 'admin'
Conflicts:
	core/lib/Thelia/Command/AdminUpdatePasswordCommand.php
	core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
2013-10-30 15:37:33 +01:00
Manuel Raynaud
78cba61cd5 finish admin update password command line 2013-10-30 15:35:11 +01:00
Manuel Raynaud
66c30a1b4c start creating admin password recovery 2013-10-30 15:35:11 +01:00
Manuel Raynaud
c327b20fd6 change command line for creating new administrator 2013-10-30 15:35:11 +01:00
Manuel Raynaud
e18c8992f8 finish admin update password command line 2013-10-30 15:33:25 +01:00
Manuel Raynaud
b0f3ad69d2 start creating admin password recovery 2013-10-30 15:01:18 +01:00
Manuel Raynaud
9d011eb5c6 change command line for creating new administrator 2013-10-30 14:46:21 +01:00
Manuel Raynaud
c74422f5dc implement module inclusion 2013-10-29 15:56:03 +01:00
Manuel Raynaud
2c030f910b fix cs 2013-10-25 10:07:21 +02:00
Etienne Roudeix
fb8b82093a administrators management 2013-10-23 16:31:37 +02:00
Etienne Roudeix
c94fa9bc24 permission management 2013-10-22 15:04:06 +02:00
Etienne Roudeix
d13434bb08 permissions 2013-10-21 19:11:42 +02:00
Etienne Roudeix
abe45c5798 Merge branch 'master' into tax
Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php
2013-10-21 17:48:13 +02:00
Etienne Roudeix
9a7708451a permission cleanup 2013-10-21 17:44:17 +02:00
Manuel Raynaud
52ed89f1aa fix cs 2013-10-18 09:28:17 +02:00
Manuel Raynaud
2ecd1caac6 dispatching event for clearing cache 2013-10-18 08:25:42 +02:00
Manuel Raynaud
1b0de7144a end updating module list 2013-10-17 17:20:29 +02:00
Manuel Raynaud
c9dbb610c1 start validating module.xml file 2013-10-17 11:32:29 +02:00
Manuel Raynaud
d45074051e fiw module generator class name issue 2013-10-07 17:43:43 +02:00
Manuel Raynaud
77a4faef0e complete installcli process 2013-10-06 14:33:17 +02:00
Manuel Raynaud
c65ec67bdf fix cs 2013-09-30 10:35:34 +02:00
Manuel Raynaud
43b5a129f7 refactor order and image events 2013-09-30 10:34:08 +02:00
Etienne Roudeix
66536d0b31 Merge branch 'master' into template
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php
2013-09-18 20:03:13 +02:00
Etienne Roudeix
891ebcd491 fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar 2013-09-18 19:51:01 +02:00
Etienne Roudeix
16d0985718 payment modules 2013-09-18 17:06:08 +02:00
Manuel Raynaud
8f95fe1b8b remove all tables before inserting tables creation 2013-09-18 08:25:20 +02:00
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