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
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
c9b161f708
Merge pull request #104 from thelia/install
...
check php extension loaded in install process
2013-11-13 06:41:18 -08: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
2da2a2d6c1
admin for colissimo
2013-11-13 10:08:43 +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
4c71849c1d
Merge pull request #103 from thelia/frontend
...
Frontend
2013-11-12 05:36:09 -08:00
touffies
3d73118092
ISSUE 100 : Information has no plural (Fix front)
2013-11-12 14:01:34 +01:00
touffies
34376a0bb9
Change the way we select the invoice address to be able to modify the choice if the user has js disabled
2013-11-12 13:52:43 +01:00
Manuel Raynaud
cbe5ba27cf
change developmentMode by debugMode in assetManager
2013-11-12 12:41:01 +01:00
touffies
a703a37560
Hide toolbar elements (sorter and limiter ) if javascript is disabled
2013-11-12 12:04:36 +01:00
touffies
35dfcd42be
Add Update Qty button for user with javascript disabled
2013-11-12 11:46:36 +01:00
Manuel Raynaud
e0ede11fc5
Merge pull request #102 from thelia/frontend
...
Frontend
2013-11-12 02:36:44 -08:00
touffies
28900df9c4
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
2013-11-12 11:21:13 +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
Manuel Raynaud
4df81bd813
Merge pull request #101 from thelia/frontend
...
Frontend
2013-11-12 02:16:42 -08:00
