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

1640 Commits

Author SHA1 Message Date
Manuel Raynaud
d7012af3e2 add translation files for thelia core system 2013-11-04 09:28:12 +01:00
Etienne Roudeix
95be087b90 review jqplot 2013-10-31 16:09:31 +01:00
Etienne Roudeix
689de106c7 admin home stats 2013-10-31 16:09:31 +01:00
Etienne Roudeix
bc454124f3 admin home stats 2013-10-31 16:09:31 +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
Manuel Raynaud
5be233c079 set default locale to null in translator 2013-10-31 09:52:06 +01:00
Manuel Raynaud
1e549c2b8f change default locale in config.xml for translator 2013-10-31 09:39:22 +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
Manuel Raynaud
86d84462ad clean some code in FileController 2013-10-30 16:13:06 +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
c327b20fd6 change command line for creating new administrator 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
9d011eb5c6 change command line for creating new administrator 2013-10-30 14:46:21 +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
e9013a0c3f Merge branch 'master' of github.com:thelia/thelia 2013-10-30 10:15:33 +01:00
Manuel Raynaud
8f90018f04 set smarty force compile to false in non debug mode 2013-10-30 10:15:07 +01:00
Etienne Roudeix
19e373f7fe Merge branch 'master' of github.com:thelia/thelia 2013-10-29 16:10:10 +01:00
Etienne Roudeix
a055f3b3eb admin log 2013-10-29 16:09:50 +01:00
Manuel Raynaud
c74422f5dc implement module inclusion 2013-10-29 15:56:03 +01:00
Etienne Roudeix
082f9aff8d admin logs 2013-10-29 12:22:34 +01:00
Manuel Raynaud
7a2469cdc8 allow to create a customer in bakcoffice 2013-10-28 16:55:07 +01:00
Etienne Roudeix
2eb5fc821c mailing sytem admin 2013-10-28 12:24:59 +01:00
Manuel Raynaud
51cd9f4ee8 Merge branch 'master' into frontend 
Conflicts:
	templates/default/layout.tpl
 2013-10-25 14:51:34 +02:00
touffies
d9a2855084 Issue 79 : English error 2013-10-25 14:03:54 +02: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
e33ed5047f check if email contact eists before sending emails 2013-10-25 11:52:46 +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