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

184 Commits

Author SHA1 Message Date
Etienne Roudeix
a0f894d70f customer substitutions 2013-09-05 17:54:04 +02:00
Manuel Raynaud
40b524e9d6 add label_attr attribute to form smarty plugin 2013-09-05 14:22:28 +02:00
mespeche
f4c2f865e4 Working : clean of currency-edit page 2013-09-05 11:29:07 +02:00
mespeche
91670d8347 Working : Add of bootstrap-editable in good directories 2013-09-05 11:14:31 +02:00
mespeche
5d6f01d338 Working : Clean of currencies list and storage bootstrap-editable 2013-09-05 11:12:18 +02:00
mespeche
75513c778a Working : New version of bootstrap-editable + Update of currency pages to bootstrap3 2013-09-05 09:56:06 +02:00
franck
58a68b1959 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-04 19:03:37 +02:00
franck
d3a287333e Fixed TheliaLoop Smarty plugin (lopp imbrication was broken) 2013-09-04 19:02:26 +02:00
Manuel Raynaud
3f405d1ce9 Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
 2013-09-04 17:57:41 +02:00
Manuel Raynaud
ceb02841e1 validate create and update address in front context 2013-09-04 17:52:58 +02:00
franck
866036a0bf Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/css/admin.less
	templates/admin/default/currencies.html
	templates/admin/default/general_error.html
	templates/admin/default/messages.html
	templates/admin/default/variables.html
 2013-09-04 17:40:34 +02:00
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
mespeche
ba645764fc Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	reset_install.sh
 2013-09-04 16:05:25 +02:00
franck
02a1b5c655 Event harmonization with MRA 2013-09-04 15:45:46 +02:00
mespeche
fec1b57aea Working : Cleanup admin new version bootstrap v3 2013-09-04 15:34:29 +02:00
mespeche
7258b24c88 Working : Finish renaming class for bootstrap migration 2013-09-04 15:05:49 +02:00
Etienne Roudeix
f10294fee2 Merge branch 'rewrite' 2013-09-04 14:45:57 +02:00
Etienne Roudeix
e1965a5145 global outputs in loops 2013-09-04 14:45:14 +02:00
mespeche
dafaa02718 Working : Major class changes migration from bootstrap 2.x to 3.0 2013-09-04 11:35:22 +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
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
7128739da5 Finished currency edition 2013-09-03 19:03:54 +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
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
Manuel Raynaud
50e585044f initialize step 2 2013-09-02 19:56:34 +02:00
Manuel Raynaud
73508028b4 create layout for install template 2013-09-02 17:44:22 +02:00
Manuel Raynaud
384b0cd355 start to create install template 2013-09-02 17:27:11 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +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
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
e63ff065c7 product page 2013-08-30 15:04:08 +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
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
Etienne Roudeix
f8dfa64059 load test 2013-08-26 16:38:56 +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
Etienne Roudeix
2d810540ec loop review 2013-08-23 12:37:18 +02:00