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

512 Commits

Author SHA1 Message Date
Franck Allimant
3b9f94cec8 Using now templates instead of hard code in AdminUtilities smarty plugin 2013-10-31 12:16:14 +01:00
Franck Allimant
a295fee0d3 Changed ModulesAdmin dir into AdminIncludes - Updated debug bar module 2013-10-31 11:36:56 +01:00
Franck Allimant
a06d83bfb4 Fixed exception if module content is empty 2013-10-30 20:10:37 +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
Franck Allimant
3019d36356 Minor adjustements 2013-10-30 17:31:02 +01:00
Franck Allimant
c7835758e5 Minor css tuning, renamed "details" tab of categories edition to 
associaitons
 2013-10-30 16:32:36 +01:00
Franck Allimant
9f11f475ee Typo 2013-10-30 15:47:21 +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
a540c50395 fix administrators management bug 2013-10-30 14:51:13 +01:00
Etienne Roudeix
e998717c9b remove not working datepicker in coupons 2013-10-30 12:02:50 +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
Manuel Raynaud
1e65ad8cf3 add shim and respond in backoffice 2013-10-28 16:10:06 +01:00
Manuel Raynaud
1c3aeb969d select correct country in selectbox on customer edit page 2013-10-28 15:42:34 +01:00
Manuel Raynaud
23c4a14d2c Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	templates/admin/default/customer-edit.html
 2013-10-28 15:41:48 +01:00
Manuel Raynaud
c1e792d5b1 format customer address list 2013-10-28 15:39:59 +01:00
Manuel Raynaud
9c89bed23d Merge branch 'master' of github.com:thelia/thelia 2013-10-28 15:39:05 +01:00
Manuel Raynaud
968c372a5f add some info in addresses list 2013-10-28 12:36:07 +01:00
Etienne Roudeix
1950e1f3c5 Merge branch 'master' of github.com:thelia/thelia 2013-10-28 12:25:25 +01:00
Etienne Roudeix
2eb5fc821c mailing sytem admin 2013-10-28 12:24:59 +01:00
Manuel Raynaud
f44d1dde73 change class for button group in customer list 2013-10-28 12:16:56 +01:00
Manuel Raynaud
3ac7d97661 remove company column in customer list 2013-10-28 12:09:47 +01:00
Manuel Raynaud
40a99e6f82 fix foler/content edit link 2013-10-28 12:05:42 +01:00
Manuel Raynaud
d8e0a0aa11 update category/product edit link on images 2013-10-28 12:03:38 +01:00
Manuel Raynaud
2bec1d8193 remove some unused blocks 2013-10-25 10:27:29 +02:00
Manuel Raynaud
22caf28f80 add thelia version in admin home page 2013-10-25 09:42:30 +02:00
Franck Allimant
d9fc945015 Added TAX_RUl_ID to simple part of product loop 2013-10-25 00:46:25 +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
a85c0a75cf Merge pull request #55 from thelia/frontend 
Frontend
 2013-10-24 12:31:42 -07:00
touffies
29c7d077c6 Wrong form name 
thelia.admin.customer.modification
replaced by
thelia.admin.customer.update
 2013-10-24 21:12:32 +02:00
Etienne Roudeix
d8611c2965 admin search in customer and products 2013-10-24 20:26:00 +02:00
Etienne Roudeix
6ea61ff68c searchLoopInterface + use in OrderLoop 2013-10-24 19:50:09 +02:00
Manuel Raynaud
d1cccb13cb remove some links in admin config part 2013-10-24 17:28:50 +02:00
Manuel Raynaud
10f78b90a5 Merge pull request #49 from thelia/frontend 
Frontend
 2013-10-24 08:07:18 -07: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
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
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