Manuel Raynaud
|
ccf35dd37c
|
start creating lost password template
|
2013-09-11 16:28:26 +02:00 |
|
Etienne Roudeix
|
e8a4e56324
|
tax engine
|
2013-09-11 16:21:51 +02:00 |
|
Manuel Raynaud
|
b03eb969ca
|
add logo for beta version
|
2013-09-11 16:18:58 +02:00 |
|
Manuel Raynaud
|
755bf40b56
|
change metadata for product part
|
2013-09-11 16:05:05 +02:00 |
|
Manuel Raynaud
|
c1edc0e4ff
|
update phpdebugbar dependency
|
2013-09-11 15:48:55 +02:00 |
|
gmorel
|
c8b5b9e9fa
|
Working
- add tests casper JS
|
2013-09-11 15:35:25 +02:00 |
|
Manuel Raynaud
|
91f5cb12cd
|
Merge branch 'master' into template
|
2013-09-11 15:28:38 +02:00 |
|
Manuel Raynaud
|
769993cc96
|
add TimeDataCollector
|
2013-09-11 15:26:47 +02:00 |
|
mespeche
|
1f7d8a20b3
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-11 15:24:01 +02:00 |
|
mespeche
|
59e1981e9f
|
- Add orders view route
- Add view & action for orders index
|
2013-09-11 15:23:04 +02:00 |
|
Manuel Raynaud
|
1ec9e7486d
|
just add Propel information in phpDebugBar
|
2013-09-11 15:21:43 +02:00 |
|
franck
|
36d2b873ff
|
Removed a redondant "use"
|
2013-09-11 15:08:56 +02:00 |
|
franck
|
2a93ebb947
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-11 15:06:56 +02:00 |
|
Manuel Raynaud
|
ec24586232
|
add some information in propelcollector
|
2013-09-11 15:04:47 +02:00 |
|
gmorel
|
870612f51c
|
WIP
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
|
2013-09-11 14:43:09 +02:00 |
|
gmorel
|
a9dae509c7
|
WIP
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
|
2013-09-11 14:40:55 +02:00 |
|
mespeche
|
e02ed4d654
|
Add tooltip
|
2013-09-11 14:36:32 +02:00 |
|
Manuel Raynaud
|
858cc7f4f2
|
validate customer creation form
|
2013-09-11 14:32:57 +02:00 |
|
mespeche
|
d21e4532c9
|
- Add creation address form
- Add addresses list
- Add update address form
|
2013-09-11 13:32:21 +02:00 |
|
Manuel Raynaud
|
e1d48d2a28
|
finish registration form
|
2013-09-11 12:30:05 +02:00 |
|
franck
|
36f9a5c1c6
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-11 12:15:24 +02:00 |
|
franck
|
ae786f2139
|
Added process_assets config variable
|
2013-09-11 12:14:39 +02:00 |
|
mespeche
|
f50d41b32c
|
Change breadcrumb separator color
|
2013-09-11 11:46:50 +02:00 |
|
mespeche
|
abb501af29
|
Add breadcrumb to customers view
|
2013-09-11 11:43:49 +02:00 |
|
mespeche
|
b430dee9ac
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-11 11:41:06 +02:00 |
|
mespeche
|
953bf005a1
|
- Change boolean type to integer type for update_logged_in_user field
- Create view for customer modification
|
2013-09-11 11:39:33 +02:00 |
|
Etienne Roudeix
|
551c132b76
|
syntax
|
2013-09-11 11:14:54 +02:00 |
|
franck
|
9473f2752f
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-11 11:08:50 +02:00 |
|
Manuel Raynaud
|
d7f789188c
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-11 11:06:02 +02:00 |
|
franck
|
77d7587fb7
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-11 11:05:52 +02:00 |
|
Manuel Raynaud
|
e2a5ee90ff
|
use ROUTER::ABSOLUTE_URL by default
|
2013-09-11 11:03:35 +02:00 |
|
Etienne Roudeix
|
d24316feeb
|
Merge branch 'master' into tax
|
2013-09-11 11:01:37 +02:00 |
|
Etienne Roudeix
|
c11821153c
|
PSE loop todo
|
2013-09-11 11:00:55 +02:00 |
|
Etienne Roudeix
|
3d31090344
|
currency management in PSE loop
|
2013-09-11 10:51:44 +02:00 |
|
franck
|
3484d2eb4c
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-11 10:48:35 +02:00 |
|
mespeche
|
e4362ba414
|
Add customer view finish
|
2013-09-11 10:47:31 +02:00 |
|
mespeche
|
2f351fd4d9
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Controller/Admin/CustomerController.php
templates/admin/default/customers.html
|
2013-09-11 10:26:56 +02:00 |
|
mespeche
|
40a87d50ce
|
Add modal for create/delete customer
|
2013-09-11 10:21:07 +02:00 |
|
mespeche
|
a6ada57b34
|
Update body background
|
2013-09-11 10:20:31 +02:00 |
|
franck
|
4b6acacda5
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-11 09:51:02 +02:00 |
|
franck
|
f1e2455315
|
fixed typo
|
2013-09-11 09:50:47 +02:00 |
|
Manuel Raynaud
|
557940c5cf
|
searching route return relative path
|
2013-09-11 09:48:41 +02:00 |
|
gmorel
|
7e2f57e618
|
Working
- Coupon Add/Edit/Delete rule AJAX
|
2013-09-11 09:48:33 +02:00 |
|
Etienne Roudeix
|
70f6ee6a52
|
Merge branch 'master' into tax
|
2013-09-11 09:21:28 +02:00 |
|
Etienne Roudeix
|
d6136c56d4
|
pse loop currency
|
2013-09-11 09:20:58 +02:00 |
|
Manuel Raynaud
|
05470715d6
|
Merge branch 'master' into template
|
2013-09-11 09:16:31 +02:00 |
|
Manuel Raynaud
|
9002484814
|
change find method on some request
|
2013-09-11 09:13:42 +02:00 |
|
Manuel Raynaud
|
06bb1d0a39
|
change some getters
|
2013-09-11 08:57:59 +02:00 |
|
Manuel Raynaud
|
3582ae4cf9
|
save register template
|
2013-09-11 08:51:34 +02:00 |
|
Manuel Raynaud
|
65a20381d9
|
Merge branch 'master' into template
|
2013-09-11 08:47:26 +02:00 |
|