TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,346 Commits 1 Branch 0 Tags
85ea937570cc676dd9c19afb7835bbdd756cd957
Commit Graph

543 Commits

Author SHA1 Message Date
badsuricate
303094055d Add hover effect on items menu 2013-10-10 15:05:34 +02:00
Manuel Raynaud
6bfca2c6b4 allow country update 2013-10-10 14:20:53 +02:00
Etienne Roudeix
c4b78966c7 stringify taxes in tax rule edition 2013-10-09 17:02:18 +02:00
Etienne Roudeix
77c9c596f1 preselected countries is tax rule edition appliance 2013-10-09 16:15:53 +02:00
Etienne Roudeix
a8594ef6af tax rule edition admin 2013-10-09 15:03:07 +02:00
touffies
7234b2e994 Merge master 2013-10-09 12:26:10 +02:00
Kahn
5aa6ce12a9 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (102 commits)
  add higher priority to module routing
  update smarty version
  select default country in front register form
  add modal error id changing default country failed
  enabled change default country
  fiw module generator class name issue
  complete javascript for changing default country
  validate country removal
  validate country creation
  implement abstract method from AbstractCrudController in Country Controller
  create country action class
  add pre/post CRUD method in Country model
  create coutry events
  finish customer address update
  complete readme
  update .gitignore file
  add specifig php.ini file for travis
  try to fix travis conf
  remove unused directory
  check session directory permission in install process
  ...
 2013-10-08 23:22:53 +02:00
Etienne Roudeix
0f6951bc21 tax rule update and delation 2013-10-08 16:02:58 +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
Etienne Roudeix
942638281a tax edition 2013-10-07 17:18:38 +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
Etienne Roudeix
fe3aea4ab7 tax types 2013-10-07 11:57:43 +02:00
touffies
53f2a33764 Merge Master 2013-10-07 11:50:20 +02:00
Etienne Roudeix
0efb01220c add tax admin css 2013-10-07 11:06:54 +02:00
Manuel Raynaud
51a307527c create coutry events 2013-10-07 10:50:44 +02:00
Etienne Roudeix
4a0403040c add tax files 2013-10-07 10:46:12 +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
gmorel
a74cf0aa85 WIP : Coupon : Fix condition edition 2013-09-27 15:57:56 +02:00
gmorel
5abe350b65 WIP : Coupon : Fix condition selection JS + Dependency Injection register 2013-09-27 14:52:38 +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