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

814 Commits

Author SHA1 Message Date
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
touffies
fe5b72202c Add Bootbox.js (Extend the Bootstrap dialog for confirm and alert) 2013-10-07 11:45:03 +02:00
touffies
d6e09b4840 Optimization : User only 1 file for Bootstrap js 2013-10-07 11:43:59 +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
touffies
35b1ed6c04 Optimisation : Use only one file for bootstrap 2013-10-07 10:15:06 +02:00
Manuel Raynaud
f408ad5d1f finish customer address update 2013-10-07 09:53:25 +02:00
Manuel Raynaud
9335002b88 Merge branch 'master' into customer 2013-10-07 09:45:28 +02:00
Manuel Raynaud
db3bf14ea7 complete readme 2013-10-07 09:37:19 +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
touffies
969071f7f2 Cleanup : remove plugin magnify 2013-10-04 09:11:16 +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
9fcbeab69c complete invoice pdf template 2013-10-02 18:03:25 +02:00
touffies
98e189390d Breadcrumbs completed 2013-10-02 17:58:39 +02:00
Manuel Raynaud
df08809a48 implement pdf invoice generation workflow 2013-10-02 16:33:43 +02:00
touffies
c56a7851e1 Merge with master (Conflict) 2013-10-02 11:26:11 +02:00
touffies
fd881b23f0 Merge with master 2013-10-02 11:20:48 +02:00
touffies
1cd82159b0 Modification of the breadcrumb 2013-10-02 11:00:28 +02:00
Manuel Raynaud
46e23c2708 fix order dropdown menu 2013-10-02 10:54:22 +02:00
touffies
74c8de724f Creation of a new file breadcrumb.tpl 2013-10-01 15:20:40 +02:00
touffies
988fe23b78 Add a new block : body-class 2013-10-01 11:53:19 +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
Manuel Raynaud
d37e28af19 rename order* file template 2013-09-30 11:12:15 +02:00
Manuel Raynaud
7bf5ee31c9 Merge branch 'refactor_action' 
Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php
 2013-09-30 10:26:59 +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
f9bffe9025 fix template 2013-09-27 15:23:35 +02:00
Etienne Roudeix
a647bfd016 Merge branch 'master' into tax 
Conflicts:
	local/config/schema.xml
 2013-09-27 13:35:39 +02:00
Manuel Raynaud
4735c232db Merge pull request #2 from thelia/coupon 
Coupon
 2013-09-27 04:21:50 -07: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
Etienne Roudeix
7b3e7ece4d Merge branch 'master' into tax 2013-09-27 11:06:16 +02:00