Manuel Raynaud
|
d7012af3e2
|
add translation files for thelia core system
|
2013-11-04 09:28:12 +01:00 |
|
Manuel Raynaud
|
c1cfc086a1
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-31 16:52:21 +01:00 |
|
Etienne Roudeix
|
1bcec28841
|
remove tax js in profiles
|
2013-10-31 16:24:57 +01:00 |
|
Etienne Roudeix
|
26c7acbeaa
|
admoin home stats navigation
|
2013-10-31 16:09:31 +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
|
99dc559484
|
update translation files for admin part
|
2013-10-31 16:08:54 +01:00 |
|
Manuel Raynaud
|
5110abe207
|
create translation files for admin part
|
2013-10-31 15:46:36 +01:00 |
|
Manuel Raynaud
|
bbae85156b
|
create translation files
|
2013-10-31 15:44:07 +01:00 |
|
Etienne Roudeix
|
899a154350
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-31 15:33:30 +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 |
|
Etienne Roudeix
|
07c5dd4a51
|
admoin home stats navigation
|
2013-10-31 11:59:25 +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 |
|
Etienne Roudeix
|
00dab8e7ec
|
review jqplot
|
2013-10-31 11:20:51 +01:00 |
|
Etienne Roudeix
|
e5f5570d2b
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-31 11:20:42 +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 |
|
Franck Allimant
|
3019d36356
|
Minor adjustements
|
2013-10-30 17:31:02 +01:00 |
|
Etienne Roudeix
|
f90df03f7d
|
admin home stats
|
2013-10-30 17:00:38 +01:00 |
|
Franck Allimant
|
c7835758e5
|
Minor css tuning, renamed "details" tab of categories edition to
associaitons
|
2013-10-30 16:32:36 +01:00 |
|
Etienne Roudeix
|
083dde5e93
|
admin home stats
|
2013-10-30 16:32:24 +01:00 |
|
Manuel Raynaud
|
86d84462ad
|
clean some code in FileController
|
2013-10-30 16:13:06 +01:00 |
|
Franck Allimant
|
9f11f475ee
|
Typo
|
2013-10-30 15:47:21 +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 |
|
Etienne Roudeix
|
a540c50395
|
fix administrators management bug
|
2013-10-30 14:51:13 +01:00 |
|
Manuel Raynaud
|
9d011eb5c6
|
change command line for creating new administrator
|
2013-10-30 14:46:21 +01:00 |
|
Etienne Roudeix
|
434092a33b
|
admin login is now unique
|
2013-10-30 14:45:50 +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 |
|
Manuel Raynaud
|
b8dad621fd
|
remove temporary home carousel
|
2013-10-30 12:19:14 +01:00 |
|
Etienne Roudeix
|
e998717c9b
|
remove not working datepicker in coupons
|
2013-10-30 12:02:50 +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 |
|