7e1c0d5a24
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-06 09:24:43 +02:00
79677324b6
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-05 19:11:07 +02:00
3c2a086296
//merge
2013-09-05 19:10:59 +02:00
b2fd886722
// add new tpl for navigation top/side
2013-09-05 19:07:57 +02:00
4b2ef10dd6
//dashboard data-chart-line added
2013-09-05 19:07:49 +02:00
53241af228
// remove strict standard warning
2013-09-05 19:00:25 +02:00
a3233cc00c
//
2013-09-05 18:51:53 +02:00
c35d8c7845
//
2013-09-05 18:47:13 +02:00
f5e00a59f7
//
2013-09-05 18:41:51 +02:00
a7d619b208
[-] MO : fix bug #PSCFV-9906 again, bad url parsing
2013-09-05 18:39:07 +02:00
8868271c07
// push changes
2013-09-05 18:37:25 +02:00
6b080e1f02
Optimize image copy in ShopImport module
...
2 things :
- copy images to new folder structure instead of legacy one since it's a PS 1.5 branch
- don't create all sizes of images at migration, there's an Admin controller for that (Admin > Settings > Images). That's speed up the import and remove duplicate code (less code to support).
+ some cleaning of unused variables
2013-09-05 18:24:02 +02:00
e7495f3fe4
//oups
2013-09-05 17:38:17 +02:00
2ff2a6b6f9
// Profiling adapted to the new dashboard
2013-09-05 17:28:05 +02:00
06b54d0519
//typo
2013-09-05 16:35:15 +02:00
4124a48b1e
//added check on range picker if date from is superior than date to
2013-09-05 16:34:03 +02:00
e4932131f6
//small fix
2013-09-05 16:25:42 +02:00
1481dc0f5f
//added PS_DASHBOARD_USE_PUSH in install
2013-09-05 16:03:14 +02:00
7568b84f9f
//added PS_DASHBOARD_USE_PUSH in upgrade
2013-09-05 16:02:30 +02:00
0f81518ba2
// Add a buton to erase all log
2013-09-05 15:58:36 +02:00
c306b2a425
// Small fix dashboard push
2013-09-05 15:41:10 +02:00
6e5fb47642
[-] INSTALLER : Fix bug #PSCFV-8289 bad orders vouchers total after update
2013-09-05 15:31:13 +02:00
e352f2137f
//small fix
2013-09-05 15:30:59 +02:00
c34dbcf43a
//dashboard range date choice in ajax 👍
2013-09-05 15:25:41 +02:00
f09347a8be
// update backup BDD, import, and email pages
2013-09-05 14:55:07 +02:00
73524c7a4c
// update maintenance and email pages
2013-09-05 14:16:06 +02:00
d9a429eccc
// update radio helper
2013-09-05 14:06:54 +02:00
1c88bdd24e
//dashboard widget regardless refresh
2013-09-05 11:52:18 +02:00
38e00f9080
//disabled push on dashboard by default
2013-09-05 11:47:57 +02:00
95c9edd87a
// Fixed Gapi v3.0 token refresh
2013-09-05 11:42:57 +02:00
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
009536d3f4
//small fix on version compare for install module
2013-09-05 10:33:15 +02:00
5fa8cc4d47
//added translation
2013-09-05 10:17:18 +02:00
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
2f6e0e3fae
Changed the way to get the home category (get it from Configuration table now)
2013-09-05 10:14:31 +02:00
49718d6ea9
//new install version for gamification & bootstrap compatibility
2013-09-04 23:16:56 +02:00
befddf0115
//added 1.6.0.1.sql
2013-09-04 23:15:49 +02:00
6e3d24b567
// add push
2013-09-04 19:33:05 +02:00
114b86ed43
// Stats
2013-09-04 19:15:14 +02:00
d5a25f063f
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-04 18:56:32 +02:00
161c612c02
// fix modules list
2013-09-04 18:56:00 +02:00
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
6b2492b62c
//added data into dashproducts module
2013-09-04 18:26:58 +02:00
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
22d636f93a
// Colored switch, removed "required field" legend, removed duplicate links quick access
2013-09-04 18:14:11 +02:00
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
e9d066c981
fix value of date_add
2013-09-04 16:40:12 +02:00
56a1449c69
add date_add to categories
2013-09-04 16:32:00 +02:00
63c19ce1a9
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-04 15:39:25 +02:00
3ca2c8da95
[-] BO : Fix #PSCFV-9906 could not register search engines keywords
2013-09-04 15:39:02 +02:00
Fabio Chelly