Commit Graph

20 Commits

Author SHA1 Message Date
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +02:00
Etienne Roudeix
f564db2a8b WIP : admin profiles 2013-10-21 11:44:33 +02:00
Manuel Raynaud
d6e26e428e Merge branch 'master' into frontend
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	templates/admin/default/tax-rule-edit.html
	templates/admin/default/taxes-rules.html
2013-10-18 16:41:39 +02:00
touffies
ca1587c6e7 Merge with Master 2013-10-15 11:05:05 +02:00
Etienne Roudeix
0ae9c562e4 tax rule edition 2013-10-14 14:58:08 +02:00
Etienne Roudeix
763026700d tax rule edition 2013-10-11 11:09:23 +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
Etienne Roudeix
0f6951bc21 tax rule update and delation 2013-10-08 16:02:58 +02:00
Etienne Roudeix
942638281a tax edition 2013-10-07 17:18:38 +02:00
Etienne Roudeix
4a0403040c add tax files 2013-10-07 10:46:12 +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
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
macuser
6840ad362e Taxe Rules : Modification du javascript Drag & Drop pour ordonner les éléments. 2013-09-27 01:38:26 +02:00
mespeche
be4c6380e7 Setting taxe rule drag and drop functionnal with sortable rule group 2013-09-26 15:24:31 +02:00