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

93 Commits

Author SHA1 Message Date
Franck Allimant
89653f452b Removes container from all Thelia actions, but Modules (#198) 2014-01-31 20:06:42 +01:00
Manuel Raynaud
58255430df change external schema path on generating new module. Fix #197 2014-01-29 15:38:06 +01:00
Manuel Raynaud
0e5fcbd0d4 force utf8 encoding in install process 2014-01-27 18:07:28 +01:00
Franck Allimant
c5cc6aae76 Added administrator preferred locale (see issue #183) 2014-01-27 14:29:37 +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
b27fbd776f A generated module works now out of the box (no need to update 
module.xml)
 2014-01-16 11:25:09 +01:00
Franck Allimant
380e856df8 Fixed obsolete comment 2014-01-16 10:54:03 +01:00
Manuel Raynaud
7aad8b23f0 hide passord on admin creation using CLI 2014-01-13 10:00:20 +01:00
Manuel Raynaud
9d0121f321 fix cs 2014-01-10 11:41:55 +01:00
Manuel Raynaud
8214ab77ec refactor update process. Now only available with command line 2014-01-08 16:23:54 +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
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
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