TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,978 Commits 1 Branch 0 Tags
77959afefa6eaf2d99ee0050743feaf63e2da0fa
Commit Graph

796 Commits

Author SHA1 Message Date
badsuricate
77959afefa Add AJAX on "Add to Cart" buttons 2013-10-23 15:33:47 +02:00
touffies
c48c7b5486 issues/45 : Check if an input field has focus on the mini login form, if no we hide the form 2013-10-22 22:48:22 +02:00
touffies
ac70075a38 Newsletter subscription with ajax 2013-10-22 22:26:33 +02:00
touffies
f844080758 Align the navbar on the right 
Add google map for the contact page
 2013-10-22 18:17:53 +02:00
touffies
9c702e8d14 Integration : Add min height to the product tabs 2013-10-22 16:35:53 +02:00
touffies
aa842c510a Wrong class name on the carousel-control 2013-10-22 16:31:55 +02:00
touffies
0a4c3e2d6e Fix password forgotten route 2013-10-22 16:16:40 +02:00
touffies
8f48a56774 Contact page integration 2013-10-22 15:30:14 +02:00
badsuricate
11d1fa46f7 Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-22 12:03:06 +02:00
touffies
9d5aa5e077 Merge branch 'master' into frontend 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-10-22 11:55:58 +02:00
Etienne Roudeix
cb0619a7b3 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 11:33:24 +02:00
Manuel Raynaud
5755da1e8c change newsletter success message 2013-10-22 11:22:23 +02:00
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +02:00
Manuel Raynaud
cc4f4f0bbe create newsletter template 2013-10-22 10:49:30 +02:00
badsuricate
dbcfd8965f Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-22 10:24:03 +02:00
touffies
945471dd8a Modify contact form name for the front 2013-10-22 10:20:21 +02:00
touffies
e9c6f403a3 Merge branch 'master' into frontend 2013-10-22 10:17:47 +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
touffies
b64dedefc6 Add new page to modify the customer password 2013-10-22 09:27:33 +02:00
Etienne Roudeix
cdeda0123e Merge branch 'master' into tax 2013-10-21 19:12:07 +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
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
badsuricate
b99f24c072 Change value $hasBtn to true 2013-10-21 16:40:27 +02:00
Manuel Raynaud
043eab7ccf fix typo in product breadcrumb 2013-10-21 14:28:03 +02:00
badsuricate
d1e59306b3 Add error message if the category haven't got products 2013-10-21 12:50:55 +02:00
badsuricate
d7afc641d7 SHow production information on products table 2013-10-21 12:49:14 +02:00
badsuricate
1a85589da4 Use the argument "hasBtn" to display or hide "Add to cart" button 2013-10-21 12:48:19 +02:00
badsuricate
018aaf51bc Add next and previous product 2013-10-21 12:39:31 +02:00
Manuel Raynaud
3dcb399d01 fix cartItem updateQuantity method 2013-10-21 12:21:33 +02:00
Etienne Roudeix
f564db2a8b WIP : admin profiles 2013-10-21 11:44:33 +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
07a2944618 Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-18 16:51:50 +02:00
touffies
bba7b9bb76 Missing ajax-loader icon 2013-10-18 16:48:38 +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
1ee45e0cb2 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-18 16:00:14 +02:00
touffies
b21f7efc73 Remove debug bar 2013-10-18 15:59:08 +02:00
touffies
268e5355aa Add loader css 2013-10-18 15:46:32 +02:00
badsuricate
2257623c3b Change this page on public page 2013-10-18 14:49:47 +02:00
touffies
d204a32c09 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-18 12:43:27 +02:00
touffies
3fe1716bc4 Bug : Remove close tag </a> 2013-10-18 12:40:08 +02:00
badsuricate
e80b2157b1 Modification font-size of price elements 2013-10-18 11:04:42 +02:00
badsuricate
4b65675bef add page View All 2013-10-18 11:04:10 +02:00
badsuricate
cab914bb64 Add button "add product to cart" 2013-10-18 10:55:47 +02:00
badsuricate
67ca9bfeec Footer : 
Static to dynamic content
 2013-10-18 10:54:34 +02:00