dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,118 Commits 9 Branches 19 Tags
0fe3630a05bf11767f938cb9db8edafc1aeb2bc2
Commit Graph
19118 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud 0fe3630a05 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 18:30:16 +02:00
Jerome Nadaud d575ba8273 // Adding compare dates to date range picker 2013-10-11 18:30:05 +02:00
Kevin Granger 89251a667b // feedback button 2013-10-11 18:26:12 +02:00
Kevin Granger cfa4d72eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 17:22:06 +02:00
Kevin Granger 41f5d9f1f1 // fix datepicker 2013-10-11 17:21:45 +02:00
Jerome Nadaud 18690e4b9a // Adding update for customer message 2013-10-11 17:17:58 +02:00
Damien Metzger eff292731f // Fixed typo 2013-10-11 16:35:49 +02:00
Damien Metzger d2ecdfb93d // fix dashboard modules upgrade 2013-10-11 16:18:53 +02:00
Damien Metzger 0e91352520 // Dashboard update 2013-10-11 16:18:52 +02:00
Jerome Nadaud 0f28393c8f // Fix data range picker 2013-10-11 16:16:03 +02:00
Jerome Nadaud bedcacf0b4 // Starting development of data range picker 2013-10-11 16:12:40 +02:00
Damien Metzger 1849995291 // Code cleaning 2013-10-11 15:35:45 +02:00
Kevin Granger dcf7e48f6e // datepicker stylesheet 2013-10-11 15:04:14 +02:00
Vincent Augagneur 5bcacf9b48 //statsdata now use boostrap design 2013-10-11 14:38:18 +02:00
Vincent Augagneur 38a7e90eff //referralprogram now use boostrap design 2013-10-11 14:29:56 +02:00
Rémi Gaillard 6b52ada195 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 14:11:28 +02:00
Rémi Gaillard 1316bd7e1f // add check stock value for color list if needed 2013-10-11 14:11:12 +02:00
Damien Metzger 7a5187e84e // Fix module active 2013-10-11 14:11:01 +02:00
Damien Metzger 809eac6308 // Fix upgrade and dashboard 2013-10-11 14:07:03 +02:00
Kevin Granger cd5a308ad7 // login : tabindex + ux 2013-10-11 12:28:01 +02:00
Damien Metzger c68101653d // Fixed tabs 2013-10-11 12:10:24 +02:00
Kevin Granger b61528057a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/js/admin-theme.js
 2013-10-11 11:28:44 +02:00
Kevin Granger 40d4da04bb // cleaned admin-theme.js - added date range picker 2013-10-11 11:18:27 +02:00
Damien Metzger 49cdfb56c6 // Fix class_index generation 2013-10-11 11:15:14 +02:00
Damien Metzger f80b348d86 // Default vertical menu in BO 2013-10-11 11:02:35 +02:00
Rémi Gaillard bb81e892a0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 10:58:23 +02:00
Rémi Gaillard 49a9f0bcaa // unlink class_index tmp file if not rename 2013-10-11 10:58:05 +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
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
Kevin Granger 544423ea1e // remove duplicate 2013-10-10 20:05:58 +02: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
Vincent Augagneur 87417ed928 //producttooltip now use bootstrap design 2013-10-10 18:07:08 +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
Rémi Gaillard 278dc32482 [*] BO: Add an option to autologout to the backoffice after 15 minutes 2013-10-10 12:20:10 +02:00
Kevin Granger 6c35b20b02 // organize css 2013-10-10 11:43:24 +02: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
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