Manuel Raynaud
|
1e549c2b8f
|
change default locale in config.xml for translator
|
2013-10-31 09:39:22 +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 |
|
Manuel Raynaud
|
86d84462ad
|
clean some code in FileController
|
2013-10-30 16:13:06 +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 |
|
Manuel Raynaud
|
eae231148e
|
Merge branch 'admin'
Conflicts:
core/lib/Thelia/Command/AdminUpdatePasswordCommand.php
core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php
|
2013-10-30 15:37:33 +01:00 |
|
Manuel Raynaud
|
78cba61cd5
|
finish admin update password command line
|
2013-10-30 15:35:11 +01:00 |
|
Manuel Raynaud
|
66c30a1b4c
|
start creating admin password recovery
|
2013-10-30 15:35:11 +01:00 |
|
Manuel Raynaud
|
c327b20fd6
|
change command line for creating new administrator
|
2013-10-30 15:35:11 +01:00 |
|
Manuel Raynaud
|
7caa0a10e6
|
create administrator update password event
|
2013-10-30 15:35:11 +01:00 |
|
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 |
|
Etienne Roudeix
|
a540c50395
|
fix administrators management bug
|
2013-10-30 14:51:13 +01:00 |
|
Manuel Raynaud
|
9d011eb5c6
|
change command line for creating new administrator
|
2013-10-30 14:46:21 +01:00 |
|
Etienne Roudeix
|
434092a33b
|
admin login is now unique
|
2013-10-30 14:45:50 +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 |
|