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

381 Commits

Author SHA1 Message Date
badsuricate
303094055d Add hover effect on items menu 2013-10-10 15:05:34 +02:00
touffies
7234b2e994 Merge master 2013-10-09 12:26:10 +02:00
Manuel Raynaud
7b14736716 add modal error id changing default country failed 2013-10-08 10:48:51 +02:00
Manuel Raynaud
43467681fd enabled change default country 2013-10-08 10:16:18 +02:00
Manuel Raynaud
342a1f2486 complete javascript for changing default country 2013-10-07 14:17:18 +02:00
Manuel Raynaud
ae887f6a67 validate country removal 2013-10-07 13:03:28 +02:00
Manuel Raynaud
65d23db854 validate country creation 2013-10-07 12:46:40 +02:00
touffies
53f2a33764 Merge Master 2013-10-07 11:50:20 +02:00
Manuel Raynaud
51a307527c create coutry events 2013-10-07 10:50:44 +02:00
Manuel Raynaud
f408ad5d1f finish customer address update 2013-10-07 09:53:25 +02:00
Manuel Raynaud
666b19a6ff update address process 2013-10-04 17:33:48 +02:00
Manuel Raynaud
e2ccf3714b display customer edit form 2013-10-04 12:22:22 +02:00
Manuel Raynaud
4ec9c54fbe start creating ajax loader for address update event 2013-10-03 18:02:03 +02:00
Manuel Raynaud
860a96cef5 put dedicated controller for address mangamenent 2013-10-03 16:31:15 +02:00
Manuel Raynaud
fa45df3275 allow to delete customer address 2013-10-03 15:53:30 +02:00
Manuel Raynaud
6e29325d19 create purchase order pdf 2013-10-03 10:45:21 +02:00
Manuel Raynaud
df08809a48 implement pdf invoice generation workflow 2013-10-02 16:33:43 +02:00
touffies
fd881b23f0 Merge with master 2013-10-02 11:20:48 +02:00
Manuel Raynaud
46e23c2708 fix order dropdown menu 2013-10-02 10:54:22 +02:00
Manuel Raynaud
34ec2364e3 finish contentFolder removing process 2013-10-01 10:24:09 +02:00
Manuel Raynaud
dfda04ddd2 create contentAddFolder process 2013-10-01 09:51:07 +02:00
Manuel Raynaud
cc370af113 create dedicate file for content folder management 2013-10-01 09:19:18 +02:00
Manuel Raynaud
cd5c89a33b display good content_folder on content_edit admin template 2013-09-30 18:10:05 +02:00
Manuel Raynaud
197f2d48c2 allow to change content's default folder 2013-09-30 16:14:06 +02:00
Manuel Raynaud
fc0cac2cb9 fix usage of ProfilerConnectionWrapper 2013-09-30 15:35:46 +02:00
Manuel Raynaud
f25922c60a fix breadcrumb for content/folder part 2013-09-30 15:13:04 +02:00
Manuel Raynaud
d7e9752d63 create breadcrumb and FolderPath loop 2013-09-30 15:00:51 +02:00
Manuel Raynaud
4d148f314b remove unused code in folder admin template 2013-09-30 14:36:16 +02:00
Manuel Raynaud
906c97ca62 revert hange in folder admin template 2013-09-30 14:24:33 +02:00
Manuel Raynaud
84847b8765 fix form_enctype smarty function 2013-09-30 13:07:15 +02:00
mespeche
ed335847ce No options extend 2013-09-30 10:23:39 +02:00
mespeche
2a6c50c865 Merge branch 'views-management' of https://github.com/thelia/thelia into views-management 
Conflicts:
	templates/admin/default/tax-rule-edit.html
 2013-09-30 10:14:11 +02:00
mespeche
43238103c7 Start selectbox in modal to choose country 2013-09-30 09:17:59 +02:00
touffies
cbf0d19dcd Refonte du code javascript pour mieux gérer le drag and drop, maintenant il faudrait ajouter un peu de css. 2013-09-27 17:23:08 +02:00
Etienne Roudeix
a647bfd016 Merge branch 'master' into tax 
Conflicts:
	local/config/schema.xml
 2013-09-27 13:35:39 +02:00
touffies
bce83ea5c0 Test commit with coda 2013-09-27 12:32:16 +02:00
touffies
a82d671d4a Change dragging 
containment
 2013-09-27 11:59:35 +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
Etienne Roudeix
622e1ca3b6 Merge branch 'master' into tax 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-09-27 10:29:51 +02:00
macuser
6840ad362e Taxe Rules : Modification du javascript Drag & Drop pour ordonner les éléments. 2013-09-27 01:38:26 +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
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
mespeche
be4c6380e7 Setting taxe rule drag and drop functionnal with sortable rule group 2013-09-26 15:24:31 +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
Etienne Roudeix
34ef5cf524 edit order form 2013-09-26 13:07:51 +02:00
Etienne Roudeix
5e0f9cedf5 fix tests 2013-09-26 10:43:09 +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