b4ecaf3ddb
// Carrier Wizard with bootstrap WIP
2013-09-04 15:38:45 +02:00
00c1860d22
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-04 15:08:41 +02:00
9348768ceb
[-] MO: Fix blocklayered sort by quantity #PSCFV-10300
2013-09-04 15:05:55 +02:00
cf1f9a01db
// More stats
2013-09-04 14:38:27 +02:00
40eab759dd
//remove debug
2013-09-04 14:24:17 +02:00
7b0349ca33
// bad commit sorry for that
2013-09-04 11:14:45 +02:00
efa81a7107
[-] INSTALLER: Wrong SQL query for PS_LEGACY_IMAGES to 0
2013-09-04 11:14:00 +02:00
da353c884d
[-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT
2013-09-04 10:45:48 +02:00
df56d7af42
[-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678
2013-09-04 10:38:14 +02:00
87567ed1a0
// fixed translation of modules descriptions containing quotes
2013-09-04 07:44:52 +00:00
5d38743b72
Merge pull request #690 from Ha99y/20130903_addToolBarModulesListButton
...
[-] BO : Remove warning in AdminController.php
2013-09-04 00:40:41 -07:00
75a663b6e3
[-] BO : Fix pull request #665
2013-09-04 09:40:12 +02:00
08806f0240
//recents orders data-table for dashboard
2013-09-04 09:36:09 +02:00
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
671d419c27
// Carrier Wizard with bootstrap WIP
2013-09-03 19:36:04 +02:00
b55a84e961
[-] INSTALLER : Fix infinite loop when order message has additional ampersand
2013-09-03 18:36:30 +02:00
6daf8ebbfa
[-] BO : Fix error returned when first import of a localisation pack
2013-09-03 18:20:58 +02:00
f29c2d3fcb
// Added some figures to the dashboard
2013-09-03 18:00:34 +02:00
5d8e187faa
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-03 17:43:51 +02:00
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
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
7d61be252f
[+] BO : Get categories in nested array
2013-09-03 15:27:58 +02:00
5f5997b567
// fix quick access -> target _blank for frontend
2013-09-03 15:19:34 +02:00
b840f28137
//oups
2013-09-03 15:13:05 +02:00
cd7d604b75
[*] Project : Orders should rely only on ps_order_cart_rule
2013-09-03 15:10:06 +02:00
5caae97813
Merge pull request #680 from djfm/development
...
// fixed unstranslatable string in AdminSupplyOrdersController
2013-09-03 06:00:50 -07:00
dca6e39feb
// css for tree view
2013-09-03 14:52:50 +02:00
572a2e45aa
// fixed unstranslatable string in AdminSupplyOrdersController
2013-09-03 12:51:21 +00:00
98f60d039b
// fix warning
2013-09-03 12:29:17 +02:00
2990497a26
// header notifications
2013-09-03 12:25:48 +02:00
a900edee68
// Data, data, data
2013-09-03 11:05:24 +02:00
70e6aea7c3
//typo
2013-09-03 10:59:12 +02:00
5dc2eec97d
//added tab content in dashproduct module
2013-09-03 10:38:43 +02:00
61d10abc76
// Use date_from and date_to in dashboard stats
2013-09-03 10:34:21 +02:00
7b902ac99d
//added param date_from & date_to on hookDashboardDatas
2013-09-03 10:30:08 +02:00
4d3b378965
//added form date range picker on dashboard
2013-09-03 10:19:15 +02:00
656717fb4c
Merge pull request #679 from kluevandrew/patch-3
...
[*] BO : Cursor "pointer" for .button class
2013-09-03 00:51:38 -07:00
e08c8b2d25
Merge pull request #674 from PrestaEdit/patch-50
...
[*] BO: sort modules name in Stats
2013-09-03 00:49:11 -07:00
97f1db480a
BO: Cursor "pointer" for .button
...
Cursor "pointer" for each button in back office
2013-09-03 11:35:50 +04:00
19fc22fbf0
// Added translations directory to module gapi
2013-09-02 20:34:43 +02:00
1fc507d8d2
// Added configuration checks to the Google Analytics modules
...
// Implemented the first real data in the dashboard
2013-09-02 20:18:51 +02:00
c3772fb355
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-02 19:11:17 +02:00
da12fbdd5e
[-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes
2013-09-02 19:09:47 +02:00
268183f4d2
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-02 19:05:55 +02:00
2f5054cb92
// fix anime dashboard loading
2013-09-02 19:05:34 +02:00
63a9fd0236
[*] MO : Added help in the Google Analytics API module
2013-09-02 18:54:39 +02:00
94bdde4630
[-] CORE : Remove PHP Warning: file_put_contents on modules config.xml
2013-09-02 18:19:21 +02:00
abf5ad195c
Merge pull request #676 from dlage/patch-1
...
[*] MO : blocknewproducts avoid $newProducts not defined
2013-09-02 08:58:32 -07:00
11cd88cf63
//data bind dashtrends module
2013-09-02 17:25:33 +02:00
9265676f0d
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-02 17:23:00 +02:00
Kevin Granger