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

1364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mespeche
2163121a1a Merge branch 'master' of https://github.com/thelia/thelia 2013-09-12 12:41:30 +02:00
mespeche
c64b987e9b - Creation of order-edit view 2013-09-12 12:40:46 +02:00
Manuel Raynaud
9856528a94 valid customer removal 2013-09-12 12:40:14 +02:00
Etienne Roudeix
3115ee006d pse ref in faker 2013-09-12 11:59:45 +02:00
Etienne Roudeix
d5004071c9 pse ref 2013-09-12 11:56:00 +02:00
Etienne Roudeix
b698d1aada loop tests 2013-09-12 11:35:27 +02:00
Etienne Roudeix
f75b6e876c test product loop limit 2013-09-12 11:28:32 +02:00
Manuel Raynaud
5d87e48ba0 update customer general info 2013-09-12 11:24:24 +02:00
Etienne Roudeix
e81b894816 fix tests 2013-09-12 10:58:12 +02:00
Etienne Roudeix
d61f3a6a1e product loop test 2013-09-12 10:48:27 +02:00
Manuel Raynaud
4b643a7a9e remove not needed flag in customer part 2013-09-12 10:12:22 +02:00
Manuel Raynaud
6fea7ef441 change method to retrieve data in customer create process 2013-09-12 09:48:24 +02:00
gmorel
936d0dbe37 WIP 
- Coupon Add/Edit/Delete rule AJAX
 2013-09-12 09:32:16 +02:00
Manuel Raynaud
6b9db1a162 create test for customer creation 2013-09-12 09:23:50 +02:00
Manuel Raynaud
9304624708 fix title name in insert.sql file 2013-09-12 08:12:44 +02:00
Manuel Raynaud
10f97a7348 update faker, insert plenty of customers 2013-09-11 20:43:44 +02:00
Etienne Roudeix
e8ced10dbb fix template 2013-09-11 20:22:29 +02:00
Etienne Roudeix
ca16aa251e Merge branch 'master' into tax 2013-09-11 20:19:10 +02:00
Etienne Roudeix
c35de47f10 fix taxengine tests 2013-09-11 20:18:34 +02:00
gmorel
d16f3c28e5 Working 
- CasperJS : coupon rule
 2013-09-11 19:39:10 +02:00
Etienne Roudeix
fa5c1aaefc tax engine 2013-09-11 19:01:23 +02:00
Manuel Raynaud
3e301a9fc1 creating account page 2013-09-11 18:57:49 +02:00
gmorel
bdbdc6b825 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (11) and gmorel (1)
# Via Manuel Raynaud (3) and gmorel (3)
* 'master' of https://github.com/thelia/thelia:
  Working - CasperJS : coupon rule
  add missing files
  finishing creating lost password template
  start creating lost password template
  add logo for beta version
  change metadata for product part
  update phpdebugbar dependency
  add TimeDataCollector
  just add Propel information in phpDebugBar
  add some information in propelcollector
  validate customer creation form
  finish registration form
 2013-09-11 17:48:55 +02:00
gmorel
4b8805c29a Merge remote-tracking branch 'origin/master' 2013-09-11 17:48:06 +02:00
gmorel
d846d10832 Working 
- CasperJS : coupon rule
 2013-09-11 17:47:52 +02:00
Manuel Raynaud
591f952287 Merge branch 'template' 2013-09-11 17:26:34 +02:00
Manuel Raynaud
67b5fab53f Merge branch 'master' of github.com:thelia/thelia 2013-09-11 17:24:46 +02:00
Manuel Raynaud
bb5946457a add missing files 2013-09-11 17:24:26 +02:00
gmorel
8ec6b2e790 Merge branch 'coupon' of https://github.com/thelia/thelia 
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (8) and others
* 'coupon' of https://github.com/thelia/thelia: (55 commits)
  Working - add ajax loader
  WIP - add tests casper JS on coupon
  WIP - add tests casper JS on coupon
  tax engine
  tax engine
  Working - add tests casper JS
  - Add orders view route - Add view & action for orders index
  Removed a redondant "use"
  WIP - Coupon Add/Edit/Delete rule AJAX - add tests casper JS
  WIP - Coupon Add/Edit/Delete rule AJAX - add tests casper JS
  Add tooltip
  - Add creation address form - Add addresses list - Add update address form
  Added process_assets config variable
  Change breadcrumb separator color
  Add breadcrumb to customers view
  - Change boolean type to integer type for update_logged_in_user field - Create view for customer modification
  syntax
  use ROUTER::ABSOLUTE_URL by default
  PSE loop todo
  currency management in PSE loop
  ...
 2013-09-11 17:23:12 +02:00
gmorel
41cf74ccac Working 
- add ajax loader
 2013-09-11 17:22:31 +02:00
Manuel Raynaud
9cc3162696 finishing creating lost password template 2013-09-11 17:22:23 +02:00
gmorel
90f4db6aa4 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (8) and others
* 'master' of https://github.com/thelia/thelia: (47 commits)
  tax engine
  tax engine
  - Add orders view route - Add view & action for orders index
  Removed a redondant "use"
  Add tooltip
  - Add creation address form - Add addresses list - Add update address form
  Added process_assets config variable
  Change breadcrumb separator color
  Add breadcrumb to customers view
  - Change boolean type to integer type for update_logged_in_user field - Create view for customer modification
  syntax
  use ROUTER::ABSOLUTE_URL by default
  PSE loop todo
  currency management in PSE loop
  Add customer view finish
  Add modal for create/delete customer
  Update body background
  fixed typo
  searching route return relative path
  pse loop currency
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
	core/lib/Thelia/Core/Event/TheliaEvents.php
	web/index_dev.php
 2013-09-11 17:12:47 +02:00
gmorel
33d6c85052 WIP 
- add tests casper JS on coupon
 2013-09-11 17:10:36 +02:00
gmorel
8d71bfecc5 WIP 
- add tests casper JS on coupon
 2013-09-11 17:06:04 +02:00
Etienne Roudeix
642376a6b3 Merge branch 'master' into tax 
Conflicts:
	install/insert.sql
 2013-09-11 16:57:45 +02:00
Etienne Roudeix
25756ef9dd tax engine 2013-09-11 16:56:16 +02:00
Manuel Raynaud
ccf35dd37c start creating lost password template 2013-09-11 16:28:26 +02:00
Etienne Roudeix
e8a4e56324 tax engine 2013-09-11 16:21:51 +02:00
Manuel Raynaud
b03eb969ca add logo for beta version 2013-09-11 16:18:58 +02:00
Manuel Raynaud
755bf40b56 change metadata for product part 2013-09-11 16:05:05 +02:00
Manuel Raynaud
c1edc0e4ff update phpdebugbar dependency 2013-09-11 15:48:55 +02:00
gmorel
c8b5b9e9fa Working 
- add tests casper JS
 2013-09-11 15:35:25 +02:00
Manuel Raynaud
91f5cb12cd Merge branch 'master' into template 2013-09-11 15:28:38 +02:00
Manuel Raynaud
769993cc96 add TimeDataCollector 2013-09-11 15:26:47 +02:00
mespeche
1f7d8a20b3 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 15:24:01 +02:00
mespeche
59e1981e9f - Add orders view route 
- Add view & action for orders index
 2013-09-11 15:23:04 +02:00
Manuel Raynaud
1ec9e7486d just add Propel information in phpDebugBar 2013-09-11 15:21:43 +02:00
franck
36d2b873ff Removed a redondant "use" 2013-09-11 15:08:56 +02:00
franck
2a93ebb947 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 15:06:56 +02:00
Manuel Raynaud
ec24586232 add some information in propelcollector 2013-09-11 15:04:47 +02:00