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

1622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Raynaud
4735c232db Merge pull request #2 from thelia/coupon 
Coupon
 2013-09-27 04:21:50 -07:00
Etienne Roudeix
ab6e34cf00 Merge branch 'template' 2013-09-27 11:04:52 +02:00
Etienne Roudeix
f60670c412 translations intl 2013-09-27 11:04:14 +02:00
gmorel
1766951389 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By gmorel (24) and others
# Via gmorel (12) and others
* 'master' of https://github.com/thelia/thelia: (43 commits)
  Working : upload file/image : fix sanitizeFileName
  Working : images : enhance display
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
  Finished product combination basic function
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Formatted combination table
  Impemented combination creation
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  Upload allow only for images
  ...

Conflicts:
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml
	templates/admin/default/assets/js/coupon.js
	tests/functionnal/casperjs/exe/00_parameters.js
	tests/functionnal/casperjs/exe/31_coupons_rule.js
 2013-09-27 10:39:52 +02:00
gmorel
9d02aa75a8 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By gmorel (24) and others
# Via gmorel (12) and others
* 'master' of https://github.com/thelia/thelia: (43 commits)
  Working : upload file/image : fix sanitizeFileName
  Working : images : enhance display
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
  Finished product combination basic function
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Formatted combination table
  Impemented combination creation
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  Upload allow only for images
  ...

Conflicts:
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml
	templates/admin/default/assets/js/coupon.js
	tests/functionnal/casperjs/exe/00_parameters.js
	tests/functionnal/casperjs/exe/31_coupons_rule.js
 2013-09-27 10:37:09 +02:00
gmorel
c8e56625ad Working : upload file/image : fix sanitizeFileName 2013-09-27 10:21:49 +02:00
gmorel
116c8c31b4 Merge branch 'master' of https://github.com/thelia/thelia 
# By Manuel Raynaud (80) and others
# Via Manuel Raynaud (16) and others
* 'master' of https://github.com/thelia/thelia: (179 commits)
  Working : images : enhance display
  fix missing } in password template
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
  remove smarty cache
  Finished product combination basic function
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Formatted combination table
  Impemented combination creation
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  ...
 2013-09-27 10:20:02 +02:00
franck
62ce7db882 Merge branch 'catalog' 2013-09-26 19:07:06 +02:00
gmorel
dde8501790 WIP : coupon refactor + fix 2013-09-26 18:18:45 +02:00
gmorel
a1f898ff3b Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia:
  fix missing } in password template
  remove smarty cache
 2013-09-26 17:48:06 +02:00
gmorel
fbf7ee1625 WIP : coupon refactor + fix 2013-09-26 17:47:50 +02:00
gmorel
73fde64f5b WIP : coupon refactor + fix 2013-09-26 17:47:41 +02:00
gmorel
0cdd960cb1 Working : images : enhance display 2013-09-26 15:26:45 +02:00
gmorel
c521fb2696 WIP : Condition : refactor name 2013-09-26 14:12:59 +02:00
gmorel
9ceddf4870 WIP : Condition : refactor name 2013-09-26 14:12:53 +02:00
gmorel
4d3335f589 WIP : Condition : Fix unit text 2013-09-25 18:15:48 +02:00
gmorel
965a505864 WIP : Condition : Fix unit text 2013-09-25 17:47:42 +02:00
gmorel
0da90c4a99 WIP : Condition : Fix unit text 2013-09-25 17:22:36 +02:00
gmorel
45fabcfdd6 WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 16:47:01 +02:00
gmorel
c10074786d Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon 
* 'coupon' of https://github.com/thelia/thelia:

# By Manuel Raynaud
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia:
  allow to delete content
  toofle content visibility
  allow to load jquery offline
  allow update content position number
 2013-09-25 16:40:54 +02:00
gmorel
b7851b2d54 WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 16:36:14 +02:00
gmorel
d6172f23cf WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 14:51:42 +02:00
gmorel
cb389f126c WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 12:58:12 +02:00
gmorel
451f79be1a Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (80) and others
# Via Etienne Roudeix (18) and others
* 'coupon' of https://github.com/thelia/thelia: (179 commits)
  Working : coupon creation : Fix js
  Working : coupon creation : add default rule (thelia.constraint.rule.available_for_everyone)
  order tests
  action order tests
  cache dataccessfunctions
  order action test
  fire event on insert content in createmethod
  fix issue, default foler is set on content creation
  allow to create new content
  update default param of content model
  create content listener for crud management
  dispatch event in pre/post crud method for content model
  display content modification page
  create contentUpdateEvent
  create contentCreateEvent
  create ContentEvent
  create contentModificationForm
  create content controller
  change folder_id parm by parent in list folder view
  use placeholder in folder update route
  ...
 2013-09-25 09:27:21 +02:00
gmorel
dcd7d6dd4f Merge branch 'upload_management' of https://github.com/thelia/thelia into catalog 
* 'upload_management' of https://github.com/thelia/thelia:
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
 2013-09-25 09:26:05 +02:00
gmorel
8b5c3820d5 Merge branch 'catalog' of https://github.com/thelia/thelia into catalog 
# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Finished product combination basic function
  Formatted combination table
 2013-09-25 09:25:28 +02:00
Manuel Raynaud
9c80120383 fix missing } in password template 2013-09-25 08:01:27 +02:00
gmorel
033bebdd30 Working : coupon creation : Fix js 2013-09-24 22:46:54 +02:00
gmorel
cef3787d68 Working : Fix : Unit test 2013-09-24 19:06:10 +02:00
gmorel
87016ddddb Working : Fix : Unit test 2013-09-24 18:54:38 +02:00
gmorel
dc17f89729 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management 
# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Finished product combination basic function
  Formatted combination table
 2013-09-24 18:41:57 +02:00
gmorel
7f3367f590 Working : Fix : Image Management + Document Management 2013-09-24 18:41:28 +02:00
gmorel
71888e68aa Working : FileManager :Add some more unit tests 2013-09-24 14:50:42 +02:00
gmorel
430e18e4e2 Working : Add a link on documents 2013-09-24 12:25:19 +02:00
gmorel
0c769a3398 Working : fix url document + refactor : naming conventions 2013-09-24 12:24:40 +02:00
gmorel
17e312ca23 Working : refactor : naming conventions 2013-09-24 12:13:25 +02:00
gmorel
466113bc12 Working : upload : fix unit test 2013-09-24 11:11:50 +02:00
gmorel
084f66589a WIP : upload documents : add action, ctrl, event 2013-09-24 10:54:52 +02:00
Manuel Raynaud
d004e0411e remove smarty cache 2013-09-24 08:17:46 +02:00
Manuel Raynaud
1e571ffbc5 Merge branch 'content' 2013-09-23 23:35:05 +02:00
gmorel
d0f20cca1d Working : coupon creation : add default rule (thelia.constraint.rule.available_for_everyone) 2013-09-23 23:04:00 +02:00
gmorel
e4658d2fa2 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (68) and others
# Via Manuel Raynaud (12) and others
* 'master' of https://github.com/thelia/thelia: (119 commits)
  order tests
  action order tests
  cache dataccessfunctions
  order action test
  fire event on insert content in createmethod
  fix issue, default foler is set on content creation
  allow to create new content
  update default param of content model
  create content listener for crud management
  dispatch event in pre/post crud method for content model
  display content modification page
  create contentUpdateEvent
  create contentCreateEvent
  create ContentEvent
  create contentModificationForm
  create content controller
  change folder_id parm by parent in list folder view
  use placeholder in folder update route
  implement process for changing folder position
  allow possibility to change folder visibility
  ...

Conflicts:
	core/lib/Thelia/Coupon/CouponBaseAdapter.php
	templates/admin/default/coupon-list.html
	templates/admin/default/coupon-read.html
 2013-09-23 21:03:26 +02:00
franck
8d61a9222e Merge branch 'catalog' of https://github.com/thelia/thelia into catalog 2013-09-23 18:37:33 +02:00
franck
67bf7bb989 Finished product combination basic function 2013-09-23 18:36:55 +02:00
gmorel
695b2b4d94 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management 
# By gmorel (3) and franck (1)
* 'catalog' of https://github.com/thelia/thelia:
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Impemented combination creation
 2013-09-23 18:15:24 +02:00
gmorel
9ee8b2b75f WIP : upload document : add forms 2013-09-23 18:13:12 +02:00
gmorel
ce7a9eccfc Working : upload image : fix return URL to images tab 2013-09-23 17:28:11 +02:00
franck
4e8f4061af Merge branch 'catalog' of https://github.com/thelia/thelia into catalog 2013-09-23 17:26:28 +02:00
gmorel
21e6f3471c Working : upload image : fix fallback and delete links on refresh 2013-09-23 17:25:31 +02:00
franck
780c6b3483 Merge branch 'catalog' of https://github.com/thelia/thelia into catalog 2013-09-23 17:11:09 +02:00