dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph
20926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 180b180aee // small changes 2013-10-25 16:24:57 +02:00
Rémi Gaillard 5ac471deaf // product toolbar 2013-10-25 16:11:33 +02:00
Jerome Nadaud f472f3e848 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-25 15:55:39 +02:00
Jerome Nadaud f89c8ed008 // Fix HelperUploader images params 2013-10-25 15:54:53 +02:00
gRoussac eb8ea1cba5 [-] CORE : SetEnv in if statement 2013-10-25 15:29:15 +02:00
Damien Metzger aa322e4777 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-10-25 15:22:01 +02:00
gRoussac 4e6585a1b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-25 15:21:55 +02:00
gRoussac a03efe152c [-] CORE : SetEnv not available on all config // @todo curl request on dummy .htacces 2013-10-25 15:21:40 +02:00
Damien Metzger e8d5dc8a62 [*] BO : search results improvements (no unaccessible tabs, better display, better information) 2013-10-25 15:19:03 +02:00
Sarah Lorenzini a49cc68b72 // news design sendtoafriend mails template 2013-10-25 15:01:05 +02:00
Kevin Granger cae4770e0f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-25 14:58:30 +02:00
Rémi Gaillard 7aeba25f99 // class_index 2013-10-25 14:58:11 +02:00
Kevin Granger 339f428c23 // fix login - (tabindex, loading, ellipsis) 2013-10-25 14:58:10 +02:00
Sarah Lorenzini f73716f902 // new design for referralprogram mails template 2013-10-25 14:56:34 +02:00
Rémi Gaillard 59a1105fce // small fix on multishop checkboxes 2013-10-25 14:55:27 +02:00
Jerome Nadaud 81482df1e5 // Fix merge 2013-10-25 14:33:29 +02:00
djfm 3a749823bb // small fixes in English Email php templates 2013-10-25 12:29:39 +00:00
Jerome Nadaud 08baa71a05 // Fix on color field in list 2013-10-25 14:29:30 +02:00
Jerome Nadaud 8d1765f2df Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	controllers/admin/AdminCategoriesController.php
 2013-10-25 14:29:02 +02:00
Jerome Nadaud bff1ad8833 // Some changes to integrate uploader helper 2013-10-25 14:20:42 +02:00
Jerome Nadaud 52795495bd //Starting Uploader helper 2013-10-25 14:19:51 +02:00
Rémi Gaillard 3997543e7f // notice 2013-10-25 11:35:01 +02:00
Damien Metzger 087d0d8206 // Fields resizing 2013-10-25 11:25:13 +02:00
Damien Metzger d59c83e64d Merge pull request #888 from djfm/bootstrap 
[+] FO: New E-Mail templates!
 2013-10-25 02:18:04 -07:00
djfm dd009f133f // fixes in php mail templates 2013-10-25 09:13:24 +00:00
Kevin Granger ddf65f3b97 // toolbar nav fixs 2013-10-25 10:33:45 +02:00
Damien Metzger 0ca5a24e84 // Added field (bootstrap) size in helper form 2013-10-25 10:16:39 +02:00
Jerome Nadaud 139ee8f62d // Move back button to left 2013-10-25 09:29:42 +02:00
Jerome Nadaud 3850cc94d5 // Align save button to right 2013-10-25 09:18:00 +02:00
gRoussac 942d3c7151 [-] MO : Fixbug #PSCFV-10679 dateofdelivery PDF invoice array and array 2013-10-25 00:01:25 +02:00
gRoussac 1e094f4016 [-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0 2013-10-24 23:29:23 +02:00
gRoussac a9643c80c3 // bad commit sorry 2013-10-24 22:45:43 +02:00
gRoussac 438a3dda2b [-] BO : Fix bug #PSCFV-10718 AdminAttachments old file not deleted on update 2013-10-24 22:42:13 +02:00
gRoussac 4cd3e1b830 [-] FO: Fix bug #PSCFV-10230, Blockspecials still caching when files cache limit is 0 2013-10-24 21:59:32 +02:00
gRoussac 97ef888345 [-] FO: Fix bug #PSCFV-10625 Js error on carriers step if AjaxCart disabled 2013-10-24 21:28:22 +02:00
Kevin Granger acfc3bc266 // fixe buttons group wrap 2013-10-24 19:34:25 +02:00
Damien Metzger cd5fa81025 // Fixed boulette 2013-10-24 19:29:22 +02:00
Damien Metzger 4cb7bd9137 // Changed label 2013-10-24 19:19:20 +02:00
Damien Metzger 8748b0d240 // Small improvements 2013-10-24 19:12:50 +02:00
Jerome Nadaud 279cb99a4e // Add regenerate option to thumbnail creation 2013-10-24 18:52:10 +02:00
Gregory Roussac 4207bdff32 Merge pull request #890 from indesign47/patch-14 
[-] BO : AdminImport change width height depth
 2013-10-24 09:43:54 -07:00
Jerome Nadaud 6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
indesign47 8cb1806e49 // small fixes for Width Height Depth 
change
0,1;0,2;0,3
to
1,2,3
 2013-10-24 18:13:05 +02:00
Damien Metzger f3d74c9461 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-10-24 18:13:04 +02:00
gRoussac 759fe2f671 // norms 2013-10-24 18:09:21 +02:00
Damien Metzger 5ff406cdb8 // css 2013-10-24 18:09:11 +02:00
Gregory Roussac 0416aca547 Merge pull request #889 from PhpMadman/PSCFV-10728 
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
 2013-10-24 09:06:43 -07:00
Kevin Granger 5c3058d45b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-24 18:02:42 +02:00
Kevin Granger e3dad946e3 // fixs 2013-10-24 18:02:13 +02:00
Rémi Gaillard cc3363011e // rewrited urls for feeder module 2013-10-24 17:54:44 +02:00