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

573 Commits

Author SHA1 Message Date
franck
13265182c2 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-17 13:50:23 +02:00
franck
3d78af8b97 Finished category related content management 2013-09-17 13:50:01 +02:00
Etienne Roudeix
233c952b4e Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-09-17 12:44:34 +02:00
Etienne Roudeix
c4fd65e6ea delivery process 2013-09-17 12:38:23 +02:00
Etienne Roudeix
692badb06b delivery form 2013-09-17 11:05:29 +02:00
franck
d097851522 Added documents action and loop 2013-09-17 01:07:42 +02:00
franck
7858e809b7 Added UrlRewritingTrait to manage URLs from model classes 2013-09-16 22:31:55 +02:00
franck
e473c64588 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 18:59:18 +02:00
franck
2f41d4db6f Started category management 2013-09-16 18:58:45 +02:00
Etienne Roudeix
afa9a46abf order delivery form 2013-09-16 18:55:29 +02:00
Manuel Raynaud
874c5f6cac integrate swiftMailer as mailer solution 2013-09-16 18:20:15 +02:00
Etienne Roudeix
361e9e1126 delivery process 2013-09-16 16:12:04 +02:00
Etienne Roudeix
84204cbf05 Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Feed.php
 2013-09-16 15:32:17 +02:00
Etienne Roudeix
d8b5df4162 delivery process 2013-09-16 15:24:08 +02:00
Etienne Roudeix
2021ddfc9e feed loop is now countable 2013-09-16 14:42:00 +02:00
Etienne Roudeix
c7b3aea7f0 cart integration 2013-09-16 14:31:34 +02:00
Etienne Roudeix
e0a48df23e cart integration 2013-09-16 13:15:35 +02:00
franck
dd2ba89a4c Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 12:52:59 +02:00
franck
696a2be8ba Completed template management 2013-09-16 12:52:35 +02:00
Etienne Roudeix
2857d0621c cart page 2013-09-16 11:14:23 +02:00
Manuel Raynaud
42ade8a45a Merge branch 'master' of github.com:thelia/thelia 2013-09-16 11:12:37 +02:00
franck
2cf1c62b06 Finished Features management 2013-09-16 10:40:52 +02:00
Manuel Raynaud
365d90b4a8 Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-09-16 10:19:40 +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
Manuel Raynaud
a4c8df366b dispatch event when default currency change 2013-09-16 09:07:53 +02:00
franck
9cdf1a0376 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-13 20:22:03 +02:00
franck
a0f09057c4 Added Templates events 2013-09-13 20:21:47 +02:00
Manuel Raynaud
7f4a69fcfb allowing adding product to cart 2013-09-13 19:41:12 +02:00
Manuel Raynaud
86e727c2fb force_return is a global loop parameter and default value is false 2013-09-13 16:32:24 +02:00
Manuel Raynaud
50a5fd166b create smarty attribute for cart 2013-09-13 15:17:43 +02:00
gmorel
ed4809bac4 Working : Coupon : fix links and errors display 2013-09-13 12:42:33 +02:00
Manuel Raynaud
8367863b48 allow address removal from front 2013-09-13 12:33:13 +02:00
Manuel Raynaud
275b20ac77 allow to make an address as default on update action 2013-09-13 10:17:45 +02:00
franck
ca7d1f7c85 Finished attributes management 2013-09-13 00:19:53 +02:00
gmorel
964355e60d Working : Coupon - update loop 2013-09-12 21:34:50 +02:00
gmorel
58ef39769c Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix (1) and Manuel Raynaud (1)
# Via Manuel Raynaud (2) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  fix test suite
  fix current url bug + fix empty loop pagination exception
 2013-09-12 17:55:16 +02:00
Manuel Raynaud
a241c4d587 Merge branch 'master' of github.com:thelia/thelia 2013-09-12 17:28:20 +02:00
Manuel Raynaud
bad8a0439d fix test suite 2013-09-12 17:28:02 +02:00
gmorel
2e7e31285e WIP : Coupon event dispatcher + action 2013-09-12 17:21:49 +02:00
Etienne Roudeix
e7368fa9f0 Merge branch 'master' into loops 2013-09-12 17:21:13 +02:00
Etienne Roudeix
a73c9e1de4 fix current url bug + fix empty loop pagination exception 2013-09-12 17:20:33 +02:00
gmorel
6d914c5676 Working : Adding type inference to the Thelia2 Request->getSession() 2013-09-12 16:23:21 +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
d6e1f99b35 Merge branch 'template' 
Conflicts:
	templates/admin/default/customer-edit.html
 2013-09-12 15:44:23 +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