dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 49a9f0bcaa // unlink class_index tmp file if not rename 2013-10-11 10:58:05 +02:00
Fabio Chelly 5c66ed4791 Merge remote-tracking branch 'origin/development' into development 2013-10-11 10:51:50 +02:00
Fabio Chelly d1a7ff50d5 [*] BO Module watermark: minimum transparency level is 1 and not 0. 2013-10-11 10:51:28 +02:00
Damien Metzger f95a4d74df // Added Google Plus to the BO footer 2013-10-11 10:47:48 +02:00
Damien Metzger 28118cf33a // Code cleaning (backoffice javascript) 2013-10-11 10:47:48 +02:00
gRoussac 7b02da5fdf // bad commit sorry 2013-10-11 10:32:30 +02:00
gRoussac 36ca7bc508 [-] BO : AdminImport, fix Group searchByName 2013-10-11 10:23:17 +02:00
Rémi Gaillard bb35a5b004 // multishop 2013-10-11 10:04:10 +02:00
Damien Metzger 7f5f78a6f3 // Connected footer links and go-top 2013-10-11 09:44:15 +02:00
fchellypresta 075a911cee Merge pull request #830 from indesign47/patch-5 
[-] MO : productcomments errors translated in multi-language
 2013-10-11 00:40:32 -07:00
fchellypresta 6f878353a6 Merge pull request #831 from indesign47/patch-7 
[-] MO : productcomments round average up not down
 2013-10-11 00:29:37 -07:00
djfm bb96c8754f [*] LO : set correct currency format for CHF 2013-10-11 07:14:30 +00:00
gRoussac dc1632a8b0 [-] BO : Adminimport, id_specific key_price not defined 2013-10-10 22:04:42 +02:00
Kevin Granger 544423ea1e // remove duplicate 2013-10-10 20:05:58 +02:00
Gregory Roussac a87bbf84b4 Merge pull request #825 from indesign47/patch-4 
[-] BO : AdminImport add available fields to Products
 2013-10-10 10:22:43 -07:00
Kevin Granger 447f1d4ba7 // quick fix customer view 2013-10-10 19:04:25 +02:00
Damien Metzger 77551c03f5 // Fixed potential warning 2013-10-10 18:49:27 +02:00
Damien Metzger 4505387046 // Try to fix regexp issues with some PHP configurations 2013-10-10 18:41:50 +02:00
Vincent Augagneur 87417ed928 //producttooltip now use bootstrap design 2013-10-10 18:07:08 +02:00
gRoussac 286084c42d Merge branch 'master' of https://github.com/DarkHack/PrestaShop into contrib/master 
Conflicts:
	controllers/admin/AdminImportController.php
 2013-10-10 17:06:13 +02:00
Kevin Granger 5620992735 // fix dashboard 2013-10-10 16:52:41 +02:00
Kevin Granger 7d717ea207 // fix css + kpi + dashboard 2013-10-10 16:29:40 +02:00
Jerome Nadaud 22dcaf246c // Add icon and specific title to list 2013-10-10 15:36:50 +02:00
Kevin Granger be3ccabe66 // footer + go to top + scroll y sidebar 2013-10-10 15:10:51 +02:00
Jerome Nadaud 789911184b [-] BO : FixBug - Remove second email in recipient 2013-10-10 15:04:32 +02:00
gRoussac 39a543188a [-] BO : Fix bug #PSCFV-10660, could not delete csv file on NT 2013-10-10 14:54:12 +02:00
Rémi Gaillard 278dc32482 [*] BO: Add an option to autologout to the backoffice after 15 minutes 2013-10-10 12:20:10 +02:00
Damien Metzger 9bae53a4d9 Merge pull request #828 from djfm/development 
// fixed name of gender 2 in English
 2013-10-10 03:08:40 -07:00
Kevin Granger 6c35b20b02 // organize css 2013-10-10 11:43:24 +02:00
djfm 819dac6622 // fixed name of gender 2 in English 2013-10-10 09:36:05 +00:00
Rémi Gaillard 7fdf6e614f // don't display some field when an employee edit it's own profile 2013-10-10 11:35:05 +02:00
Jerome Nadaud 067c78f868 // Fix notifications 2013-10-10 11:02:33 +02:00
Damien Metzger 79b0a571c0 // Updated languages in the installer 2013-10-10 09:47:10 +02:00
Damien Metzger fb9204ebd6 // Fixed module page 2013-10-10 09:14:58 +02:00
François Gaillard 8d1bca5542 Merge pull request #768 from enumag/patch-4 
[-] Classes : Hook - Display payment method & custommer currency bug fix
 2013-10-09 13:52:09 -07:00
Kevin Granger 9de6ec0379 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 20:28:15 +02:00
Kevin Granger 5b509c2c20 // login WIP 2013-10-09 20:26:04 +02:00
Jerome Nadaud 6245b05b6e // Remove flags from language select 2013-10-09 19:39:05 +02:00
Jerome Nadaud cade037e4f // Use display modal class for lite displaying 2013-10-09 19:28:37 +02:00
Jerome Nadaud 5ec76a759a // Fix Dashboard toolbar 2013-10-09 19:12:20 +02:00
Jerome Nadaud a5d1816336 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 18:59:32 +02:00
Jerome Nadaud 0e4cb5bcd5 // Form group bootstraping 2013-10-09 18:59:20 +02:00
Kevin Granger 719e5f4faf Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-10-09 18:55:46 +02:00
Kevin Granger 74f12c23be // login WIP 2013-10-09 18:54:13 +02:00
Damien Metzger 079534f039 // Fix header/footer override in admincontroller 2013-10-09 18:51:31 +02:00
Jerome Nadaud cfbb0d872b // Add confirmation on category image delete 2013-10-09 18:47:33 +02:00
Jerome Nadaud 2d9a54c19e // Remove button icon class 2013-10-09 18:43:22 +02:00
Jerome Nadaud eae76eb63e // Pagination bootstraping 2013-10-09 18:36:19 +02:00
Fabio Chelly 246340b78c [*] BO Module search: Enter key is now disabled in quick search field (field is correctly aligned) 2013-10-09 18:33:41 +02:00
Jerome Nadaud d4bf765dd6 // Pagination bootstraping 2013-10-09 18:31:51 +02:00