Commit Graph

19762 Commits

Author SHA1 Message Date
Damien Metzger cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00
Vincent Augagneur e03a86ad05 //homeslider new use bootstrap design 2013-11-04 10:01:29 +01:00
Rémi Gaillard c4d18e5e9f avatar on customer threads 2013-11-02 16:01:06 +01:00
Rémi Gaillard 95b5036782 // addsharethis cache 2013-11-02 15:41:40 +01:00
Rémi Gaillard 930c9f3ff5 // validators 2013-11-02 10:50:02 +01:00
Rémi Gaillard 5db9c5cdd5 // small fix 2013-11-02 09:54:37 +01:00
Kevin Granger 84be298dc5 // some W3C fixs 2013-11-01 17:25:18 +01:00
Kevin Granger 1bcb8d5c82 // sass-bootstrap 3.0.1 update 2013-11-01 16:44:55 +01:00
Kevin Granger 9c499dc8a4 // Placeholder instead of label for list filter date 2013-11-01 16:28:21 +01:00
Kevin Granger bf781ed267 // horizontal nav 2013-11-01 15:50:33 +01:00
Kevin Granger 87eb9bba26 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 19:13:53 +01:00
Kevin Granger 64598535bd // Avatar + Vertical Nav WIP 2013-10-31 19:13:34 +01:00
Rémi Gaillard a1696efe63 // small fix 2013-10-31 18:40:29 +01:00
Rémi Gaillard 74e92e364c // php warning 2013-10-31 18:26:09 +01:00
Damien Metzger 3669948547 // Revert to the previous lib with a trick 2013-10-31 17:53:34 +01:00
Damien Metzger 1ecc6e32ba // Try out new PEAR JSON encode 2013-10-31 17:45:02 +01:00
Damien Metzger 8670db2316 // Image sizes 2013-10-31 17:41:02 +01:00
Damien Metzger 343c9578da // Better 2013-10-31 17:15:30 +01:00
Damien Metzger 23e4e1badb // I forgot the link 2013-10-31 17:10:15 +01:00
Damien Metzger fe78dceede // Fixed image sizes 2013-10-31 17:08:22 +01:00
Rémi Gaillard c091729fd7 // missing directory 2013-10-31 17:03:41 +01:00
Rémi Gaillard dc90450365 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 16:39:21 +01:00
Rémi Gaillard a7ed5ee869 // cleaning 2013-10-31 16:39:01 +01:00
Damien Metzger 3c1cdf4ef2 // Fixed new arrivals issue 2013-10-31 16:09:10 +01:00
Kevin Granger ba28c5f527 // UI fixs 2013-10-31 15:49:57 +01:00
Damien Metzger 549fa9003c // Small fix with URL rewrite 2013-10-31 15:41:41 +01:00
Damien Metzger 6c8e70f780 [*] FO : added "back to search results" the the product page 2013-10-31 15:32:52 +01:00
Damien Metzger f565b273d8 // Reverting the revert 2013-10-31 15:13:46 +01:00
Damien Metzger 9a1b45a8e6 // Fixed warning and prepared next commit 2013-10-31 15:09:14 +01:00
Damien Metzger a97e3927df Merge pull request #915 from TMMeilleur/bootstrap
// Theme update
2013-10-31 07:06:40 -07:00
TMMeilleur 68a98b29a6 tm theme 2013-10-31 15:51:25 +02:00
Damien Metzger ff2954b1d2 [*] FO : Changed category block behavior inside categories 2013-10-31 12:20:59 +01:00
Kevin Granger 534421fb6b // UI fixs 2013-10-31 12:20:29 +01:00
Kevin Granger 03564fe0e5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 11:34:58 +01:00
Kevin Granger 4334364b36 // cart rules > conditions > product rules 2013-10-31 11:34:47 +01:00
Rémi Gaillard 8a7f869515 // small graphical bug 2013-10-31 10:41:15 +01:00
Kevin Granger 09dcff959e // cart rules > conditions > product rules WIP 2013-10-30 19:25:58 +01:00
Rémi Gaillard ecf45d0475 // small fix 2013-10-30 18:28:55 +01:00
Jerome Nadaud 9f2424db41 // Fix Module exception in transplant 2013-10-30 18:11:33 +01:00
Rémi Gaillard 8aa369531e // employee avatar 2013-10-30 18:02:10 +01:00
Vincent Augagneur 6a3e711cff //small fix 2013-10-30 15:43:31 +01:00
Rémi Gaillard b9ad576fb0 // -> mailsrc branch 2013-10-30 15:02:06 +01:00
Vincent Augagneur ad68105467 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-30 10:52:04 +01:00
Vincent Augagneur 0020412aea //added Preactivation request on dashboard 2013-10-30 10:51:58 +01:00
Rémi Gaillard 190c14ed9d // delete src mails -> go mailsrc branch 2013-10-30 10:25:51 +01:00
Kevin Granger df80e6ec8b // btn-group-action adjustments 2013-10-29 18:55:33 +01:00
Kevin Granger 0b564c0107 // oups 2013-10-29 18:15:17 +01:00
Kevin Granger aee725839e // fixs btn-group 2013-10-29 18:10:07 +01:00
Kevin Granger 5fa36abcaf // fixs UI 2013-10-29 17:32:57 +01:00
Damien Metzger c7fe91a0a9 // Fixed traffic sources chart on dashboard 2013-10-29 16:38:40 +01:00