dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,215 Commits 9 Branches 19 Tags
ece4331622f6f43a0d86344bb85bdf3a94271ff0
Commit Graph
20215 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud 29db737c10 // Add autosize to textarea 2013-09-12 16:52:55 +02:00
Jerome Nadaud ba6699a378 // Fix Admin access 2013-09-12 15:55:14 +02:00
Jerome Nadaud c105486fa3 // Tree bugs 2013-09-12 15:22:47 +02:00
gRoussac 5095b45e47 [-] BO : Fix bug, orders states not ordered by order state name 2013-09-12 15:09:21 +02:00
Rémi Gaillard 30591b7c28 // Typo 2013-09-12 15:04:47 +02:00
Rémi Gaillard f9b1f0ab5e [*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists() 2013-09-12 15:03:23 +02:00
Jerome Nadaud bc221b993b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-12 14:55:58 +02:00
Jerome Nadaud 873eee8ad0 // Tree list bug 2013-09-12 14:55:45 +02:00
Damien Metzger c2d15f4ade // Changed language display in back office dropdown menu 2013-09-12 14:53:12 +02:00
Jerome Nadaud e63ce0a86d // Tree 2013-09-12 14:47:47 +02:00
Kevin Granger 91d3da310b // dashboard panel version 2013-09-12 14:42:20 +02:00
Francois Gaillard cc36eb2d27 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-12 14:32:22 +02:00
Francois Gaillard 53c1e56c51 [-] BO : Bug fix - Encoding & tips of the day 2013-09-12 14:32:02 +02:00
Gregory Roussac 8590b0e699 Merge pull request #716 from romainberger/typos 
[*] FO : removed extra slash and point
 2013-09-12 05:30:36 -07:00
romainberger 876be3b452 [*] FO : removed extra slash and point 2013-09-12 14:07:45 +02:00
Kevin Granger a1b0710f85 // fix menu + sass refacto 2013-09-12 12:26:08 +02:00
gRoussac e5276ff531 [-] FO : 301 Redirect /iso_lang to /iso_lang/ url 2013-09-12 11:16:12 +02:00
Vincent Augagneur 4a6c5979a8 //added new useful links on dashboard 2013-09-12 10:52:56 +02:00
gRoussac 90091d4f2c [-] BO : Do not copy link_rewrite from title if cms already has one 2013-09-12 10:50:04 +02:00
gRoussac 3870388e1c Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop 
Conflicts:
	modules/mailalerts/mailalerts.php
 2013-09-12 10:09:25 +02:00
Vincent Augagneur 6fa398e8e0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-12 10:08:32 +02:00
Vincent Augagneur 38822bfb5e //dashactivity configuration 2013-09-12 10:08:28 +02:00
Rémi Gaillard ea1bdbc849 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-12 10:01:39 +02:00
Gregory Roussac f0297824d7 Merge pull request #709 from AgenceNetDesign/development 
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
 2013-09-12 00:56:36 -07:00
Gregory Roussac c91a86740f Merge pull request #715 from Prestaspirit/patch-6 
[-] MO : Blocklayered Fixed a bug when displaying textures
 2013-09-12 00:55:28 -07:00
Prestaspirit a37033e478 [-] MO : Fixed a bug when displaying textures 
Corrections links texture image in the blocklayered
 2013-09-12 07:01:55 +02:00
Jerome Nadaud e9dbadcabf // Tree 2013-09-11 20:41:14 +02:00
Rémi Gaillard 9fa6c86a94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-11 20:05:13 +02:00
Kevin Granger ab8d5bc265 // VT theme 2013-09-11 18:17:57 +02:00
Kevin Granger 18212420c3 // fix switch menu top // side 2013-09-11 17:26:44 +02:00
Damien Metzger 739d1434b5 // Small fix 2013-09-11 17:02:44 +02:00
Kevin Granger 99263a1492 // switch menu top // side 2013-09-11 16:56:10 +02:00
Damien Metzger ddd7ed2d2b // Connected traffic sources to analytics (dashboard) 2013-09-11 16:43:24 +02:00
Rémi Gaillard f4f3084c35 [-] Core: Set a remote addr with php-cli #PSCFV-10372 2013-09-11 16:40:33 +02:00
Rémi Gaillard a4d131eac9 [-] WS: Fix entities retrieve for some cases 2013-09-11 16:32:11 +02:00
gRoussac e2dac03baa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-11 16:30:52 +02:00
gRoussac dfdbe39ee3 [-] BO : Small changes when creating vouchers in back office orders 2013-09-11 16:28:11 +02:00
Rémi Gaillard 31c94caebc [-] BO: Fix out of stock creation with multishop and stock sharing 2013-09-11 16:22:13 +02:00
Damien Metzger 4a3e0c5075 // Updated README.md 2013-09-11 16:11:28 +02:00
Rémi Gaillard c42d71b8f5 // oups 2013-09-11 16:06:23 +02:00
Rémi Gaillard 669c3791b5 [-] BO: Fix preview url with multishop 2013-09-11 15:55:25 +02:00
Jerome Nadaud 7909a7388c //Fix disabled categories with add parameter 2013-09-11 15:41:08 +02:00
Jerome Nadaud 617b58ba2f //Fix Text input desc error 2013-09-11 15:40:21 +02:00
Rémi Gaillard 3e750490fe // chmod class_index 666 instead of 664 2013-09-11 15:16:15 +02:00
Jerome Nadaud 49c9afec40 // Categories tree 2013-09-11 15:08:24 +02:00
gRoussac 01be908e51 [-] CORE : Could not add several cart rules 2013-09-11 14:50:42 +02:00
Damien Metzger 0ff6b25f56 // Fixed norm 2013-09-11 14:15:56 +02:00
Damien Metzger 981ce70594 // Added realtime Analytics to the dashboard (private beta only at this time) 2013-09-11 14:07:56 +02:00
Vincent Augagneur 937ce38a1f //added dashactivity config 2013-09-11 12:25:07 +02:00
Kevin Granger 913ee1007c // menu top 2013-09-11 11:32:06 +02:00