TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
734 Commits 1 Branch 0 Tags
180302e7cce643db7cda695b5cfaec3586ebb72c
Commit Graph

356 Commits

Author SHA1 Message Date
gmorel
180302e7cc Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Factorized ModelCriterialTools calls in loops

Conflicts:
	templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
	templates/admin/default/assets/css/admin.less
 2013-08-30 15:43:43 +02:00
gmorel
fd63115c97 WIP 
- Update Coupon Controller/Form/Event - create()
 2013-08-30 12:23:49 +02:00
gmorel
71fa04a193 WIP 
- Update Coupon Controller/Form/Event - create()
- Rule serialization/unserialization managed in Model/Coupon now
 2013-08-30 11:06:33 +02:00
gmorel
37659415ad WIP 
- Add Coupon Event
- Customer Parameter
 2013-08-29 16:20:41 +02:00
franck
cce270fdcc Factorized ModelCriterialTools calls in loops 2013-08-28 19:47:31 +02:00
franck
0361cd1ff2 Removed InternalEvent, simplified SecurityContext 2013-08-28 17:52:32 +02:00
Etienne Roudeix
430baa6cda url output in loops 2013-08-26 14:44:39 +02:00
Etienne Roudeix
9174e5154e backend loop translation 2013-08-26 14:05:29 +02:00
Etienne Roudeix
96b3de7c84 backend trasnlation in loops 2013-08-26 12:38:23 +02:00
Etienne Roudeix
2d810540ec loop review 2013-08-23 12:37:18 +02:00
Etienne Roudeix
fe4b77f7a8 associated content for categories and product tables + loop 2013-08-23 10:55:59 +02:00
Etienne Roudeix
ec3ab5c3aa currency loop 2013-08-22 17:47:46 +02:00
Etienne Roudeix
17cc6faec3 front end translation management in loops 
apply propel patch
6be7fa1c39
 2013-08-22 15:03:31 +02:00
Etienne Roudeix
2e6cbe637a working on loop translation 2013-08-21 16:32:48 +02:00
Etienne Roudeix
9dbd8a283b pse and combi loops 2013-08-21 12:50:49 +02:00
Etienne Roudeix
8cc09824a8 feature value loop fix 2013-08-21 09:28:50 +02:00
Etienne Roudeix
86b11096ba Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
 2013-08-21 09:19:56 +02:00
Etienne Roudeix
6a14bef3de feature product loop + improve faker 2013-08-20 17:59:22 +02:00
Etienne Roudeix
731a406d1c new product loop 2013-08-20 15:32:13 +02:00
Etienne Roudeix
9e3d8bcc5e product loop : order by min and max price 2013-08-20 15:22:34 +02:00
Etienne Roudeix
ef756979bd product loop : order by promo or newness 2013-08-20 14:40:30 +02:00
Etienne Roudeix
42270991c5 product loop parameters done 2013-08-20 11:29:35 +02:00
Etienne Roudeix
d50b0e6e10 big progress on product loop 2013-08-19 17:18:20 +02:00
Manuel Raynaud
0397f5fdf8 create customer login controller 2013-08-16 14:24:00 +02:00
Manuel Raynaud
4f31627301 refactor action customer 2013-08-16 14:04:44 +02:00
Manuel Raynaud
ab5e845ad3 start refactoring customer update process 2013-08-16 12:09:08 +02:00
Manuel Raynaud
382fbe230e update customer process creation 2013-08-16 11:01:32 +02:00
Manuel Raynaud
4ca78b97b5 Merge branch 'master' into actions 2013-08-16 10:36:00 +02:00
Manuel Raynaud
44249859ef create new customerEvent class 2013-08-16 10:35:46 +02:00
franck
87d3a4583b Faker generates images with Imagine instead of using placeholder.it 2013-08-16 09:46:51 +02:00
franck
f028d2b2db Added image-cache:clear console command 2013-08-15 21:18:16 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
franck
5762711146 Added original file data 2013-08-15 12:27:30 +02:00
franck
a56e05b36b Added image action and loop 2013-08-15 11:46:46 +02:00
franck
47bc545019 Added image processing actgion and loop 2013-08-15 11:44:46 +02:00
Manuel Raynaud
1db41a36ab /bin/bash: q : commande introuvable 2013-08-14 16:24:22 +02:00
Manuel Raynaud
ecb42e906b refactor update item eventListener 2013-08-14 15:55:06 +02:00
Manuel Raynaud
32e7b334dd move form exception in Form namespace 2013-08-14 15:23:59 +02:00
Manuel Raynaud
ab81b58e94 refactor cartAdd EventListener, removing Request references 2013-08-14 15:10:21 +02:00
Etienne Roudeix
70f483ad97 availability instead of available 2013-08-14 14:02:14 +02:00
Manuel Raynaud
61342e06f4 fix test suite 2013-08-14 11:44:39 +02:00
Manuel Raynaud
bd865171d1 make more easy routin integration from modules 2013-08-14 11:23:51 +02:00
Manuel Raynaud
078b1e0d57 apply cs-fixer 2013-08-14 09:29:04 +02:00
Manuel Raynaud
b4d02fe63a allow possibility to use as many Router as we want 2013-08-14 08:22:08 +02:00
Manuel Raynaud
c284a756b6 allow possibility to add multiple files for touring 2013-08-13 16:04:28 +02:00
Manuel Raynaud
d53f1289c3 allow to declare new router in modules 2013-08-13 12:09:10 +02:00
Manuel Raynaud
a9ecf01216 complete cart controller 2013-08-13 10:40:04 +02:00
Manuel Raynaud
3bf7e79960 change action name for change item article 2013-08-13 10:12:04 +02:00
Manuel Raynaud
cf5ccdc7ae refactor modify Article action 2013-08-13 10:09:12 +02:00
Manuel Raynaud
be5d1e9ddb refactor cart and cartEvent process 2013-08-12 17:48:48 +02:00