TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
783 Commits 1 Branch 0 Tags
6387182026fadfe7560fe0facf7f720e89ddbcfe
Commit Graph

76 Commits

Author SHA1 Message Date
franck
6387182026 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Config.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Tools/URL.php
 2013-09-04 17:34:23 +02:00
franck
02a1b5c655 Event harmonization with MRA 2013-09-04 15:45:46 +02:00
Manuel Raynaud
8b2007f94d Merge branch 'actions' 
Conflicts:
	core/lib/Thelia/Action/Currency.php
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-09-04 10:53:32 +02:00
Manuel Raynaud
0efe393e3c Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
 2013-09-04 10:50:13 +02:00
Manuel Raynaud
d23190303c refactor name for updating actions 2013-09-04 10:48:59 +02:00
Etienne Roudeix
dffbf76cfd Merge branch 'master' into rewrite 
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql
 2013-09-04 10:06:22 +02:00
Etienne Roudeix
29bf7d9a92 404 not found management 2013-09-04 10:02:58 +02:00
franck
26da884dae Fixed minor bug in Currencies 2013-09-03 19:32:57 +02:00
franck
ec32aa9eb5 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
 2013-09-03 19:03:27 +02:00
franck
da7fcc4274 Added route methods 2013-09-03 18:58:51 +02:00
Manuel Raynaud
deee59244d address action implementation 2013-09-03 17:11:11 +02:00
Etienne Roudeix
a47ef40996 hot fix 2013-09-03 16:57:31 +02:00
Etienne Roudeix
ac1bb60b50 Merge branch 'master' into rewrite 2013-09-03 16:52:28 +02:00
Etienne Roudeix
43ff0b7297 rewriting 2013-09-03 16:51:41 +02:00
Manuel Raynaud
5c3ac1561d add address create controller and event 2013-09-03 16:13:17 +02:00
franck
fce528c41f Added AdminUtilities Smarty plugin, optimized templates 2013-09-03 15:43:05 +02:00
Manuel Raynaud
e4d59fc2e0 Merge branch 'master' of github.com:thelia/thelia 2013-09-03 11:28:13 +02:00
franck
e4c23adba6 Smarty inheritance in admin template. 2013-09-03 11:26:03 +02:00
Manuel Raynaud
1e6a31d1a3 Merge branch 'install' into reloadTask 2013-09-03 10:30:21 +02:00
Etienne Roudeix
2bc1dc0bec Merge branch 'master' into rewrite 2013-09-03 10:10:32 +02:00
Etienne Roudeix
3de03dc876 SID : rewriting 2013-09-03 10:09:51 +02:00
Manuel Raynaud
13ffbddc1b Merge branch 'master' into actions 2013-09-03 09:36:54 +02:00
Manuel Raynaud
50e585044f initialize step 2 2013-09-02 19:56:34 +02:00
Manuel Raynaud
384b0cd355 start to create install template 2013-09-02 17:27:11 +02:00
Manuel Raynaud
347d3050f3 add missinf files 2013-09-02 17:13:01 +02:00
Manuel Raynaud
39d17fe30d create BaseAdminController 2013-09-02 17:12:30 +02:00
Manuel Raynaud
ac5c6b9f5a create install router 2013-09-02 16:59:10 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00
Manuel Raynaud
3f078b8c81 add some phpdoc to customer front controller 2013-09-02 13:17:55 +02:00
franck
e1cc7162ae Added get/setLangId() method in session 2013-09-02 02:04:36 +02:00
franck
beab17a18d Refactored VariableXxxxx.php as ConfigXxxx.php 2013-09-02 01:37:12 +02:00
franck
1558f6af5f Added name duplication check when creating a variable 2013-09-02 01:25:11 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
franck
6d5d0f6606 Fixed getUrl() 2013-08-31 15:52:42 +02:00
franck
6aa2f80444 Intriducec BaseI18nLoop, started variable config management 2013-08-31 11:38:00 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
franck
cce270fdcc Factorized ModelCriterialTools calls in loops 2013-08-28 19:47:31 +02:00
franck
0361cd1ff2 Removed InternalEvent, simplified SecurityContext 2013-08-28 17:52:32 +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
Manuel Raynaud
0397f5fdf8 create customer login controller 2013-08-16 14:24:00 +02:00
Manuel Raynaud
4f31627301 refactor action customer 2013-08-16 14:04:44 +02:00
Manuel Raynaud
ab5e845ad3 start refactoring customer update process 2013-08-16 12:09:08 +02:00
Manuel Raynaud
115a7dd893 update schema.xml file 2013-08-16 11:21:57 +02:00
Manuel Raynaud
bc57e884ad add some phpdoc 2013-08-16 11:08:48 +02:00
Manuel Raynaud
382fbe230e update customer process creation 2013-08-16 11:01:32 +02:00
Manuel Raynaud
44249859ef create new customerEvent class 2013-08-16 10:35:46 +02:00
Manuel Raynaud
1db41a36ab /bin/bash: q : commande introuvable 2013-08-14 16:24:22 +02:00
Manuel Raynaud
ecb42e906b refactor update item eventListener 2013-08-14 15:55:06 +02:00
Manuel Raynaud
7918ce9723 refactor deleteArticle eventListener 2013-08-14 15:30:44 +02:00
Manuel Raynaud
32e7b334dd move form exception in Form namespace 2013-08-14 15:23:59 +02:00