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

1574 Commits

Author SHA1 Message Date
Manuel Raynaud
6b8c7602b4 create newsletter event 2013-10-22 09:45:37 +02:00
touffies
0c1ed8e702 Cleanup : 
- I made the form id different between the front and the back office
- I renamed a few files to use the same convention (create / update)
 2013-10-22 09:44:45 +02:00
Manuel Raynaud
aabd05f17f create form and controller for newsletter 2013-10-22 09:42:57 +02:00
Manuel Raynaud
f4c4cea32b create newsletter entity 2013-10-22 09:36:52 +02:00
Manuel Raynaud
f70c5362e9 fix typo 2013-10-22 09:13:21 +02:00
Manuel Raynaud
af51086fcb Merge branch 'master' of github.com:thelia/thelia 2013-10-22 09:12:23 +02:00
Manuel Raynaud
4630007bc2 fix typo in error message 2013-10-22 09:11:33 +02:00
gmorel
9c7c4e851e Working cleaning 2013-10-21 23:09:04 +02:00
gmorel
42aa46905b Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (33 commits)
  permissions
  finish contact process
  create contact form
  create example for mail usage
  permission cleanup
  change place where absolute url is create when rewritten url is enabled
  fix issue #43
  fix typo in product breadcrumb
  update countries list
  fix issue #35
  fix cartItem updateQuantity method
  add some verification on country default trigger
  not allowed to delete default country
  WIP : admin profiles
  fiw test suite
  clear cache when a module is removed
  end module removal
  create event object for module delete action
  update insert script
  new model
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
 2013-10-21 22:49:32 +02:00
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
gmorel
f276ccfa37 WIP : Implement coupon check on ordering tunnel 
@todo CSS
@todo List coupon used and detailed effects
 2013-10-20 23:01:12 +02:00
gmorel
8c4ca21615 Working : Missing type inference 2013-10-20 22:46:00 +02:00
gmorel
ad69c45e4f Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (87 commits)
  Missing ajax-loader icon
  don't use alternative Logger in debugbar if debug is disabled
  Remove debug bar
  Move temporarily fontawesome's font into the web folder
  Add loader css
  fix product visibility comparaison parameter
  Change this page on public page
  Bug : Remove close tag </a>
  decode url before searching if it's a rewritten url
  Modification font-size of price elements
  add page View All
  Add button "add product to cart"
  Footer : Static to dynamic content
  Add order on attribute_combination loop
  Fix bug in Content Loop with "current_folder" params
  Creation of Content page
  Change path /customer/account into /account
  Change path :  /customer/update into /account/update  /password into /account/password
  CustomerUpdateForm - Extend CustomerCreation
  Update profile - new method [Not finished yet]
  ...
 2013-10-20 21:11:58 +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
Franck Allimant
ada32660fe Impelmented form collections 2013-10-18 16:35:49 +02:00
Manuel Raynaud
b24546a12c fix product visibility comparaison parameter 2013-10-18 15:45:11 +02:00
Manuel Raynaud
0e5b902752 hardcode utf8 parameters 2013-10-18 13:57:24 +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