gmorel
|
90b5fbde05
|
Refactor removing Manager notion
|
2013-11-23 20:18:04 +01:00 |
|
gmorel
|
968bddbcf9
|
Fix Coupon/Condition refactor
|
2013-11-19 13:15:23 +01:00 |
|
OpenStudio
|
89e0bf8867
|
move front controller classes to Front module
|
2013-11-18 10:51:46 +01:00 |
|
Etienne Roudeix
|
8cd32aa5dd
|
Merge branch 'modules'
|
2013-11-14 12:04:20 +01:00 |
|
Etienne Roudeix
|
fa127ed4f0
|
colissimo module
|
2013-11-14 11:53:29 +01:00 |
|
Etienne Roudeix
|
48409c29a9
|
Colissimo in progress
|
2013-11-14 11:21:34 +01:00 |
|
Etienne Roudeix
|
299b192018
|
Colissimo module + countires areas
|
2013-11-14 09:13:28 +01:00 |
|
Manuel Raynaud
|
c5d6157cd5
|
change translation template baseDir
|
2013-11-13 16:27:36 +01:00 |
|
Etienne Roudeix
|
77760e7d3f
|
module template inclusion
|
2013-11-13 14:48:35 +01:00 |
|
touffies
|
d1b897a254
|
Merge branch 'master' into frontend
Conflicts:
core/lib/Thelia/Controller/Admin/OrderController.php
|
2013-11-12 11:20:46 +01:00 |
|
Franck Allimant
|
d2087b994a
|
Fixed customer edit routes
|
2013-11-09 19:38:38 +01:00 |
|
Franck Allimant
|
f6fc886d06
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Controller/Admin/CustomerController.php
|
2013-11-09 18:31:52 +01:00 |
|
Franck Allimant
|
ac74c1d61d
|
Refactored back-office customer management
|
2013-11-09 18:28:01 +01:00 |
|
touffies
|
15b1acd2e6
|
Remove duplicate request to get the $deliveryAddress
|
2013-11-08 16:28:16 +01:00 |
|
Etienne Roudeix
|
417ed2e324
|
change signature
|
2013-11-08 14:35:29 +01:00 |
|
touffies
|
10632f990b
|
Merge branch 'master' into frontend
|
2013-11-08 14:34:12 +01:00 |
|
Manuel Raynaud
|
e760cc28aa
|
end controller refactor
|
2013-11-08 11:48:08 +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 |
|
Manuel Raynaud
|
0f1e071967
|
remove unused controller
|
2013-11-08 10:04:33 +01:00 |
|
Manuel Raynaud
|
d80bf97b33
|
refactor pdf generator in front part
|
2013-11-08 09:59:46 +01:00 |
|
Manuel Raynaud
|
07b88266e9
|
refactor pdf generator
|
2013-11-08 09:41:20 +01:00 |
|
touffies
|
555040fcab
|
Add PDF for Order Details on the account page
|
2013-11-07 17:15:47 +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 |
|