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

927 Commits

Author SHA1 Message Date
badsuricate
b8c433f92c reorganize the menu to display the number of products by categories 2013-10-23 15:43:46 +02:00
Manuel Raynaud
3dd51d98b6 process default behacior for languages 2013-10-23 15:41:41 +02:00
badsuricate
e35d17346d Add CSS to align "Upsell Products" 2013-10-23 15:41:40 +02:00
badsuricate
41713d68be add css for modal-box 2013-10-23 15:37:56 +02:00
badsuricate
77959afefa Add AJAX on "Add to Cart" buttons 2013-10-23 15:33:47 +02:00
Manuel Raynaud
5542d8c494 create lang defaultBehavior form 2013-10-23 15:03:23 +02:00
Manuel Raynaud
53e25ce7c1 process delete language 2013-10-23 12:38:33 +02:00
Manuel Raynaud
b16edfbd1d create language delete event object 2013-10-23 12:38:32 +02:00
Manuel Raynaud
24b504ad3b finish language creation process 2013-10-23 12:38:32 +02:00
Manuel Raynaud
eac2c274e7 change http code status on different context 2013-10-23 12:38:32 +02:00
Manuel Raynaud
d356974ef7 create lang toggleDefault object 2013-10-23 12:38:32 +02:00
Manuel Raynaud
7915552fe6 create ajax modal for lang edition 2013-10-23 12:38:32 +02:00
Manuel Raynaud
c15431a468 create languages pages 2013-10-23 12:38:32 +02:00
Etienne Roudeix
3c69e38a3b Merge branch 'tax' 2013-10-23 08:49:24 +02:00
touffies
5dc33aec4d Remove duplicate class "panel" 2013-10-22 23:45:56 +02:00
gmorel
b45fbef2ad 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-22 23:01:04 +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
Etienne Roudeix
29d4ecbe35 Merge branch 'master' into tax 2013-10-22 20:20:40 +02:00
Etienne Roudeix
dba4a129ff module access management 2013-10-22 20:20:15 +02:00
Etienne Roudeix
44a5909c81 permission resource 2013-10-22 19:51:01 +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
Etienne Roudeix
0d242a4fc0 fix auth loop on index 2013-10-22 16:53:40 +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
Etienne Roudeix
ddd8c4f7a5 fix auth loop 2013-10-22 15:57:31 +02:00
touffies
8f48a56774 Contact page integration 2013-10-22 15:30:14 +02:00
Etienne Roudeix
c94fa9bc24 permission management 2013-10-22 15:04:06 +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
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
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