franck
|
a0f09057c4
|
Added Templates events
|
2013-09-13 20:21:47 +02:00 |
|
franck
|
ca7d1f7c85
|
Finished attributes management
|
2013-09-13 00:19:53 +02:00 |
|
franck
|
316043d93a
|
Fixed action column alignment
|
2013-09-13 00:18:19 +02:00 |
|
franck
|
7cd44c3867
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-13 00:16:56 +02:00 |
|
franck
|
6a66a3f99a
|
Fixed duplication parameter check regexp
|
2013-09-13 00:16:29 +02:00 |
|
franck
|
d1d9892ae8
|
absoluteUrl prevetn duplicate parameters in generated URL
|
2013-09-12 22:10:51 +02:00 |
|
Manuel Raynaud
|
a241c4d587
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-12 17:28:20 +02:00 |
|
Manuel Raynaud
|
bad8a0439d
|
fix test suite
|
2013-09-12 17:28:02 +02:00 |
|
Etienne Roudeix
|
e7368fa9f0
|
Merge branch 'master' into loops
|
2013-09-12 17:21:13 +02:00 |
|
Etienne Roudeix
|
a73c9e1de4
|
fix current url bug + fix empty loop pagination exception
|
2013-09-12 17:20:33 +02:00 |
|
Manuel Raynaud
|
0ca5af597a
|
add accessDenied method
|
2013-09-12 16:50:13 +02:00 |
|
Manuel Raynaud
|
2bf6ee51e1
|
add helper checkXmlHttpRequest
|
2013-09-12 16:45:32 +02:00 |
|
Manuel Raynaud
|
22f42c8d9c
|
don't delete address if this is address is a default one
|
2013-09-12 16:21:01 +02:00 |
|
Manuel Raynaud
|
b9338a7717
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-12 15:44:29 +02:00 |
|
Manuel Raynaud
|
d6e1f99b35
|
Merge branch 'template'
Conflicts:
templates/admin/default/customer-edit.html
|
2013-09-12 15:44:23 +02:00 |
|
franck
|
8ad0dc7b21
|
AttributesAv management
|
2013-09-12 15:43:37 +02:00 |
|
Manuel Raynaud
|
7dbfb052f1
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-12 15:41:04 +02:00 |
|
Manuel Raynaud
|
c9e455e3ea
|
update cart model
|
2013-09-12 15:40:49 +02:00 |
|
franck
|
83f4e8b356
|
Using "update" instead of "change"
|
2013-09-12 14:20:23 +02:00 |
|
franck
|
3f82421879
|
Finished admin controllers refactoriing
|
2013-09-12 13:39:47 +02:00 |
|
franck
|
14e0eff0f5
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Core/Event/TheliaEvents.php
templates/admin/default/admin-layout.tpl
|
2013-09-12 13:04:12 +02:00 |
|
franck
|
c85ec2a9e3
|
Created AbstractCrudController, and refactored existing controllers
|
2013-09-12 13:02:40 +02:00 |
|
franck
|
0671c2ce7d
|
Continuer attributes management
|
2013-09-12 13:01:04 +02:00 |
|
mespeche
|
eeee25d6f5
|
Change script file declaration order for bootstrap-editable fix
|
2013-09-12 12:52:13 +02:00 |
|
mespeche
|
024866a445
|
Delete form on the orders view
|
2013-09-12 12:49:11 +02:00 |
|
Manuel Raynaud
|
485e6dc29b
|
translate error message
|
2013-09-12 12:43:44 +02:00 |
|
mespeche
|
2163121a1a
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-12 12:41:30 +02:00 |
|
mespeche
|
c64b987e9b
|
- Creation of order-edit view
|
2013-09-12 12:40:46 +02:00 |
|
Manuel Raynaud
|
9856528a94
|
valid customer removal
|
2013-09-12 12:40:14 +02:00 |
|
Etienne Roudeix
|
3115ee006d
|
pse ref in faker
|
2013-09-12 11:59:45 +02:00 |
|
Etienne Roudeix
|
d5004071c9
|
pse ref
|
2013-09-12 11:56:00 +02:00 |
|
Etienne Roudeix
|
b698d1aada
|
loop tests
|
2013-09-12 11:35:27 +02:00 |
|
Etienne Roudeix
|
f75b6e876c
|
test product loop limit
|
2013-09-12 11:28:32 +02:00 |
|
Manuel Raynaud
|
5d87e48ba0
|
update customer general info
|
2013-09-12 11:24:24 +02:00 |
|
Etienne Roudeix
|
e81b894816
|
fix tests
|
2013-09-12 10:58:12 +02:00 |
|
Etienne Roudeix
|
d61f3a6a1e
|
product loop test
|
2013-09-12 10:48:27 +02:00 |
|
Manuel Raynaud
|
4b643a7a9e
|
remove not needed flag in customer part
|
2013-09-12 10:12:22 +02:00 |
|
Manuel Raynaud
|
6fea7ef441
|
change method to retrieve data in customer create process
|
2013-09-12 09:48:24 +02:00 |
|
Manuel Raynaud
|
6b9db1a162
|
create test for customer creation
|
2013-09-12 09:23:50 +02:00 |
|
Manuel Raynaud
|
9304624708
|
fix title name in insert.sql file
|
2013-09-12 08:12:44 +02:00 |
|
Manuel Raynaud
|
10f97a7348
|
update faker, insert plenty of customers
|
2013-09-11 20:43:44 +02:00 |
|
Etienne Roudeix
|
e8ced10dbb
|
fix template
|
2013-09-11 20:22:29 +02:00 |
|
Etienne Roudeix
|
ca16aa251e
|
Merge branch 'master' into tax
|
2013-09-11 20:19:10 +02:00 |
|
Etienne Roudeix
|
c35de47f10
|
fix taxengine tests
|
2013-09-11 20:18:34 +02:00 |
|
Etienne Roudeix
|
fa5c1aaefc
|
tax engine
|
2013-09-11 19:01:23 +02:00 |
|
Manuel Raynaud
|
3e301a9fc1
|
creating account page
|
2013-09-11 18:57:49 +02:00 |
|
gmorel
|
4b8805c29a
|
Merge remote-tracking branch 'origin/master'
|
2013-09-11 17:48:06 +02:00 |
|
gmorel
|
d846d10832
|
Working
- CasperJS : coupon rule
|
2013-09-11 17:47:52 +02:00 |
|
Manuel Raynaud
|
591f952287
|
Merge branch 'template'
|
2013-09-11 17:26:34 +02:00 |
|
Manuel Raynaud
|
67b5fab53f
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-11 17:24:46 +02:00 |
|