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

986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gmorel
2d6787e588 WIP 
- Coupon : add rule input ajax controller
 2013-09-09 10:03:00 +02:00
gmorel
447488f063 WIP 
- Refactor Coupon : is Customer matching Coupon rules (increase code coverage)
 2013-09-08 18:00:31 +02:00
gmorel
91cf4ec752 Merge remote-tracking branch 'origin/coupon' into coupon 2013-09-08 17:37:24 +02:00
gmorel
e78ba1f670 WIP 
- Refactor Coupon : is Customer matching Coupon rules
 2013-09-08 17:36:21 +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
9bb48a2ef1 remove unused class 2013-09-07 16:54:18 +02:00
Manuel Raynaud
525e449fb2 Merge branch 'master' of github.com:thelia/thelia 2013-09-07 16:40:14 +02:00
Manuel Raynaud
b036f16437 integrate debugbar module 2013-09-07 16:39:52 +02:00
Manuel Raynaud
1e660cd930 Merge branch 'delivery' 
Conflicts:
	composer.lock
	install/insert.sql
 2013-09-07 16:37:54 +02:00
Manuel Raynaud
9ebf16f1f6 remove htmlpurifier 2013-09-07 16:36:41 +02:00
Manuel Raynaud
c9aa06fd70 modify insert.sql including debugBar module 2013-09-07 16:34:51 +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
49be95a2e7 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:38:08 +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
c6612a0246 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-06 17:51:10 +02:00
mespeche
ae667d33ee Working : 
- Nice construct of search form
 2013-09-06 17:50:19 +02:00
franck
d11906eca5 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
 2013-09-06 17:48:12 +02:00
franck
c68f282fe8 Continuing categories administration... 2013-09-06 17:46:40 +02:00
mespeche
0adbb9a997 Working : 
- Replacing the search form who had disappeared
 2013-09-06 17:45:22 +02:00
Manuel Raynaud
a3b7e977da create base loop for delivery and payment entities 2013-09-06 17:40:49 +02:00
Manuel Raynaud
2fda14cfeb remove htmlpurifier dependency 2013-09-06 17:35:51 +02:00
Manuel Raynaud
fa7d88f8dc country id can be an argument for calculate method 2013-09-06 17:34:25 +02:00
franck
8b82f58a5b Merge branch 'master' of https://github.com/thelia/thelia 2013-09-06 17:24:05 +02:00
mespeche
771d9e6322 Working : 
- Add product attributes edit routing
- Add product attributes edit action
 2013-09-06 17:23:06 +02:00
mespeche
eebe1d4f58 Working : 
- Rename file for best practices regard
 2013-09-06 16:47:21 +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
mespeche
def9b5dd1b Merge branch 'master' of https://github.com/thelia/thelia 2013-09-06 16:33:50 +02:00
mespeche
c5f1e5288c Working : 
- Create product_attributes view for loop intergration
 2013-09-06 16:32:27 +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
Manuel Raynaud
1c307385ce fix typo 2013-09-06 16:16:48 +02:00
Manuel Raynaud
ab134f872c Merge branch 'master' of github.com:thelia/thelia 2013-09-06 16:15:04 +02:00
Etienne Roudeix
1d231dc11b Merge branch 'master' of github.com:thelia/thelia 2013-09-06 16:14:38 +02:00
Manuel Raynaud
3ac3224e1c add help in BaseController for retrieving the translator (method 
getTranslator)
 2013-09-06 16:14:35 +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
mespeche
ebb350111a Working : 
- Add attribute and feature routes  management
- Add product attributes view
 2013-09-06 15:00:52 +02:00
mespeche
56de467362 Working : 
- Add label information in Form file
- Refactor to bootstrap3
 2013-09-06 12:55:53 +02:00
mespeche
fed1795e93 Working : 
- Change alert class
 2013-09-06 12:30:40 +02:00
mespeche
a9f2b70ab5 Working : 
- fix route name in ConfigController
 2013-09-06 12:29:38 +02:00