Commit Graph

643 Commits

Author SHA1 Message Date
Manuel Raynaud
1e6a31d1a3 Merge branch 'install' into reloadTask 2013-09-03 10:30:21 +02:00
Manuel Raynaud
13ffbddc1b Merge branch 'master' into actions 2013-09-03 09:36:54 +02:00
Manuel Raynaud
dce816d77c fix typo in phpdoc 2013-09-03 09:22:12 +02:00
Manuel Raynaud
29dc067076 complete test for foramt_number smarty function 2013-09-03 09:06:02 +02:00
Manuel Raynaud
1f50158398 test foramt_date without datetime object 2013-09-03 08:43:00 +02:00
Manuel Raynaud
7718c90e60 create foramt_number smarty function 2013-09-03 08:34:46 +02:00
Manuel Raynaud
0d261373f8 add some phpdoc 2013-09-03 00:05:37 +02:00
Manuel Raynaud
92b64db156 complete test for format_date smarty function 2013-09-02 23:51:51 +02:00
Manuel Raynaud
eeea885543 create new smarty function for displaying date in expected format 2013-09-02 23:36:34 +02:00
Manuel Raynaud
50e585044f initialize step 2 2013-09-02 19:56:34 +02:00
franck
5568f2dc62 Added missing CategoryEvent class 2013-09-02 17:34:11 +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
Manuel Raynaud
4e1cc9e810 start refacroting install process 2013-09-02 16:54:18 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00
Manuel Raynaud
7d0d1a90a1 create action install file 2013-09-02 15:10:29 +02:00
Manuel Raynaud
3f078b8c81 add some phpdoc to customer front controller 2013-09-02 13:17:55 +02:00
Manuel Raynaud
0ae5d00054 change module routing priority to 1 2013-09-02 10:09:40 +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
928bf7b638 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-02 00:18:29 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
Manuel Raynaud
ef8e98d415 add some phpdoc 2013-09-01 11:32:05 +02:00
franck
6d5d0f6606 Fixed getUrl() 2013-08-31 15:52:42 +02:00
franck
533f18bcec Typo :( 2013-08-31 11:39:14 +02:00
franck
6aa2f80444 Intriducec BaseI18nLoop, started variable config management 2013-08-31 11:38:00 +02:00
franck
d9d8190fa6 Fixed URL::absoluteUrl() 2013-08-30 19:56:24 +02:00
franck
a2d6c16d13 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	templates/default/login.html
2013-08-30 19:48:26 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
Etienne Roudeix
6fa4d3a923 rewriting 2013-08-30 16:47:13 +02:00
Etienne Roudeix
d8df46737d specific rewrittend url retrievement 2013-08-30 16:02:37 +02:00
Etienne Roudeix
c0a4b8b987 Merge branch 'master' into rewrite
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Attribute.php
	core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
	core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/Content.php
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Loop/Currency.php
	core/lib/Thelia/Core/Template/Loop/Feature.php
	core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Image.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Loop/Title.php
	core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
2013-08-30 15:02:48 +02:00
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
Etienne Roudeix
4ba16dc290 sid : rewriting 2013-08-30 09:13:54 +02:00
Etienne Roudeix
696b871acd start rewriting 2013-08-29 08:49:48 +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
253a0b76d8 rewriting tables 2013-08-28 15:55:38 +02:00
Etienne Roudeix
1de0e9f8a4 rewriting tables 2013-08-28 15:47:47 +02:00
Etienne Roudeix
61e13c416c rewriting tables 2013-08-28 15:35:10 +02:00
Etienne Roudeix
f54ff0f914 Merge branch 'master' into loops 2013-08-28 15:08:49 +02:00
franck
07849aa614 Added command for creating admin users on console 2013-08-28 14:23:50 +02:00
Etienne Roudeix
430baa6cda url output in loops 2013-08-26 14:44:39 +02:00
Etienne Roudeix
9174e5154e backend loop translation 2013-08-26 14:05:29 +02:00
Etienne Roudeix
96b3de7c84 backend trasnlation in loops 2013-08-26 12:38:23 +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