Commit Graph

2207 Commits

Author SHA1 Message Date
Manuel Raynaud
e18c8992f8 finish admin update password command line 2013-10-30 15:33:25 +01:00
Manuel Raynaud
b0f3ad69d2 start creating admin password recovery 2013-10-30 15:01:18 +01:00
Manuel Raynaud
9d011eb5c6 change command line for creating new administrator 2013-10-30 14:46:21 +01:00
Manuel Raynaud
2ee90d35e4 create administrator update password event 2013-10-30 14:27:45 +01:00
Etienne Roudeix
457c0460cf Merge branch 'master' of github.com:thelia/thelia 2013-10-30 12:28:30 +01:00
Manuel Raynaud
b8dad621fd remove temporary home carousel 2013-10-30 12:19:14 +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
Manuel Raynaud
e9013a0c3f Merge branch 'master' of github.com:thelia/thelia 2013-10-30 10:15:33 +01:00
Manuel Raynaud
8f90018f04 set smarty force compile to false in non debug mode 2013-10-30 10:15:07 +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
Manuel Raynaud
c74422f5dc implement module inclusion 2013-10-29 15:56:03 +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
223b39b6c1 remove ip from trustIp array 2013-10-27 20:20:22 +01:00
Manuel Raynaud
68accbe402 update license 2013-10-27 18:08:59 +01:00
Manuel Raynaud
3bde3ffca9 fix typo in sql file 2013-10-25 15:03:31 +02:00
Manuel Raynaud
30ea1f3c49 Merge pull request #82 from thelia/frontend
Frontend - 	Add GNU General Public License
2013-10-25 05:52:01 -07:00
Manuel Raynaud
51cd9f4ee8 Merge branch 'master' into frontend
Conflicts:
	templates/default/layout.tpl
2013-10-25 14:51:34 +02:00
touffies
46469541f7 Merge conflict 2013-10-25 14:47:13 +02:00
touffies
a35ae5c42e Add GNU General Public License 2013-10-25 14:41:04 +02:00
Manuel Raynaud
4b157b30eb move shim in head part 2013-10-25 14:07:23 +02:00
touffies
d9a2855084 Issue 79 : English error 2013-10-25 14:03:54 +02:00
touffies
5d1d02fa20 integration error message for coupon code 2013-10-25 14:01:09 +02:00
touffies
ede3d95fad CSS3 Media Queries for IE8 2013-10-25 13:43:18 +02:00
Manuel Raynaud
2e5c9d2799 fix image resolution 2013-10-25 12:45:21 +02:00
Manuel Raynaud
ade22f5928 Merge pull request #77 from thelia/frontend
Car url should be on lowercase
2013-10-25 03:33:20 -07:00
touffies
1cee17732a CSS3 Media Queries for IE8 2013-10-25 12:30:49 +02:00
Manuel Raynaud
de147b7b0c change visibility parameter in content and folder loops 2013-10-25 12:24:47 +02:00
touffies
a51868cc9b Remove TTC 2013-10-25 12:24:34 +02:00
touffies
a2dbde0fd3 Remove TTC 2013-10-25 12:24:03 +02:00
Manuel Raynaud
8196349ceb change visibility parameter in category loop 2013-10-25 12:23:50 +02:00
touffies
7bcbab6918 Remove "Christophe Laffont" 2013-10-25 12:20:41 +02:00
Manuel Raynaud
7cc73b7d4c fix typo in customer address book 2013-10-25 12:20:23 +02:00
Manuel Raynaud
a0cfead4b0 display status label instead of id status in account page 2013-10-25 12:14:46 +02:00
touffies
603fdfb9a3 Car url should be on lowercase 2013-10-25 12:03:23 +02:00
Manuel Raynaud
804b8599b1 Merge pull request #74 from thelia/frontend
Frontend
2013-10-25 02:54:51 -07:00