TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,086 Commits 1 Branch 0 Tags
54eda797a242bb4e018e5cb3faa528cd344f0688
Commit Graph

2086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
touffies
54eda797a2 Replace /login and /register by /logout and /account in the footer if the customer is logged in 2013-10-24 19:56:15 +02:00
touffies
64985faedc small fix 2013-10-24 19:49:52 +02:00
touffies
d8b2ef28fc Issue 51, removed s at account information 2013-10-24 19:45:30 +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
badsuricate
1d92ac0626 Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-24 15:31:46 +02:00
badsuricate
e0a927daf1 Add 404 Page 2013-10-24 15:31:12 +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
54242eef43 clear cache at end process 2013-10-24 08:54:20 +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
touffies
ac3e842662 All the fields should be with the type password. 2013-10-24 00:11:30 +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
Manuel Raynaud
fa99482f46 update phpdoc 2013-10-23 19:54:28 +02:00
Manuel Raynaud
f6b20f813f add customer order list 2013-10-23 19:53:47 +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
Manuel Raynaud
4db360a22a Merge branch 'master' of github.com:thelia/thelia 2013-10-23 19:34:28 +02:00
Manuel Raynaud
fc49b13ef8 remove composer.phar from tracked files 2013-10-23 19:33:35 +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
bfbb9c46db hide default_lang_without_translation config parameter 2013-10-23 19:21:30 +02:00
Manuel Raynaud
a7796cf481 manage lanf <=> url assignment 2013-10-23 19:04:49 +02:00
touffies
2defbb3b6c Remove temporary the filter 2013-10-23 18:14:40 +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
touffies
21286c2094 Bug : Minimum quantity is 1 2013-10-23 17:49:51 +02:00
touffies
f7f7444fcb Modification of "Continue Shopping" button 2013-10-23 17:47:04 +02:00
touffies
0c4592a9dd Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-23 17:27:52 +02:00
touffies
cb560691eb Fix login box 2013-10-23 17:27:41 +02:00
badsuricate
4660992d75 Add good product combination to the cart 2013-10-23 17:26:11 +02:00
badsuricate
c6a11f44c0 add class cart-container 2013-10-23 17:25:22 +02:00
badsuricate
1d75e6a4ad CHange input type hidden to input type integer 2013-10-23 17:25:03 +02:00
badsuricate
62c64444a3 Delete console.log 2013-10-23 16:55:39 +02:00
touffies
8c55675dd8 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-23 16:51:30 +02:00
touffies
3f69abc16c Bug : Remove double quote 2013-10-23 16:51:20 +02:00
touffies
b3c956880f Add jquery validation 2013-10-23 16:50:14 +02:00