gmorel
1b108b7953
Merge branch 'master' of git://github.com/thelia/thelia
...
* 'master' of git://github.com/thelia/thelia:
change max weight in faker
complete readme
create changelog file
Front module is activated by default
remove unused config
remove unused form
load custom router from Front module
move front controller classes to Front module
start Front module
Corrected the French translation of "Miss" in the Register form dropdown
remove unused config
remove unused form
load custom router from Front module
move front controller classes to Front module
start Front module
2013-11-18 22:12:56 +01:00
Manuel Raynaud
8b8e4f7b14
remove unused config
2013-11-18 10:51:46 +01:00
Manuel Raynaud
12ac005674
remove unused form
2013-11-18 10:51:46 +01:00
OpenStudio
89e0bf8867
move front controller classes to Front module
2013-11-18 10:51:46 +01:00
Manuel Raynaud
597da57252
start Front module
2013-11-18 10:51:46 +01:00
gmorel
a2b97707cf
Adding/Refactoring unit test
2013-11-17 19:59:29 +01:00
gmorel
274e667103
Adding/Refactoring unit test for MatchForEveryoneManager|MatchForTotalAmountManager|MatchForXArticlesManager
2013-11-17 18:46:22 +01:00
gmorel
ed1670a61b
Adding/Refactoring unit test for MatchForEveryoneManager|MatchForTotalAmountManager|MatchForXArticlesManager
2013-11-17 18:10:13 +01:00
gmorel
219ffdec99
Adding/Refactoring unit test for MatchForEveryoneManager|MatchForTotalAmountManager|MatchForXArticlesManager
2013-11-17 17:30:34 +01:00
gmorel
93c004bce2
Adding/Refactoring unit test for MatchForEveryOneManager
2013-11-17 00:27:21 +01:00
gmorel
a574a176bc
Adding/Refactoring unit test for ConditionFactory/ConditionManagerAbstract
2013-11-17 00:12:13 +01:00
gmorel
5679f54ec0
Adding/Refactoring unit test for ConditionFactory/ConditionManagerAbstract
2013-11-16 23:58:49 +01:00
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
