Commit Graph

1450 Commits

Author SHA1 Message Date
Etienne Roudeix
cdeda0123e Merge branch 'master' into tax 2013-10-21 19:12:07 +02:00
Etienne Roudeix
d13434bb08 permissions 2013-10-21 19:11:42 +02:00
Manuel Raynaud
9ce90abdf5 finish contact process 2013-10-21 19:07:59 +02:00
Manuel Raynaud
c0781455cb create contact form 2013-10-21 18:33:03 +02:00
Manuel Raynaud
4236a16e49 create example for mail usage 2013-10-21 18:04:48 +02:00
Etienne Roudeix
abe45c5798 Merge branch 'master' into tax
Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php
2013-10-21 17:48:13 +02:00
Etienne Roudeix
9a7708451a permission cleanup 2013-10-21 17:44:17 +02:00
Manuel Raynaud
1f55d569ef change place where absolute url is create when rewritten url is enabled 2013-10-21 15:15:17 +02:00
Manuel Raynaud
dff112dba4 fix issue #43 2013-10-21 14:34:08 +02:00
Manuel Raynaud
ee57c7cbcf fix issue #35 2013-10-21 12:34:31 +02:00
Manuel Raynaud
3dcb399d01 fix cartItem updateQuantity method 2013-10-21 12:21:33 +02:00
Manuel Raynaud
0ba6a599a9 add some verification on country default trigger 2013-10-21 12:08:19 +02:00
Manuel Raynaud
9ca612ae0d not allowed to delete default country 2013-10-21 11:54:15 +02:00
Etienne Roudeix
f564db2a8b WIP : admin profiles 2013-10-21 11:44:33 +02:00
Manuel Raynaud
a16fb0d890 fiw test suite 2013-10-21 11:40:45 +02:00
Manuel Raynaud
6c6227c77a clear cache when a module is removed 2013-10-21 11:32:50 +02:00
Manuel Raynaud
28b7423443 end module removal 2013-10-21 11:30:19 +02:00
Manuel Raynaud
a10fa20340 create event object for module delete action 2013-10-21 10:26:51 +02:00
Manuel Raynaud
9d794e229d Merge branch 'master' into module_management
Conflicts:
	core/lib/Thelia/Core/Template/Loop/TaxRuleCountry.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
2013-10-21 09:19:08 +02:00
Etienne Roudeix
c63c509f2f Merge branch 'master' into tax
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	templates/admin/default/configuration.html
2013-10-21 08:13:18 +02:00
Etienne Roudeix
0300470f7d new model 2013-10-21 08:10:55 +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
Manuel Raynaud
b24546a12c fix product visibility comparaison parameter 2013-10-18 15:45:11 +02:00
touffies
d204a32c09 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-18 12:43:27 +02:00
Manuel Raynaud
392d8a3559 decode url before searching if it's a rewritten url 2013-10-18 11:24:19 +02:00
badsuricate
4b65675bef add page View All 2013-10-18 11:04:10 +02:00
badsuricate
dea93ccb50 Fix bug in Content Loop with "current_folder" params 2013-10-18 10:52:40 +02:00
Manuel Raynaud
e602884ce0 end module activation 2013-10-18 10:06:42 +02:00
touffies
f413688dc4 Change path :
/customer/update into /account/update
 /password into /account/password
2013-10-18 10:00:06 +02:00
touffies
59cfe8da8b CustomerUpdateForm - Extend CustomerCreation 2013-10-18 09:49:14 +02:00
touffies
9b617755ca Update profile - new method [Not finished yet] 2013-10-18 09:47:11 +02:00
touffies
871bc217a4 Add new form customer.update
Add new form thelia.customer.update
2013-10-18 09:44:01 +02:00
Manuel Raynaud
52ed89f1aa fix cs 2013-10-18 09:28:17 +02:00
Manuel Raynaud
12b5a81364 display error on ajax module activation 2013-10-18 09:17:08 +02:00
Manuel Raynaud
3a4fb6f2d2 clear cache after each activatin or deactivation 2013-10-18 08:33:46 +02:00
Manuel Raynaud
2ecd1caac6 dispatching event for clearing cache 2013-10-18 08:25:42 +02:00
Manuel Raynaud
6d791f5bf7 process module toggle activation 2013-10-17 18:50:00 +02:00
Manuel Raynaud
d25ad53d5a create module event and eventListener 2013-10-17 18:26:23 +02:00
Manuel Raynaud
1b0de7144a end updating module list 2013-10-17 17:20:29 +02:00
Manuel Raynaud
1b865d71a3 crowl all module descriptor file for discovering new modules 2013-10-17 15:36:11 +02:00
Etienne Roudeix
dc2de702e8 tax rule set default in back office 2013-10-17 15:31:09 +02:00
Manuel Raynaud
a9d5554b7c create method for validating module file descriptor 2013-10-17 15:06:13 +02:00
Etienne Roudeix
dad2591a57 end tax edition 2013-10-17 11:53:26 +02:00
Manuel Raynaud
c9dbb610c1 start validating module.xml file 2013-10-17 11:32:29 +02:00
Manuel Raynaud
84ad1e6f95 start creating xsd module management 2013-10-16 17:39:32 +02:00
Etienne Roudeix
a2048bec24 theliatype in form : types now extends bastype which implement typeinterface
basetype provides verifiyForm method wich can be call in Callback constraint
2013-10-16 17:10:53 +02:00
Etienne Roudeix
60fd54d5c3 restart thelia form type 2013-10-16 16:20:21 +02:00
touffies
fbebadaff0 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-16 12:47:52 +02:00
touffies
1960447a45 Remove method renderFormFieldCheckBox 2013-10-16 12:47:02 +02:00
touffies
3f214291d7 - Add agreements checkbox 2013-10-16 12:38:44 +02:00