Julien Chanséaume
|
51c11a83a0
|
conflicts resolved
|
2014-04-28 12:46:42 +02:00 |
|
Julien Chanséaume
|
7c4ebe6bf7
|
php cs fixer
|
2014-04-28 12:30:31 +02:00 |
|
Julien Chanséaume
|
ac51ab21e4
|
add estimated shipping functionnality in cart
|
2014-04-28 12:24:43 +02:00 |
|
Manuel Raynaud
|
f556a7d149
|
Merge pull request #344 from bibich/fix-cart-currency
fix cart item prices when not on default currency
|
2014-04-28 12:20:58 +02:00 |
|
Julien Chanséaume
|
6553c6ad10
|
unnecessary code removed
|
2014-04-28 12:15:08 +02:00 |
|
Julien Chanséaume
|
3bacb0a917
|
refactore currency calculations in ProductSaleElements
|
2014-04-28 12:07:45 +02:00 |
|
Manuel Raynaud
|
e2aad64a70
|
Merge pull request #346 from lunika/dev
escape smarty variables
|
2014-04-28 11:09:57 +02:00 |
|
Manuel Raynaud
|
c7a611a9ec
|
escape smarty variables
|
2014-04-28 11:09:16 +02:00 |
|
Franck Allimant
|
657af6e8f1
|
Ajout du vidage des caches assets, images et documents
|
2014-04-26 17:06:10 +02:00 |
|
Franck Allimant
|
d7b9479cb9
|
Added vertical-row-space style, to add some space after a row
|
2014-04-26 17:02:35 +02:00 |
|
Franck Allimant
|
0da5dc00c4
|
Fixed file input, thant should not have form-control class
|
2014-04-26 16:51:21 +02:00 |
|
Franck Allimant
|
736d3b3598
|
Viasul awarning when a module could not be instanciated.
|
2014-04-26 16:02:56 +02:00 |
|
Franck Allimant
|
5c6940b427
|
Uses new helper functions
|
2014-04-26 16:02:23 +02:00 |
|
Franck Allimant
|
addbd9a84c
|
Check if modules could be instantiated
|
2014-04-26 16:01:22 +02:00 |
|
Franck Allimant
|
d8c2f35446
|
Added some helper methods
|
2014-04-26 16:01:05 +02:00 |
|
Julien Chanséaume
|
337ec978d2
|
add estimated shipping functionnality in cart
|
2014-04-25 16:58:16 +02:00 |
|
Julien Chanséaume
|
b86ac88ce4
|
fix cart item prices when not on default currency
|
2014-04-25 16:55:20 +02:00 |
|
Manuel Raynaud
|
cb42c17d25
|
Merge pull request #343 from lunika/DocumentLoop
add force_return argument to Document loop
|
2014-04-25 10:15:14 +02:00 |
|
Manuel Raynaud
|
b2654b0ca8
|
add force_return argument to Document loop
|
2014-04-25 10:13:53 +02:00 |
|
Manuel Raynaud
|
4dbd3c2bbe
|
Merge pull request #342 from roadster31/various-fixes
Various fixes
|
2014-04-25 09:12:10 +02:00 |
|
Manuel Raynaud
|
02d062a595
|
Merge pull request #341 from lunika/export
newsletter subscriber export
|
2014-04-25 01:26:39 +02:00 |
|
Franck Allimant
|
ee820f1df7
|
The default country is selected, instead of the first one
|
2014-04-25 01:21:48 +02:00 |
|
Franck Allimant
|
8bd82aac25
|
Fixed some translations
|
2014-04-25 00:19:47 +02:00 |
|
Franck Allimant
|
74dabb348a
|
Fixed a minor template processing problem with \"
|
2014-04-24 23:47:22 +02:00 |
|
Manuel Raynaud
|
6a783c92a2
|
fix error in insert.sql file
|
2014-04-24 22:18:28 +02:00 |
|
Manuel Raynaud
|
47002371f1
|
change license header
|
2014-04-24 21:59:24 +02:00 |
|
Manuel Raynaud
|
3423490e97
|
Merge pull request #340 from roadster31/various-fixes
Fixed tab in login name on admin change
|
2014-04-24 21:51:15 +02:00 |
|
Franck Allimant
|
320b043df4
|
Fixed tab in login name on admin change
|
2014-04-24 18:59:42 +02:00 |
|
Manuel Raynaud
|
ef7b17a921
|
add missing translations
|
2014-04-24 18:01:36 +02:00 |
|
Manuel Raynaud
|
4924e5af54
|
create breadcrumb in export page
|
2014-04-24 17:57:03 +02:00 |
|
Manuel Raynaud
|
4173178260
|
end customer newsletter export
|
2014-04-24 17:55:09 +02:00 |
|
Manuel Raynaud
|
0deadcd247
|
create resource and page for export
|
2014-04-24 17:55:09 +02:00 |
|
Manuel Raynaud
|
74e6ce1b46
|
remove coupon in main menu, adding it in tools page
|
2014-04-24 17:55:09 +02:00 |
|
Manuel Raynaud
|
d38c48995c
|
start creating tools page
|
2014-04-24 17:55:09 +02:00 |
|
Manuel Raynaud
|
dbe641ad84
|
create new resources
|
2014-04-24 17:55:09 +02:00 |
|
Manuel Raynaud
|
bca1330d0d
|
Merge pull request #339 from roadster31/various-fixes
Various fixes
|
2014-04-24 17:02:16 +02:00 |
|
Franck Allimant
|
0101a47431
|
Added Colissimo to the list of standard modules
|
2014-04-24 16:29:56 +02:00 |
|
Franck Allimant
|
33fe269b25
|
Fixed module title
|
2014-04-24 16:28:21 +02:00 |
|
Franck Allimant
|
6e5c461c79
|
Replaces the CacheController
|
2014-04-24 16:24:20 +02:00 |
|
Franck Allimant
|
2f5ea0927a
|
Was missing due to .gitignore misconfiguration
|
2014-04-24 16:23:59 +02:00 |
|
Manuel Raynaud
|
4775a0d8e1
|
Merge pull request #336 from roadster31/various-fixes
Various fixes
|
2014-04-24 14:30:56 +02:00 |
|
Franck Allimant
|
cf9fa6257c
|
Fixed typo
|
2014-04-24 13:56:43 +02:00 |
|
Franck Allimant
|
013e1a861e
|
Fixed missing constant
|
2014-04-24 12:31:20 +02:00 |
|
Franck Allimant
|
83ab70082d
|
Changed "Cache" by "Advanced configuration"
|
2014-04-24 12:29:43 +02:00 |
|
Franck Allimant
|
7ab119fbaa
|
Added missing permissions
|
2014-04-24 12:28:52 +02:00 |
|
Franck Allimant
|
e38e1858cb
|
Permission to view configuration menu item changed to admin.configuration
|
2014-04-24 11:26:52 +02:00 |
|
Manuel Raynaud
|
5fc8c24402
|
Merge pull request #335 from lunika/version
update thelia version in inser.sql file
|
2014-04-24 11:16:13 +02:00 |
|
Manuel Raynaud
|
a09543ace6
|
update thelia version in inser.sql file
|
2014-04-24 11:13:35 +02:00 |
|
Manuel Raynaud
|
f3d0bb6fbc
|
Merge pull request #332 from bilhackmac/master
Load modules by position
|
2014-04-24 10:37:18 +02:00 |
|
Jérôme Billiras
|
be923d8f56
|
Change index from position to activate following issue comment [https://github.com/thelia/thelia/pull/332#issuecomment-41174056]
|
2014-04-24 10:28:59 +02:00 |
|