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

269 Commits

Author SHA1 Message Date
Etienne Roudeix
99ad2d6820 Merge branch 'master' of github.com:thelia/thelia 2013-11-08 11:26:22 +01:00
Etienne Roudeix
422a80fcce module modification 2013-11-08 11:26:06 +01:00
touffies
aa7efb0e9a Issue 61 
Add the newsletter registration on Register page
 2013-11-07 12:35:34 +01:00
touffies
7fa17215f6 ISSUE 63 - Newsletter registration : error message 2013-11-07 11:57:43 +01:00
touffies
0431010a65 Missing class Translator 2013-11-05 15:46:38 +01:00
touffies
65a8953143 Profile and Useful was misspelled 
Add missing language key into the dictionary
 2013-11-04 16:35:01 +01:00
Franck Allimant
2aefb87db7 Finished log configuration. All loggers are currentrly working 2013-11-01 16:15:19 +01:00
Franck Allimant
0cabe7b9e8 Combination creation management 2013-10-30 15:44:32 +01:00
Etienne Roudeix
2eb5fc821c mailing sytem admin 2013-10-28 12:24:59 +01:00
Manuel Raynaud
51cd9f4ee8 Merge branch 'master' into frontend 
Conflicts:
	templates/default/layout.tpl
 2013-10-25 14:51:34 +02:00
touffies
d9a2855084 Issue 79 : English error 2013-10-25 14:03:54 +02:00
Manuel Raynaud
2c030f910b fix cs 2013-10-25 10:07:21 +02:00
Franck Allimant
06cc8ce1ea Finished product combinations edition 2013-10-25 00:32:56 +02:00
Manuel Raynaud
10f78b90a5 Merge pull request #49 from thelia/frontend 
Frontend
 2013-10-24 08:07:18 -07:00
touffies
ebec82d1d2 Merge with master 2013-10-24 16:52:03 +02:00
Franck Allimant
4f7e7660ca Finished PSE management for products with no combinations 2013-10-24 16:39:22 +02:00
Franck Allimant
b9410bba59 Implemented prices conversion management 2013-10-24 12:34:44 +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
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
touffies
5c5861aa2e Add new method getCustomerByEmail into CustomerQuery 2013-10-23 20:28:41 +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
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
badsuricate
1d75e6a4ad CHange input type hidden to input type integer 2013-10-23 17:25:03 +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
5542d8c494 create lang defaultBehavior form 2013-10-23 15:03:23 +02:00
Manuel Raynaud
24b504ad3b finish language creation process 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
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
b45fbef2ad Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (33 commits)
  permissions
  finish contact process
  create contact form
  create example for mail usage
  permission cleanup
  change place where absolute url is create when rewritten url is enabled
  fix issue #43
  fix typo in product breadcrumb
  update countries list
  fix issue #35
  fix cartItem updateQuantity method
  add some verification on country default trigger
  not allowed to delete default country
  WIP : admin profiles
  fiw test suite
  clear cache when a module is removed
  end module removal
  create event object for module delete action
  update insert script
  new model
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
 2013-10-22 23:01:04 +02:00
touffies
ac70075a38 Newsletter subscription with ajax 2013-10-22 22:26:33 +02:00
Etienne Roudeix
dba4a129ff module access management 2013-10-22 20:20:15 +02:00
Etienne Roudeix
44a5909c81 permission resource 2013-10-22 19:51:01 +02:00
touffies
13bb69e429 Remove validation_groups 2013-10-22 16:21:30 +02:00
touffies
8f48a56774 Contact page integration 2013-10-22 15:30:14 +02:00
touffies
9d5aa5e077 Merge branch 'master' into frontend 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-10-22 11:55:58 +02:00
Manuel Raynaud
47212490d2 verify if an email already exists in newsletter table 2013-10-22 10:58:16 +02:00
Manuel Raynaud
cc4f4f0bbe create newsletter template 2013-10-22 10:49:30 +02:00
touffies
e9c6f403a3 Merge branch 'master' into frontend 2013-10-22 10:17:47 +02:00
touffies
0c1ed8e702 Cleanup : 
- I made the form id different between the front and the back office
- I renamed a few files to use the same convention (create / update)
 2013-10-22 09:44:45 +02:00
Manuel Raynaud
aabd05f17f create form and controller for newsletter 2013-10-22 09:42:57 +02:00
gmorel
42aa46905b Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (33 commits)
  permissions
  finish contact process
  create contact form
  create example for mail usage
  permission cleanup
  change place where absolute url is create when rewritten url is enabled
  fix issue #43
  fix typo in product breadcrumb
  update countries list
  fix issue #35
  fix cartItem updateQuantity method
  add some verification on country default trigger
  not allowed to delete default country
  WIP : admin profiles
  fiw test suite
  clear cache when a module is removed
  end module removal
  create event object for module delete action
  update insert script
  new model
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
 2013-10-21 22:49:32 +02:00
Etienne Roudeix
cdeda0123e Merge branch 'master' into tax 2013-10-21 19:12:07 +02:00
Manuel Raynaud
9ce90abdf5 finish contact process 2013-10-21 19:07:59 +02:00