TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,269 Commits 1 Branch 0 Tags
48502e04e486f8e39774f53cfbb8a718ede73f4f
Commit Graph

886 Commits

Author SHA1 Message Date
Etienne Roudeix
48502e04e4 phpdoc 2013-11-06 10:42:34 +01:00
Etienne Roudeix
b9babff070 comment 2013-11-06 10:28:29 +01:00
Etienne Roudeix
488ee3e8f4 lil loop refactor 2013-11-06 10:26:29 +01:00
Etienne Roudeix
06ee460e8a Merge branch 'master' of github.com:thelia/thelia 2013-11-04 16:16:21 +01:00
Etienne Roudeix
969c077f81 admin home stats and information 2013-11-04 16:15:48 +01:00
Manuel Raynaud
6d1576faf8 test if request is an active scope in tra nslator 2013-11-04 14:47:18 +01:00
Manuel Raynaud
b65044c1be Merge branch 'master' of github.com:thelia/thelia 2013-11-04 09:28:36 +01:00
Manuel Raynaud
d7012af3e2 add translation files for thelia core system 2013-11-04 09:28:12 +01:00
Franck Allimant
f3cba323c6 Changed 'template' loop into 'product-template' loop 2013-11-02 19:18:19 +01:00
Franck Allimant
2aefb87db7 Finished log configuration. All loggers are currentrly working 2013-11-01 16:15:19 +01:00
Manuel Raynaud
af5d28ac6e Merge branch 'master' of github.com:thelia/thelia 2013-10-31 14:09:41 +01:00
Manuel Raynaud
696d67805d finish to implement translation 2013-10-31 12:43:29 +01:00
Franck Allimant
3b9f94cec8 Using now templates instead of hard code in AdminUtilities smarty plugin 2013-10-31 12:16:14 +01:00
Manuel Raynaud
453575eeae create compiler for loading translation.loader tag 2013-10-31 11:48:18 +01:00
Franck Allimant
a295fee0d3 Changed ModulesAdmin dir into AdminIncludes - Updated debug bar module 2013-10-31 11:36:56 +01:00
Manuel Raynaud
1ce6dfe04d explode master config file. Now each xml file file presents in master 
config is parse
 2013-10-31 11:21:26 +01:00
Manuel Raynaud
8abe56458f retrieve local from session in translator 2013-10-31 10:02:13 +01:00
Franck Allimant
a06d83bfb4 Fixed exception if module content is empty 2013-10-30 20:10:37 +01:00
Franck Allimant
d1c54ea62a Merge branch 'catalog' 
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
 2013-10-30 19:55:10 +01:00
Franck Allimant
f5828dc18b added timestamp parameter to format_date sparty plugin 2013-10-30 19:52:47 +01:00
Franck Allimant
a11a013eb0 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-30 15:44:57 +01:00
Franck Allimant
0cabe7b9e8 Combination creation management 2013-10-30 15:44:32 +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
7caa0a10e6 create administrator update password event 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
2ee90d35e4 create administrator update password event 2013-10-30 14:27:45 +01:00
Etienne Roudeix
457c0460cf Merge branch 'master' of github.com:thelia/thelia 2013-10-30 12:28:30 +01:00
Etienne Roudeix
52fa6783f3 datepicker in admin logs 2013-10-30 12:00:48 +01:00
Manuel Raynaud
8f90018f04 set smarty force compile to false in non debug mode 2013-10-30 10:15:07 +01:00
Manuel Raynaud
c74422f5dc implement module inclusion 2013-10-29 15:56:03 +01:00
Etienne Roudeix
2eb5fc821c mailing sytem admin 2013-10-28 12:24:59 +01:00
Manuel Raynaud
de147b7b0c change visibility parameter in content and folder loops 2013-10-25 12:24:47 +02:00
Manuel Raynaud
8196349ceb change visibility parameter in category loop 2013-10-25 12:23:50 +02:00
Manuel Raynaud
e26c8fdd7c Merge branch 'master' of github.com:thelia/thelia 2013-10-25 11:29:00 +02:00
Manuel Raynaud
7ca339492f fix test suite 2013-10-25 11:21:39 +02:00
Etienne Roudeix
cc3aa39cae fix product loop 2013-10-25 11:18:20 +02:00
Manuel Raynaud
0d8c4f97a1 return empty value instead of throwing an exception for format_number 
smarty function
 2013-10-25 10:54:53 +02:00
Manuel Raynaud
3c4525d6d6 fix product loop 2013-10-25 10:52:41 +02:00
Manuel Raynaud
936af2ec91 return empty value instead of throwing an exception for format_date 
smarty function
 2013-10-25 10:43:40 +02:00
Manuel Raynaud
2c030f910b fix cs 2013-10-25 10:07:21 +02:00
Manuel Raynaud
373fe13287 save thelia version 2013-10-25 09:10:27 +02:00
Franck Allimant
d9fc945015 Added TAX_RUl_ID to simple part of product loop 2013-10-25 00:46:25 +02:00
Franck Allimant
0d50557269 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-25 00:33:52 +02:00
Franck Allimant
06cc8ce1ea Finished product combinations edition 2013-10-25 00:32:56 +02:00
Etienne Roudeix
d8611c2965 admin search in customer and products 2013-10-24 20:26:00 +02:00
Etienne Roudeix
6ea61ff68c searchLoopInterface + use in OrderLoop 2013-10-24 19:50:09 +02:00
Etienne Roudeix
32725832f1 Merge branch 'master' of github.com:thelia/thelia 2013-10-24 17:42:22 +02:00