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
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
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
touffies
297d906027
Merge branch 'master' into frontend
...
Conflicts:
core/lib/Thelia/Controller/Admin/OrderController.php
2013-11-12 11:09:55 +01:00
touffies
1619ad4a80
Use CDN to load respond.js library instead of local file
2013-11-12 10:33:57 +01:00
Manuel Raynaud
cf8bc33606
remove fake stat
2013-11-12 10:26:21 +01:00
Manuel Raynaud
fdd8d306a8
remove font in web dir
2013-11-12 10:25:57 +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
touffies
b5bd38b2aa
Show dropdown chevron-down only if js is enable
2013-11-08 15:43:52 +01:00
Etienne Roudeix
be9aba9fb8
fix stuff + module management
2013-11-08 15:11:45 +01:00
touffies
fe76d4ae96
User without javascript enabled will be able to see these 2 pages to switch language or currency
2013-11-08 15:11:44 +01:00
touffies
db75c31054
Hide carousel arrow (Next/Prev) if the user doesn't have js enabled
2013-11-08 15:09:17 +01:00
