touffies
|
bbcda888cf
|
Merge branch 'master' into frontend
Conflicts:
templates/default/I18n/fr_FR.php
|
2013-11-06 09:58:34 +01:00 |
|
Manuel Raynaud
|
1ccd2e63ce
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-11-06 09:30:17 +01:00 |
|
touffies
|
5bf9050a12
|
Delete address with ajax callback function address.delete()
|
2013-11-05 17:33:55 +01:00 |
|
Manuel Raynaud
|
833472e6eb
|
complete french translation
|
2013-11-05 15:59:14 +01:00 |
|
touffies
|
0431010a65
|
Missing class Translator
|
2013-11-05 15:46:38 +01:00 |
|
touffies
|
542a8c5d20
|
Allow to update the label address
|
2013-11-05 14:59:15 +01:00 |
|
Quentin Dufour
|
3e1a08dc6c
|
Correcting some typos
|
2013-11-04 17:37:23 +01:00 |
|
touffies
|
65a8953143
|
Profile and Useful was misspelled
Add missing language key into the dictionary
|
2013-11-04 16:35:01 +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
|
3e681a7419
|
fix issue on command line when thelia is still not installed
|
2013-11-04 12:13:26 +01:00 |
|
touffies
|
2e21713d40
|
Merge branch 'master' into frontend
|
2013-11-04 10:10:22 +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
|
069b047801
|
Added size limitation to the Thelia log file
|
2013-11-01 16:45:25 +01:00 |
|
Franck Allimant
|
2aefb87db7
|
Finished log configuration. All loggers are currentrly working
|
2013-11-01 16:15:19 +01:00 |
|
Franck Allimant
|
3368590a86
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-10-31 16:46:20 +01:00 |
|
Franck Allimant
|
a0855cda4c
|
Added System Log configuration routes
|
2013-10-31 16:46:04 +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 |
|
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 |
|
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 |
|
Etienne Roudeix
|
f90df03f7d
|
admin home stats
|
2013-10-30 17:00:38 +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
|
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 |
|