TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,481 Commits 1 Branch 0 Tags
645ff15fcf19f780270c91e11a034ca03b13f580
Commit Graph

138 Commits

Author SHA1 Message Date
franck
645ff15fcf Impemented combination creation 2013-09-23 17:03:36 +02:00
franck
e7974a21a7 Finished combination creation GUI 2013-09-23 11:41:14 +02:00
franck
8781721512 Started price tab 2013-09-23 00:57:03 +02:00
franck
22f3f49f79 Finished product multiple categories attachment 2013-09-22 22:14:39 +02:00
franck
72a2cdfd75 Ajaxified product modification tabs 2013-09-21 16:51:51 +02:00
franck
e3644cd6cc Aded feature_template and category_template position management 2013-09-21 11:46:09 +02:00
franck
f6530f0bfc Finished product feature values 2013-09-20 23:10:31 +02:00
franck
1cf8c87d1a Fixed product update process 2013-09-20 17:17:44 +02:00
franck
5622a246b2 Added missing files 2013-09-20 15:59:19 +02:00
franck
e27b3cfbae Working catalog branch 2013-09-20 15:54:50 +02:00
mespeche
8731bf3c37 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-19 17:31:37 +02:00
mespeche
169b3c2659 Setting profile edition route and view 2013-09-19 17:30:57 +02:00
franck
e672677748 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/admin/default/category-edit.html
 2013-09-19 17:27:46 +02:00
mespeche
94aab3ea8a Add modules routing and default action/view 2013-09-19 13:27:47 +02:00
mespeche
86078d3054 - Edit shipping_zone routes 
- Create shipping_configuration routes
 2013-09-18 19:33:24 +02:00
mespeche
42ad62d2cd Shipping zones views and routes creation 2013-09-18 19:20:51 +02:00
mespeche
25becbe0cc WIP : Setting Folders management 2013-09-18 15:38:08 +02:00
franck
d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php
 2013-09-18 00:35:48 +02:00
franck
de4767ef56 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Model/Product.php
 2013-09-17 23:51:31 +02:00
Manuel Raynaud
e4b36098c7 fix typo and remove url generation in postInsert model 2013-09-17 20:29:09 +02:00
franck
c8baa38fed Added missing files... 2013-09-17 17:31:22 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
franck
a3dd6c7e8b Polished categories related content 2013-09-17 14:03:52 +02:00
franck
3d78af8b97 Finished category related content management 2013-09-17 13:50:01 +02:00
franck
7858e809b7 Added UrlRewritingTrait to manage URLs from model classes 2013-09-16 22:31:55 +02:00
franck
2f41d4db6f Started category management 2013-09-16 18:58:45 +02:00
mespeche
4929e6f88a Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 12:56:47 +02:00
mespeche
5e8749e054 - Edit country view creation 
- Delete and edit modalbox creation
- Countries routes management
 2013-09-16 12:55:34 +02:00
franck
696a2be8ba Completed template management 2013-09-16 12:52:35 +02:00
mespeche
76dc9609b6 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
 2013-09-16 11:01:00 +02:00
mespeche
15d9b55284 Countries view and routing creation 2013-09-16 10:59:30 +02:00
franck
2cf1c62b06 Finished Features management 2013-09-16 10:40:52 +02:00
gmorel
970d6b6ff7 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck (6) and others
# Via franck (3) and others
* 'master' of https://github.com/thelia/thelia:
  Implemented "Remember Me" feature on admin. Started template management
  Added Templates events
  First version of installation wizard
  tax engine retriever
  allow address removal from front
  Insert pagination inside tfoot
  allow update customer address in front tempalte
  allow to create a new address
  allow to make an address as default on update action
  Finished attributes management
  Fixed action column alignment
  Fixed duplication parameter check regexp
  absoluteUrl prevetn duplicate parameters in generated URL
 2013-09-16 10:01:34 +02:00
franck
71c1cee66d Implemented "Remember Me" feature on admin. Started template management 2013-09-16 09:23:44 +02:00
gmorel
6118a68370 WIP : Coupon fix coupon creation issue 2013-09-13 18:03:08 +02:00
gmorel
ed4809bac4 Working : Coupon : fix links and errors display 2013-09-13 12:42:33 +02:00
franck
ca7d1f7c85 Finished attributes management 2013-09-13 00:19:53 +02:00
gmorel
855d90c81c Working : Coupon Controller refactor 2013-09-12 17:55:03 +02:00
gmorel
a56447fef5 Working : Coupon Controller refactor 2013-09-12 17:39:51 +02:00
gmorel
2e7e31285e WIP : Coupon event dispatcher + action 2013-09-12 17:21:49 +02:00
gmorel
cee49c908d Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon 
* 'coupon' of https://github.com/thelia/thelia:

# By Manuel Raynaud (10) and others
# Via Manuel Raynaud (3) and others
* 'master' of https://github.com/thelia/thelia: (27 commits)
  AttributesAv management
  update cart model
  Using "update" instead of "change"
  Finished admin controllers refactoriing
  Created AbstractCrudController, and refactored existing controllers
  Continuer attributes management
  Change script file declaration order for bootstrap-editable fix
  Delete form on the orders view
  translate error message
  - Creation of order-edit view
  valid customer removal
  pse ref in faker
  pse ref
  loop tests
  test product loop limit
  update customer general info
  fix tests
  product loop test
  remove not needed flag in customer part
  change method to retrieve data in customer create process
  ...
 2013-09-12 15:54:32 +02:00
gmorel
927b27d04a WIP : Coupon event dispatcher + action 2013-09-12 15:53:16 +02:00
Manuel Raynaud
b9338a7717 Merge branch 'master' of github.com:thelia/thelia 2013-09-12 15:44:29 +02:00
Manuel Raynaud
d6e1f99b35 Merge branch 'template' 
Conflicts:
	templates/admin/default/customer-edit.html
 2013-09-12 15:44:23 +02:00
franck
8ad0dc7b21 AttributesAv management 2013-09-12 15:43:37 +02:00
franck
83f4e8b356 Using "update" instead of "change" 2013-09-12 14:20:23 +02:00
franck
3f82421879 Finished admin controllers refactoriing 2013-09-12 13:39:47 +02:00
franck
14e0eff0f5 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl
 2013-09-12 13:04:12 +02:00
franck
c85ec2a9e3 Created AbstractCrudController, and refactored existing controllers 2013-09-12 13:02:40 +02:00
Manuel Raynaud
485e6dc29b translate error message 2013-09-12 12:43:44 +02:00