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

855 Commits

Author SHA1 Message Date
touffies
ebec82d1d2 Merge with master 2013-10-24 16:52:03 +02:00
badsuricate
e0a927daf1 Add 404 Page 2013-10-24 15:31:12 +02:00
Franck Allimant
5bf51dd47e Merge branch 'catalog' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml
 2013-10-24 00:16:33 +02:00
touffies
ac3e842662 All the fields should be with the type password. 2013-10-24 00:11:30 +02:00
Franck Allimant
7ca2399573 Worked on catalog 2013-10-23 23:47:44 +02:00
Franck Allimant
0bd57b0a5a Worked on catalog 2013-10-23 23:41:39 +02:00
Manuel Raynaud
f6b20f813f add customer order list 2013-10-23 19:53:47 +02:00
Etienne Roudeix
7433971515 Merge branch 'master' of github.com:thelia/thelia 2013-10-23 19:23:53 +02:00
Etienne Roudeix
d1024c6841 fix minor admin bugs 2013-10-23 19:23:29 +02:00
Manuel Raynaud
a7796cf481 manage lanf <=> url assignment 2013-10-23 19:04:49 +02:00
touffies
2defbb3b6c Remove temporary the filter 2013-10-23 18:14:40 +02:00
Manuel Raynaud
d81c384ce0 Merge branch 'master' of github.com:thelia/thelia 2013-10-23 18:02:23 +02:00
Manuel Raynaud
c924b2a5bd create form for language url 2013-10-23 18:02:04 +02:00
touffies
21286c2094 Bug : Minimum quantity is 1 2013-10-23 17:49:51 +02:00
touffies
f7f7444fcb Modification of "Continue Shopping" button 2013-10-23 17:47:04 +02:00
touffies
0c4592a9dd Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-23 17:27:52 +02:00
touffies
cb560691eb Fix login box 2013-10-23 17:27:41 +02:00
badsuricate
4660992d75 Add good product combination to the cart 2013-10-23 17:26:11 +02:00
badsuricate
c6a11f44c0 add class cart-container 2013-10-23 17:25:22 +02:00
badsuricate
62c64444a3 Delete console.log 2013-10-23 16:55:39 +02:00
touffies
8c55675dd8 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-23 16:51:30 +02:00
touffies
3f69abc16c Bug : Remove double quote 2013-10-23 16:51:20 +02:00
touffies
b3c956880f Add jquery validation 2013-10-23 16:50:14 +02:00
badsuricate
6fb6cc9679 Merge frontend 2013-10-23 16:47:24 +02:00
Etienne Roudeix
cf67a0478e Merge branch 'master' into tax 2013-10-23 16:32:10 +02:00
Etienne Roudeix
fb8b82093a administrators management 2013-10-23 16:31:37 +02:00
badsuricate
5515caa0d5 Internationalizing "No products available in this category" 2013-10-23 15:48:06 +02:00
badsuricate
dffb5375f5 Check if hasbtn is true to display the button "add to cart " 2013-10-23 15:45:00 +02:00
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