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

496 Commits

Author SHA1 Message Date
Franck Allimant
2aefb87db7 Finished log configuration. All loggers are currentrly working 2013-11-01 16:15:19 +01:00
Etienne Roudeix
899a154350 Merge branch 'master' of github.com:thelia/thelia 2013-10-31 15:33:30 +01:00
Franck Allimant
3b9f94cec8 Using now templates instead of hard code in AdminUtilities smarty plugin 2013-10-31 12:16:14 +01:00
Etienne Roudeix
00dab8e7ec review jqplot 2013-10-31 11:20:51 +01:00
Etienne Roudeix
e5f5570d2b Merge branch 'master' of github.com:thelia/thelia 2013-10-31 11:20:42 +01:00
Franck Allimant
d1c54ea62a Merge branch 'catalog' 
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
 2013-10-30 19:55:10 +01:00
Franck Allimant
f5828dc18b added timestamp parameter to format_date sparty plugin 2013-10-30 19:52:47 +01:00
Etienne Roudeix
f90df03f7d admin home stats 2013-10-30 17:00:38 +01:00
Etienne Roudeix
083dde5e93 admin home stats 2013-10-30 16:32:24 +01:00
Manuel Raynaud
86d84462ad clean some code in FileController 2013-10-30 16:13:06 +01:00
Franck Allimant
a11a013eb0 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-30 15:44:57 +01:00
Franck Allimant
0cabe7b9e8 Combination creation management 2013-10-30 15:44:32 +01:00
Etienne Roudeix
52fa6783f3 datepicker in admin logs 2013-10-30 12:00:48 +01:00
Etienne Roudeix
19e373f7fe Merge branch 'master' of github.com:thelia/thelia 2013-10-29 16:10:10 +01:00
Etienne Roudeix
a055f3b3eb admin log 2013-10-29 16:09:50 +01:00
Etienne Roudeix
082f9aff8d admin logs 2013-10-29 12:22:34 +01:00
Manuel Raynaud
7a2469cdc8 allow to create a customer in bakcoffice 2013-10-28 16:55:07 +01:00
Etienne Roudeix
2eb5fc821c mailing sytem admin 2013-10-28 12:24:59 +01:00
Manuel Raynaud
2c030f910b fix cs 2013-10-25 10:07:21 +02:00
Etienne Roudeix
8043b50c75 new permission system in controllers 2013-10-25 08:59:09 +02:00
Franck Allimant
0d50557269 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-25 00:33:52 +02:00
Franck Allimant
06cc8ce1ea Finished product combinations edition 2013-10-25 00:32:56 +02:00
Manuel Raynaud
60683b7a32 Merge pull request #56 from thelia/frontend 
Wrong name form used into updateAction (CustomerController)
 2013-10-24 12:56:37 -07:00
touffies
29c2d543fb Wrong name form used into updateAction (CustomerController) 2013-10-24 21:39:50 +02:00
Manuel Raynaud
a85c0a75cf Merge pull request #55 from thelia/frontend 
Frontend
 2013-10-24 12:31:42 -07:00
Manuel Raynaud
97d3be6104 fix AdminResources constant in MessageController 2013-10-24 19:52:09 +02:00
touffies
64985faedc small fix 2013-10-24 19:49:52 +02:00
touffies
b0fb0fdd43 I need the route cart.view for the OrderException.php file. 2013-10-24 19:39:54 +02:00
Manuel Raynaud
1f3315a3ec Merge pull request #54 from thelia/frontend 
Change some route to use the default
 2013-10-24 10:18:03 -07:00
touffies
ca5d7d2a00 Change some route to use the default 
$this->redirectToRoute('default', array('view'=>'cart'));
 2013-10-24 18:51:49 +02:00
Manuel Raynaud
10f78b90a5 Merge pull request #49 from thelia/frontend 
Frontend
 2013-10-24 08:07:18 -07:00
Franck Allimant
87df547668 Removed var_dump(à 2013-10-24 17:01:10 +02:00
Franck Allimant
54f2172ca1 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-24 16:56:52 +02:00
Franck Allimant
d0213f36d4 Removed forgotten var_dump(). 2013-10-24 16:56:14 +02:00
Manuel Raynaud
9b5c631fcb Merge branch 'master' of github.com:thelia/thelia 2013-10-24 16:55:09 +02:00
touffies
ebec82d1d2 Merge with master 2013-10-24 16:52:03 +02:00
Franck Allimant
4f7e7660ca Finished PSE management for products with no combinations 2013-10-24 16:39:22 +02:00
Manuel Raynaud
2f7dcb7f51 remove tooltip from coupon edit controller 2013-10-24 15:55:35 +02:00
Franck Allimant
b9410bba59 Implemented prices conversion management 2013-10-24 12:34:44 +02:00
Etienne Roudeix
ca03e374f2 newsletter modification from account 
email modification from account
 2013-10-24 12:10:35 +02:00
touffies
009e779110 Update profil [It's not working yet] 2013-10-24 00:19:00 +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
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
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
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
Etienne Roudeix
a631a4e174 fix tagged_form_field 2013-10-23 18:00:04 +02:00