Sarah Lorenzini
f09347a8be
// update backup BDD, import, and email pages
2013-09-05 14:55:07 +02:00
Sarah Lorenzini
73524c7a4c
// update maintenance and email pages
2013-09-05 14:16:06 +02:00
Kevin Granger
d9a429eccc
// update radio helper
2013-09-05 14:06:54 +02:00
Vincent Augagneur
1c88bdd24e
//dashboard widget regardless refresh
2013-09-05 11:52:18 +02:00
Vincent Augagneur
38e00f9080
//disabled push on dashboard by default
2013-09-05 11:47:57 +02:00
Damien Metzger
95c9edd87a
// Fixed Gapi v3.0 token refresh
2013-09-05 11:42:57 +02:00
gRoussac
824a6b90f3
[-] FO : Fix bug #PSCFV-10118 quantity not updated when cart rules give the same product as gift
2013-09-05 11:07:41 +02:00
Vincent Augagneur
009536d3f4
//small fix on version compare for install module
2013-09-05 10:33:15 +02:00
Vincent Augagneur
5fa8cc4d47
//added translation
2013-09-05 10:17:18 +02:00
Gregory Roussac
284711b22f
Merge pull request #697 from sjousse/patch-1
...
MO : Shopimporter change the way to get the home category (get it from Configuration )
2013-09-05 01:16:29 -07:00
sjousse
2f6e0e3fae
Changed the way to get the home category (get it from Configuration table now)
2013-09-05 10:14:31 +02:00
Vincent Augagneur
49718d6ea9
//new install version for gamification & bootstrap compatibility
2013-09-04 23:16:56 +02:00
Vincent Augagneur
befddf0115
//added 1.6.0.1.sql
2013-09-04 23:15:49 +02:00
Rémi Gaillard
6e3d24b567
// add push
2013-09-04 19:33:05 +02:00
Damien Metzger
114b86ed43
// Stats
2013-09-04 19:15:14 +02:00
Kevin Granger
d5a25f063f
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-04 18:56:32 +02:00
Kevin Granger
161c612c02
// fix modules list
2013-09-04 18:56:00 +02:00
Gregory Roussac
d59f3383cf
Merge pull request #694 from sjousse/patch-1
...
[*] MO : ShopImporter module is now aware of multi-shop for categories
2013-09-04 09:28:23 -07:00
Vincent Augagneur
6b2492b62c
//added data into dashproducts module
2013-09-04 18:26:58 +02:00
sjousse
4d68595447
ShopImporter module is now aware of multi-shop
...
Imported categories was affected to Root category instead of a Shop's Home category.
I took the first shop home category is by default.
Maybe adding an option to choose the shop where the datas should be imported.
2013-09-04 18:26:24 +02:00
Kevin Granger
22d636f93a
// Colored switch, removed "required field" legend, removed duplicate links quick access
2013-09-04 18:14:11 +02:00
Gregory Roussac
07bdcd4129
Merge pull request #693 from sjousse/development
...
[-] MO : Add date_add field to categories to prevent failure of updateCat() method
2013-09-04 07:46:44 -07:00
sjousse
e9d066c981
fix value of date_add
2013-09-04 16:40:12 +02:00
sjousse
56a1449c69
add date_add to categories
2013-09-04 16:32:00 +02:00
gRoussac
63c19ce1a9
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-04 15:39:25 +02:00
gRoussac
3ca2c8da95
[-] BO : Fix #PSCFV-9906 could not register search engines keywords
2013-09-04 15:39:02 +02:00
Kevin Granger
b4ecaf3ddb
// Carrier Wizard with bootstrap WIP
2013-09-04 15:38:45 +02:00
Rémi Gaillard
00c1860d22
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-04 15:08:41 +02:00
Rémi Gaillard
9348768ceb
[-] MO: Fix blocklayered sort by quantity #PSCFV-10300
2013-09-04 15:05:55 +02:00
Damien Metzger
cf1f9a01db
// More stats
2013-09-04 14:38:27 +02:00
Vincent Augagneur
40eab759dd
//remove debug
2013-09-04 14:24:17 +02:00
gRoussac
7b0349ca33
// bad commit sorry for that
2013-09-04 11:14:45 +02:00
gRoussac
efa81a7107
[-] INSTALLER: Wrong SQL query for PS_LEGACY_IMAGES to 0
2013-09-04 11:14:00 +02:00
gRoussac
da353c884d
[-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT
2013-09-04 10:45:48 +02:00
gRoussac
df56d7af42
[-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678
2013-09-04 10:38:14 +02:00
djfm
87567ed1a0
// fixed translation of modules descriptions containing quotes
2013-09-04 07:44:52 +00:00
Gregory Roussac
5d38743b72
Merge pull request #690 from Ha99y/20130903_addToolBarModulesListButton
...
[-] BO : Remove warning in AdminController.php
2013-09-04 00:40:41 -07:00
Jerome Nadaud
75a663b6e3
[-] BO : Fix pull request #665
2013-09-04 09:40:12 +02:00
Vincent Augagneur
08806f0240
//recents orders data-table for dashboard
2013-09-04 09:36:09 +02:00
ha99y
f4892686c1
Warning in AdminController.php
...
If debugging is on (_PS_MODE_DEV_ set to TRUE)
On a fresh install there is a warning on line 1542 in
/classes/controller/AdminController.php in function
addToolBarModulesListButton().
Because of the warning xml files are not populated with data.
Warning: simplexml_load_file()
1: parser error : Document is empty
2013-09-03 17:30:05 -07:00
Kevin Granger
671d419c27
// Carrier Wizard with bootstrap WIP
2013-09-03 19:36:04 +02:00
gRoussac
b55a84e961
[-] INSTALLER : Fix infinite loop when order message has additional ampersand
2013-09-03 18:36:30 +02:00
gRoussac
6daf8ebbfa
[-] BO : Fix error returned when first import of a localisation pack
2013-09-03 18:20:58 +02:00
Damien Metzger
f29c2d3fcb
// Added some figures to the dashboard
2013-09-03 18:00:34 +02:00
gRoussac
5d8e187faa
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-03 17:43:51 +02:00
gRoussac
0891c986d6
// fix from comment https://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92ahttps://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92a#commitcomment-4002919
2013-09-03 17:43:33 +02:00
Gregory Roussac
8fedbe189c
Merge pull request #682 from MyBB-Services/dev/sa/ordercartrulecleanup
...
[*] Project : Orders should rely only on ps_order_cart_rule
2013-09-03 06:41:06 -07:00
Jerome Nadaud
7d61be252f
[+] BO : Get categories in nested array
2013-09-03 15:27:58 +02:00
Kevin Granger
5f5997b567
// fix quick access -> target _blank for frontend
2013-09-03 15:19:34 +02:00
Vincent Augagneur
b840f28137
//oups
2013-09-03 15:13:05 +02:00
Sarah Lorenzini