gmorel
af578cc3ba
Merge branch 'master' of git://github.com/thelia/thelia
...
* 'master' of git://github.com/thelia/thelia:
Fixed typo
2013-11-19 21:16:04 +01:00
Franck Allimant
9598082c00
Merge branch 'master' of https://github.com/thelia/thelia
2013-11-19 15:35:35 +01:00
Franck Allimant
46d95664a0
Fixed typo
2013-11-19 15:35:15 +01:00
gmorel
5b2bdff2b7
Merge branch 'master' of git://github.com/thelia/thelia
...
* 'master' of git://github.com/thelia/thelia:
Add warning message if there's no delivery method available
Optimisation slider image
2013-11-19 13:15:43 +01:00
gmorel
968bddbcf9
Fix Coupon/Condition refactor
2013-11-19 13:15:23 +01:00
Manuel Raynaud
0c40248f06
Merge pull request #108 from thelia/frontend
...
Frontend
2013-11-19 01:37:41 -08:00
touffies
5b653cca32
Add warning message if there's no delivery method available
2013-11-19 09:30:35 +01:00
touffies
15ff5e422e
Optimisation slider image
2013-11-19 09:29:59 +01:00
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
d6bf64f7a6
change max weight in faker
2013-11-18 15:04:00 +01:00
Manuel Raynaud
a7d274b4c6
complete readme
2013-11-18 11:51:37 +01:00
Manuel Raynaud
2a3d55a63a
create changelog file
2013-11-18 11:40:31 +01:00
Manuel Raynaud
8d956f0c2c
Merge pull request #107 from thelia/front_refactor
...
Front part is now a module
2013-11-18 01:58:14 -08:00
Manuel Raynaud
7765198d67
Merge branch 'front_refactor' of github.com:thelia/thelia into front_refactor
2013-11-18 10:52:59 +01:00
Manuel Raynaud
b39f0fd936
Front module is activated by default
2013-11-18 10:51:46 +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
Manuel Raynaud
9446b33ee7
load custom router from Front module
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
etienne roudeix
26ab45b8b7
Merge pull request #105 from moustikAir/patch-1
...
Corrected the French translation of "Miss" in the Register form dropdown
2013-11-17 09:31:23 -08: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
David
54d5e98971
Corrected the French translation of "Miss" in the Register form dropdown
...
Corrected French translation of Miss from "Madamemoiselle" to "Mademoiselle"
2013-11-17 01:01:01 +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
gmorel
673b780c18
Merge branch 'master' of git://github.com/thelia/thelia
...
* 'master' of git://github.com/thelia/thelia: (126 commits)
fix module template inclusion
fix modules bug
configure button in module page
fix class name in module generation
fix unit tests search by id in loop bug due to not visible first entry in database
colissimo
colissimo module
colissimo module
Colissimo in progress
Colissimo proces
Colissimo module + countires areas
Fixed typos
change translation template baseDir
fix typo
check extensions in install process
module template inclusion
change template subdirs
admin for colissimo
module edition
ISSUE 100 : Information has no plural (Fix front)
...
2013-11-16 17:30:47 +01:00
Manuel Raynaud
dadf17e4ed
remove unused config
2013-11-15 17:37:07 +01:00
Manuel Raynaud
277d8bb091
remove unused form
2013-11-15 17:19:56 +01:00
Manuel Raynaud
38ec9864ca
load custom router from Front module
2013-11-15 17:08:54 +01:00
Etienne Roudeix
8b8bae5bd7
fix module template inclusion
2013-11-15 16:51:13 +01:00
OpenStudio
9325defda7
move front controller classes to Front module
2013-11-15 16:43:58 +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
9dd57665be
start Front module
2013-11-15 12:06:34 +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
b2bb8791f9
colissimo
2013-11-14 13:55:44 +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
e8b4a4ac74
Colissimo proces
2013-11-14 09:22:56 +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
