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

1145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Etienne Roudeix
fa5c1aaefc tax engine 2013-09-11 19:01:23 +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
gmorel
870612f51c WIP 
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
 2013-09-11 14:43:09 +02:00
gmorel
a9dae509c7 WIP 
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
 2013-09-11 14:40:55 +02:00
mespeche
e02ed4d654 Add tooltip 2013-09-11 14:36:32 +02:00
Manuel Raynaud
858cc7f4f2 validate customer creation form 2013-09-11 14:32:57 +02:00
mespeche
d21e4532c9 - Add creation address form 
- Add addresses list
- Add update address form
 2013-09-11 13:32:21 +02:00
Manuel Raynaud
e1d48d2a28 finish registration form 2013-09-11 12:30:05 +02:00
franck
36f9a5c1c6 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 12:15:24 +02:00
franck
ae786f2139 Added process_assets config variable 2013-09-11 12:14:39 +02:00
mespeche
f50d41b32c Change breadcrumb separator color 2013-09-11 11:46:50 +02:00
mespeche
abb501af29 Add breadcrumb to customers view 2013-09-11 11:43:49 +02:00
mespeche
b430dee9ac Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 11:41:06 +02:00
mespeche
953bf005a1 - Change boolean type to integer type for update_logged_in_user field 
- Create view for customer modification
 2013-09-11 11:39:33 +02:00
Etienne Roudeix
551c132b76 syntax 2013-09-11 11:14:54 +02:00
franck
9473f2752f Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 11:08:50 +02:00
Manuel Raynaud
d7f789188c Merge branch 'master' of github.com:thelia/thelia 2013-09-11 11:06:02 +02:00
franck
77d7587fb7 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 11:05:52 +02:00
Manuel Raynaud
e2a5ee90ff use ROUTER::ABSOLUTE_URL by default 2013-09-11 11:03:35 +02:00
Etienne Roudeix
d24316feeb Merge branch 'master' into tax 2013-09-11 11:01:37 +02:00
Etienne Roudeix
c11821153c PSE loop todo 2013-09-11 11:00:55 +02:00