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

2109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
touffies
a91303a27d Add new method updatePasswordAction (Not finished) 2013-10-23 00:07:27 +02:00
touffies
5dc33aec4d Remove duplicate class "panel" 2013-10-22 23:45:56 +02:00
gmorel
52e471ab1b Working adding decrementation when coupon is consumed 2013-10-22 23:04:08 +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
c48c7b5486 issues/45 : Check if an input field has focus on the mini login form, if no we hide the form 2013-10-22 22:48:22 +02:00
touffies
ac70075a38 Newsletter subscription with ajax 2013-10-22 22:26:33 +02:00
Etienne Roudeix
29d4ecbe35 Merge branch 'master' into tax 2013-10-22 20:20:40 +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
f844080758 Align the navbar on the right 
Add google map for the contact page
 2013-10-22 18:17:53 +02:00
Manuel Raynaud
2d987473b4 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 17:20:18 +02:00
Manuel Raynaud
0580539ed8 fix cart quantity for issue #46 2013-10-22 17:19:16 +02:00
Etienne Roudeix
0d242a4fc0 fix auth loop on index 2013-10-22 16:53:40 +02:00
touffies
9c702e8d14 Integration : Add min height to the product tabs 2013-10-22 16:35:53 +02:00
touffies
aa842c510a Wrong class name on the carousel-control 2013-10-22 16:31:55 +02:00
touffies
13bb69e429 Remove validation_groups 2013-10-22 16:21:30 +02:00
touffies
0a4c3e2d6e Fix password forgotten route 2013-10-22 16:16:40 +02:00
Etienne Roudeix
ca04b87738 my bad 2013-10-22 16:13:29 +02:00
Etienne Roudeix
ddd8c4f7a5 fix auth loop 2013-10-22 15:57:31 +02:00
touffies
a9dd13ae70 Oups... I forgot to rename CustomerCreation into CustomerCreateForm 2013-10-22 15:50:04 +02:00
touffies
8f48a56774 Contact page integration 2013-10-22 15:30:14 +02:00
Etienne Roudeix
c94fa9bc24 permission management 2013-10-22 15:04:06 +02:00
Manuel Raynaud
6fef556319 Merge branch 'propel' 
Conflicts:
	install/thelia.sql
 2013-10-22 14:48:10 +02:00
badsuricate
11d1fa46f7 Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-22 12:03:06 +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
Etienne Roudeix
cb0619a7b3 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 11:33:24 +02:00
Etienne Roudeix
77dbdce4e8 fix tests 2013-10-22 11:33:01 +02:00
Etienne Roudeix
42e8b3a596 fix tests 2013-10-22 11:24:33 +02:00
Manuel Raynaud
5755da1e8c change newsletter success message 2013-10-22 11:22:23 +02:00
Etienne Roudeix
7e32957d12 Merge branch 'master' into tax 2013-10-22 11:10:06 +02:00
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +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
badsuricate
dbcfd8965f Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-22 10:24:03 +02:00
touffies
945471dd8a Modify contact form name for the front 2013-10-22 10:20:21 +02:00
touffies
e9c6f403a3 Merge branch 'master' into frontend 2013-10-22 10:17:47 +02:00
Manuel Raynaud
c9074892b2 complete controller and newsletter listener 2013-10-22 10:01:02 +02:00
Manuel Raynaud
888c2c6ab9 create routes for newsletter management 2013-10-22 09:54:44 +02:00
Manuel Raynaud
30f0973481 complete newsletter controller 2013-10-22 09:51:42 +02:00
Manuel Raynaud
f6fb778c3e create newsletter listener 2013-10-22 09:48:24 +02:00
Manuel Raynaud
f52a0f3652 create event message for newsletter subsribe action 2013-10-22 09:46:38 +02:00
Manuel Raynaud
6b8c7602b4 create newsletter event 2013-10-22 09:45:37 +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
Manuel Raynaud
f4c4cea32b create newsletter entity 2013-10-22 09:36:52 +02:00
touffies
b64dedefc6 Add new page to modify the customer password 2013-10-22 09:27:33 +02:00
Manuel Raynaud
f70c5362e9 fix typo 2013-10-22 09:13:21 +02:00
Manuel Raynaud
af51086fcb Merge branch 'master' of github.com:thelia/thelia 2013-10-22 09:12:23 +02:00
Manuel Raynaud
4630007bc2 fix typo in error message 2013-10-22 09:11:33 +02:00
gmorel
9c7c4e851e Working cleaning 2013-10-21 23:09:04 +02:00