gmorel
|
3a4bff634e
|
Adding/Refactoring unit test for ConditionEvaluator
|
2013-11-16 21:30:45 +01:00 |
|
Etienne Roudeix
|
8b8bae5bd7
|
fix module template inclusion
|
2013-11-15 16:51:13 +01:00 |
|
Etienne Roudeix
|
a4935a556c
|
fix modules bug
|
2013-11-15 16:35:29 +01:00 |
|
Etienne Roudeix
|
608b9159ce
|
Merge branch 'modules'
|
2013-11-15 12:19:41 +01:00 |
|
Etienne Roudeix
|
87b25b922e
|
configure button in module page
|
2013-11-15 12:19:06 +01:00 |
|
Manuel Raynaud
|
0e74337a7b
|
fix class name in module generation
|
2013-11-15 11:49:51 +01:00 |
|
Etienne Roudeix
|
79120528b5
|
fix unit tests search by id in loop bug
due to not visible first entry in database
|
2013-11-14 14:17:47 +01:00 |
|
Etienne Roudeix
|
8cd32aa5dd
|
Merge branch 'modules'
|
2013-11-14 12:04:20 +01:00 |
|
Etienne Roudeix
|
ff57fe3a5c
|
colissimo module
|
2013-11-14 12:03:28 +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 |
|
Franck Allimant
|
d42e77d475
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-11-13 16:31:03 +01:00 |
|
Franck Allimant
|
29ab422438
|
Fixed typos
|
2013-11-13 16:30:43 +01:00 |
|
Manuel Raynaud
|
c5d6157cd5
|
change translation template baseDir
|
2013-11-13 16:27:36 +01:00 |
|
Manuel Raynaud
|
a276fe11a6
|
fix typo
|
2013-11-13 15:15:53 +01:00 |
|
Manuel Raynaud
|
b965275425
|
check extensions in install process
|
2013-11-13 15:14:06 +01:00 |
|
Etienne Roudeix
|
77760e7d3f
|
module template inclusion
|
2013-11-13 14:48:35 +01:00 |
|
Etienne Roudeix
|
25192cf366
|
change template subdirs
|
2013-11-13 10:24:14 +01:00 |
|
Etienne Roudeix
|
8719c05acc
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-11-12 16:01:08 +01:00 |
|
Etienne Roudeix
|
3b1d318d12
|
module edition
|
2013-11-12 16:00:52 +01:00 |
|
Manuel Raynaud
|
cbe5ba27cf
|
change developmentMode by debugMode in assetManager
|
2013-11-12 12:41:01 +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
|
3ca3b4521b
|
The asset manager is now a service in the container.
|
2013-11-12 02:12:56 +01:00 |
|
Franck Allimant
|
d941134c84
|
Implemented new assets generation system (cssembed no more required)
|
2013-11-12 01:32:29 +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
|
be9aba9fb8
|
fix stuff + module management
|
2013-11-08 15:11:45 +01:00 |
|
touffies
|
c235ad931a
|
Add order argument
|
2013-11-08 15:03:40 +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 |
|
Franck Allimant
|
85ea937570
|
Optimisation of THELIA_* constants usage
|
2013-11-08 11:22:26 +01:00 |
|
Manuel Raynaud
|
41d8fce23b
|
remove test route
|
2013-11-08 10:04:53 +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 |
|
Franck Allimant
|
9f211a5dcb
|
Fixed Issue #97
|
2013-11-07 20:01:10 +01:00 |
|
touffies
|
555040fcab
|
Add PDF for Order Details on the account page
|
2013-11-07 17:15:47 +01:00 |
|
Manuel Raynaud
|
6b0973a7ec
|
change request class in BaseModule
|
2013-11-07 16:53:49 +01:00 |
|
Manuel Raynaud
|
3945504387
|
fix use statement in BaseModuleInterface
|
2013-11-07 16:50:52 +01:00 |
|
Manuel Raynaud
|
2697ff1569
|
Merge pull request #99 from thelia/frontend
Frontend
|
2013-11-07 07:20:46 -08:00 |
|
Franck Allimant
|
528372855f
|
Refactired Modules classes and interface architecture
|
2013-11-07 15:08:01 +01:00 |
|
Franck Allimant
|
d2a9de682d
|
Fixed file list bug
|
2013-11-07 14:57:18 +01:00 |
|
touffies
|
aa7efb0e9a
|
Issue 61
Add the newsletter registration on Register page
|
2013-11-07 12:35:34 +01:00 |
|
touffies
|
7fa17215f6
|
ISSUE 63 - Newsletter registration : error message
|
2013-11-07 11:57:43 +01:00 |
|