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

467 Commits

Author SHA1 Message Date
gmorel
c1875564cd Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix (1) and others
# Via Etienne Roudeix (2) and Manuel Raynaud (2)
* 'master' of https://github.com/thelia/thelia:
  clean some code
  fix phpdoc
  Added windows version of reset_install script
 2013-09-09 10:04:57 +02:00
Manuel Raynaud
99f40cbc80 Merge branch 'master' of github.com:thelia/thelia 2013-09-09 09:03:02 +02:00
Manuel Raynaud
f2a80e4b6a clean some code 2013-09-09 09:02:50 +02:00
Etienne Roudeix
928cc3ee4f Merge branch 'master' of github.com:thelia/thelia 2013-09-09 08:06:08 +02:00
Etienne Roudeix
1ec386ff79 Merge branch 'rewrite' 2013-09-09 08:05:57 +02:00
Etienne Roudeix
b637ad79f4 fix phpdoc 2013-09-09 08:05:43 +02:00
gmorel
c1a79028a1 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
  add PropelDataCollector to debugbar, still missing some informations
  remove unused class
  integrate debugbar module
  remove htmlpurifier
  modify insert.sql including debugBar module
  add new event and new tag
  Started category modification
  Factorized modal dialogs javascript
  Factorized creation and confirmation modal dialogs
  create controller adding delivery module in session
  create Delivery loop
  Working :
  Continuing categories administration...
  Working :
  create base loop for delivery and payment entities
  remove htmlpurifier dependency
  country id can be an argument for calculate method
  Working :
  Working :
  fix typo
  ...

Conflicts:
	composer.lock
	core/lib/Thelia/Controller/Admin/CategoryController.php
	templates/admin/default/assets/less/thelia/variables.less
 2013-09-08 00:08:02 +02:00
Manuel Raynaud
04ec683021 add PropelDataCollector to debugbar, still missing some informations 2013-09-07 17:37:24 +02:00
Manuel Raynaud
525e449fb2 Merge branch 'master' of github.com:thelia/thelia 2013-09-07 16:40:14 +02:00
Manuel Raynaud
1e660cd930 Merge branch 'delivery' 
Conflicts:
	composer.lock
	install/insert.sql
 2013-09-07 16:37:54 +02:00
Manuel Raynaud
ed468ccb67 Merge branch 'master' into debugbar 2013-09-07 16:31:29 +02:00
Manuel Raynaud
5315e13ce9 add new event and new tag 2013-09-07 16:31:15 +02:00
franck
3bd3a4d943 Started category modification 2013-09-07 10:59:43 +02:00
franck
f304caa88f Factorized modal dialogs javascript 2013-09-06 20:26:29 +02:00
franck
e8d96937e7 Factorized creation and confirmation modal dialogs 2013-09-06 20:00:02 +02:00
gmorel
86d6a0fa05 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
  Working :
  Working :
  Working :
  Working :
  Fixed minor visual glitches
  Working : Resize countries flag + Add bootstrap-switch
  fix test suite
  clear asset cache in cache:cler command
  Added a 'development mode' to assetic smarty plugin
  rewriting router
  use good Request object
  Added Tools\URL test case, and a test case superclass for initializing Tools\URL
  remove unused UrlWritin controller
  create router for rewriting matching
  customer substitutions
  fix typo in front id
  Working : For attributes on labels
  Working : For attributes on labels
  add label_attr attribute to form smarty plugin
  start refactorin rewriting routing
  ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/less/thelia/bootstrap-editable.less
	templates/admin/default/categories.html
 2013-09-06 19:36:52 +02:00
Manuel Raynaud
0aad4baf26 create controller adding delivery module in session 2013-09-06 19:29:19 +02:00
Manuel Raynaud
b067ef7dcc create Delivery loop 2013-09-06 18:41:44 +02:00
franck
c68f282fe8 Continuing categories administration... 2013-09-06 17:46:40 +02:00
Manuel Raynaud
a3b7e977da create base loop for delivery and payment entities 2013-09-06 17:40:49 +02:00
Manuel Raynaud
e9c47bf59d fix typo 2013-09-06 16:45:13 +02:00
Manuel Raynaud
8ba5ef616d change phpdoc for BaseLoop::exec method 2013-09-06 16:34:55 +02:00
Manuel Raynaud
5b637598e9 refactor phpdoc block for BaseLoop::getArgDefinitions(); 2013-09-06 16:31:04 +02:00
franck
af93f810f7 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-06 16:19:06 +02:00
franck
8bd7a6413d Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/admin/default/categories.html
	templates/admin/default/includes/add-category-dialog.html
	templates/admin/default/includes/delete-category-dialog.html
 2013-09-06 16:18:54 +02:00
Etienne Roudeix
1d231dc11b Merge branch 'master' of github.com:thelia/thelia 2013-09-06 16:14:38 +02:00
Etienne Roudeix
f2aad186f6 position output in loops 2013-09-06 16:13:51 +02:00
Manuel Raynaud
2dee65727d set good module delivery id in session 2013-09-06 16:12:57 +02:00
franck
6fdf60b960 Categories refactoring 2013-09-06 15:56:06 +02:00
Etienne Roudeix
b6a216fd9b substitutions : product category folder content 2013-09-06 12:21:36 +02:00
Manuel Raynaud
1686d6d87c each module is available in the container with name module.ModuleName 2013-09-06 11:43:37 +02:00
franck
bbce082df3 Fixed minor visual glitches 2013-09-06 10:41:19 +02:00
franck
30831f0ab5 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-06 09:57:18 +02:00
franck
9655ce3c72 Added a 'development mode' to assetic smarty plugin 2013-09-06 09:56:39 +02:00
Etienne Roudeix
b95218295d rewriting router 2013-09-06 08:59:06 +02:00
Etienne Roudeix
eeedd540bc Merge branch 'master' of github.com:thelia/thelia 2013-09-06 07:53:48 +02:00
Manuel Raynaud
c6884274ed Merge branch 'master' of github.com:thelia/thelia 2013-09-06 07:51:37 +02:00
Manuel Raynaud
c540bf5b09 Merge branch 'rewrite_routing' 
Conflicts:
	core/lib/Thelia/Controller/Front/UrlRewritingController.php
 2013-09-06 07:51:21 +02:00
Etienne Roudeix
351c669e05 Merge branch 'master' of github.com:thelia/thelia 2013-09-06 07:49:14 +02:00
franck
318fb3bf2d Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/admin/default/currencies.html
 2013-09-05 23:30:50 +02:00
Manuel Raynaud
00d7d9b29a create router for rewriting matching 2013-09-05 20:46:46 +02:00
gmorel
eea29cba06 WIP 
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
 2013-09-05 20:07:17 +02:00
Etienne Roudeix
a0f894d70f customer substitutions 2013-09-05 17:54:04 +02:00
franck
c276ab236e Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/admin/default/currencies.html
 2013-09-05 16:53:07 +02:00
Manuel Raynaud
40b524e9d6 add label_attr attribute to form smarty plugin 2013-09-05 14:22:28 +02:00
Manuel Raynaud
be44367d41 enable auto-escapin in smarty 2013-09-05 10:25:45 +02:00
franck
271e6c64f0 Before merging coupon 2013-09-05 10:00:17 +02:00
gmorel
23a4ff26c8 Working 
- Base create/update coupon in backoffice
 2013-09-04 19:22:20 +02:00
franck
58a68b1959 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-04 19:03:37 +02:00
franck
d3a287333e Fixed TheliaLoop Smarty plugin (lopp imbrication was broken) 2013-09-04 19:02:26 +02:00