touffies
|
64985faedc
|
small fix
|
2013-10-24 19:49:52 +02:00 |
|
touffies
|
b0fb0fdd43
|
I need the route cart.view for the OrderException.php file.
|
2013-10-24 19:39:54 +02:00 |
|
touffies
|
ca5d7d2a00
|
Change some route to use the default
$this->redirectToRoute('default', array('view'=>'cart'));
|
2013-10-24 18:51:49 +02:00 |
|
touffies
|
ebec82d1d2
|
Merge with master
|
2013-10-24 16:52:03 +02:00 |
|
Etienne Roudeix
|
ca03e374f2
|
newsletter modification from account
email modification from account
|
2013-10-24 12:10:35 +02:00 |
|
Etienne Roudeix
|
4065f338b9
|
Merge branch 'master' into tax
|
2013-10-24 10:37:05 +02:00 |
|
Etienne Roudeix
|
fb4e15ae77
|
fix issue #47
|
2013-10-24 10:36:06 +02:00 |
|
Manuel Raynaud
|
60be64ef19
|
update model with good namespace for newsletter entity
|
2013-10-24 09:53:39 +02:00 |
|
Manuel Raynaud
|
e7270af63b
|
remove wrong files
|
2013-10-24 09:20:10 +02:00 |
|
badsuricate
|
b9e5b4d9c7
|
Merge branch 'frontend' of github.com:thelia/thelia into frontend
|
2013-10-24 09:12:52 +02:00 |
|
Manuel Raynaud
|
3f7300bdee
|
add some control for knwoing if user is in install mode
|
2013-10-24 08:31:49 +02:00 |
|
touffies
|
009e779110
|
Update profil [It's not working yet]
|
2013-10-24 00:19:00 +02:00 |
|
touffies
|
3e3695e5d3
|
Add validation for the current password
|
2013-10-24 00:17:59 +02:00 |
|
Franck Allimant
|
5bf51dd47e
|
Merge branch 'catalog'
Conflicts:
core/lib/Thelia/Config/Resources/config.xml
core/lib/Thelia/Config/Resources/routing/admin.xml
core/lib/Thelia/Core/Template/Loop/Country.php
core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
core/lib/Thelia/Model/Country.php
core/lib/Thelia/Model/Profile.php
core/lib/Thelia/Model/ProfileQuery.php
install/insert.sql
install/thelia.sql
local/config/schema.xml
|
2013-10-24 00:16:33 +02:00 |
|
touffies
|
04c43a12da
|
Add new event NEWSLETTER_UNSUBSCRIBE
|
2013-10-24 00:15:51 +02:00 |
|
Franck Allimant
|
7ca2399573
|
Worked on catalog
|
2013-10-23 23:47:44 +02:00 |
|
Franck Allimant
|
0bd57b0a5a
|
Worked on catalog
|
2013-10-23 23:41:39 +02:00 |
|
badsuricate
|
b26c3216c5
|
Fix 404 error page
|
2013-10-23 23:25:41 +02:00 |
|
touffies
|
5c5861aa2e
|
Add new method getCustomerByEmail into CustomerQuery
|
2013-10-23 20:28:41 +02:00 |
|
touffies
|
10fee02fbf
|
Add isSubscribed method
|
2013-10-23 20:10:30 +02:00 |
|
touffies
|
e207424a2d
|
Remove login information (Password and Confirm password)
Check if email doesn't exist (Exclude current user)
|
2013-10-23 19:50:43 +02:00 |
|
Etienne Roudeix
|
7433971515
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-23 19:23:53 +02:00 |
|
Etienne Roudeix
|
d1024c6841
|
fix minor admin bugs
|
2013-10-23 19:23:29 +02:00 |
|
Manuel Raynaud
|
a7796cf481
|
manage lanf <=> url assignment
|
2013-10-23 19:04:49 +02:00 |
|
Manuel Raynaud
|
d81c384ce0
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-23 18:02:23 +02:00 |
|
Manuel Raynaud
|
c924b2a5bd
|
create form for language url
|
2013-10-23 18:02:04 +02:00 |
|
Etienne Roudeix
|
a631a4e174
|
fix tagged_form_field
|
2013-10-23 18:00:04 +02:00 |
|
badsuricate
|
1d75e6a4ad
|
CHange input type hidden to input type integer
|
2013-10-23 17:25:03 +02:00 |
|
badsuricate
|
6fb6cc9679
|
Merge frontend
|
2013-10-23 16:47:24 +02:00 |
|
Etienne Roudeix
|
cf67a0478e
|
Merge branch 'master' into tax
|
2013-10-23 16:32:10 +02:00 |
|
Etienne Roudeix
|
fb8b82093a
|
administrators management
|
2013-10-23 16:31:37 +02:00 |
|
Manuel Raynaud
|
3dd51d98b6
|
process default behacior for languages
|
2013-10-23 15:41:41 +02:00 |
|
badsuricate
|
77959afefa
|
Add AJAX on "Add to Cart" buttons
|
2013-10-23 15:33:47 +02:00 |
|
badsuricate
|
5e62da9d29
|
Add new Arguments for CartLoop
New args = Limit and position
|
2013-10-23 15:20:42 +02:00 |
|
Manuel Raynaud
|
5542d8c494
|
create lang defaultBehavior form
|
2013-10-23 15:03:23 +02:00 |
|
Manuel Raynaud
|
53e25ce7c1
|
process delete language
|
2013-10-23 12:38:33 +02:00 |
|
Manuel Raynaud
|
b16edfbd1d
|
create language delete event object
|
2013-10-23 12:38:32 +02:00 |
|
Manuel Raynaud
|
24b504ad3b
|
finish language creation process
|
2013-10-23 12:38:32 +02:00 |
|
Manuel Raynaud
|
f881edbaa6
|
create toggleDefault method in lang method and modify in Country model
|
2013-10-23 12:38:32 +02:00 |
|
Manuel Raynaud
|
eac2c274e7
|
change http code status on different context
|
2013-10-23 12:38:32 +02:00 |
|
Manuel Raynaud
|
d356974ef7
|
create lang toggleDefault object
|
2013-10-23 12:38:32 +02:00 |
|
Manuel Raynaud
|
38761a7275
|
process lang udate action
|
2013-10-23 12:38:32 +02:00 |
|
Manuel Raynaud
|
a2d292f6a3
|
create lang object events
|
2013-10-23 12:38:32 +02:00 |
|
Manuel Raynaud
|
7915552fe6
|
create ajax modal for lang edition
|
2013-10-23 12:38:32 +02:00 |
|
Manuel Raynaud
|
c15431a468
|
create languages pages
|
2013-10-23 12:38:32 +02:00 |
|
touffies
|
b6f9624544
|
Add a generic route (default) to manage the simple path
|
2013-10-23 11:49:36 +02:00 |
|
badsuricate
|
7d5803a541
|
Add routes for mini-cart and addedToCart
|
2013-10-23 11:47:42 +02:00 |
|
Etienne Roudeix
|
3c69e38a3b
|
Merge branch 'tax'
|
2013-10-23 08:49:24 +02:00 |
|
touffies
|
a91303a27d
|
Add new method updatePasswordAction (Not finished)
|
2013-10-23 00:07:27 +02:00 |
|
gmorel
|
52e471ab1b
|
Working adding decrementation when coupon is consumed
|
2013-10-22 23:04:08 +02:00 |
|