Etienne Roudeix
|
417ed2e324
|
change signature
|
2013-11-08 14:35:29 +01:00 |
|
Etienne Roudeix
|
99ad2d6820
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-11-08 11:26:22 +01:00 |
|
Etienne Roudeix
|
422a80fcce
|
module modification
|
2013-11-08 11:26:06 +01:00 |
|
touffies
|
aa7efb0e9a
|
Issue 61
Add the newsletter registration on Register page
|
2013-11-07 12:35:34 +01:00 |
|
Franck Allimant
|
f8f68eb59b
|
Fixed minor internationalizable string error in admin templates.
|
2013-11-06 20:01:26 +01:00 |
|
Franck Allimant
|
8d40605091
|
Continued on translations
|
2013-11-06 14:40:33 +01:00 |
|
Manuel Raynaud
|
b1517945f4
|
Merge branch 'modules'
Conflicts:
core/lib/Thelia/Controller/Admin/BaseAdminController.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Thelia.php
|
2013-11-06 14:37:31 +01:00 |
|
Manuel Raynaud
|
6e5ae0f634
|
refactor render template process
|
2013-11-06 13:48:32 +01:00 |
|
Franck Allimant
|
ead038723f
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Core/Template/Loop/Template.php
|
2013-11-06 11:16:27 +01:00 |
|
Manuel Raynaud
|
2d291cf5a0
|
refactor how to assign template to parser
|
2013-11-06 11:12:39 +01:00 |
|
Franck Allimant
|
361e4a9d74
|
Implementing translations (still in progress)
|
2013-11-06 10:49:03 +01:00 |
|
touffies
|
bbcda888cf
|
Merge branch 'master' into frontend
Conflicts:
templates/default/I18n/fr_FR.php
|
2013-11-06 09:58:34 +01:00 |
|
touffies
|
5bf9050a12
|
Delete address with ajax callback function address.delete()
|
2013-11-05 17:33:55 +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 |
|
touffies
|
2e21713d40
|
Merge branch 'master' into frontend
|
2013-11-04 10:10:22 +01:00 |
|
Franck Allimant
|
2aefb87db7
|
Finished log configuration. All loggers are currentrly working
|
2013-11-01 16:15:19 +01:00 |
|
Etienne Roudeix
|
899a154350
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-31 15:33:30 +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
|
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 |
|
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 |
|
Etienne Roudeix
|
52fa6783f3
|
datepicker in admin logs
|
2013-10-30 12:00:48 +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 |
|
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 |
|
touffies
|
fb4fc4bb59
|
Modify the register route into the redirectToRoute
|
2013-10-28 13:00:33 +01:00 |
|
touffies
|
54e946ce82
|
Change login route
|
2013-10-28 12:59:17 +01:00 |
|
Etienne Roudeix
|
2eb5fc821c
|
mailing sytem admin
|
2013-10-28 12:24:59 +01:00 |
|
Manuel Raynaud
|
2c030f910b
|
fix cs
|
2013-10-25 10:07:21 +02:00 |
|
Etienne Roudeix
|
8043b50c75
|
new permission system in controllers
|
2013-10-25 08:59:09 +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 |
|
Manuel Raynaud
|
60683b7a32
|
Merge pull request #56 from thelia/frontend
Wrong name form used into updateAction (CustomerController)
|
2013-10-24 12:56:37 -07:00 |
|
touffies
|
29c2d543fb
|
Wrong name form used into updateAction (CustomerController)
|
2013-10-24 21:39:50 +02:00 |
|
Manuel Raynaud
|
a85c0a75cf
|
Merge pull request #55 from thelia/frontend
Frontend
|
2013-10-24 12:31:42 -07:00 |
|
Manuel Raynaud
|
97d3be6104
|
fix AdminResources constant in MessageController
|
2013-10-24 19:52:09 +02:00 |
|
touffies
|
64985faedc
|
small fix
|
2013-10-24 19:49:52 +02:00 |
|
touffies
|
b0fb0fdd43
|
I need the route cart.view for the OrderException.php file.
|
2013-10-24 19:39:54 +02:00 |
|
Manuel Raynaud
|
1f3315a3ec
|
Merge pull request #54 from thelia/frontend
Change some route to use the default
|
2013-10-24 10:18:03 -07:00 |
|
touffies
|
ca5d7d2a00
|
Change some route to use the default
$this->redirectToRoute('default', array('view'=>'cart'));
|
2013-10-24 18:51:49 +02:00 |
|
Manuel Raynaud
|
10f78b90a5
|
Merge pull request #49 from thelia/frontend
Frontend
|
2013-10-24 08:07:18 -07:00 |
|