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

1585 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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