a53080eefc
// fix bug css
2013-09-17 12:32:36 +02:00
5c04e5564c
// tags + fixed-width
2013-09-17 11:59:57 +02:00
0ab792cc6e
// Change tagify class
2013-09-17 10:52:21 +02:00
a4103265e5
// Color picker
2013-09-16 18:17:29 +02:00
7c01df9268
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-16 11:45:13 +02:00
70b39019bf
// kpi orders
2013-09-16 11:45:02 +02:00
636c4575f7
//added warning domaine on dashboard && prestashop news improve
2013-09-16 10:59:42 +02:00
c7ec33f062
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/css/admin.css
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/home/content.tpl
admin-dev/themes/default/template/controllers/localization/content.tpl
admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
admin-dev/themes/default/template/controllers/orders/_product_line.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
admin-dev/themes/default/template/footer.tpl
controllers/admin/AdminCarrierWizardController.php
controllers/admin/AdminCarriersController.php
controllers/admin/AdminCmsController.php
controllers/admin/AdminLocalizationController.php
controllers/admin/AdminManufacturersController.php
controllers/admin/AdminSuppliersController.php
css/admin.css
js/admin-products.js
js/admin_carrier_wizard.js
translations/fr.gzip
2013-09-13 11:41:14 +02:00
29db737c10
// Add autosize to textarea
2013-09-12 16:52:55 +02:00
90091d4f2c
[-] BO : Do not copy link_rewrite from title if cms already has one
2013-09-12 10:50:04 +02:00
38822bfb5e
//dashactivity configuration
2013-09-12 10:08:28 +02:00
486bb58bf6
//added dashboard widget config toggle display
2013-09-11 11:07:38 +02:00
3cc187a716
//dashactivity trafic source data_list & pie_chart
2013-09-11 10:34:01 +02:00
1d8da79507
[-] BO : fixed notifications when there is too much data
2013-09-10 09:17:54 +02:00
4e1a513371
//added rss and useful link on dashboard
2013-09-09 18:44:34 +02:00
c18dea7296
//carrier wizard fix - bootstrap compatibility
2013-09-09 14:14:57 +02:00
9377775eca
[-] MO productcomments :
...
- Module was broken and works now
- A message is displayed to indicate when a comment has been added.
- Error li are correctly indented
#PNM-753
#PNM-1601
#PNM-1660
#PNM-1609
#PNM-1491
#PNM-1311
#PNM-1233
#PNM-1232
#PNM-937
#PNM-775
2013-09-06 17:54:12 +02:00
663f592306
[-] MO sendtoafriend : a message is displayed whether the e-mail has been sent or not
...
#PNM-627
#PNM-1610
#PNM-1616
2013-09-06 11:40:41 +02:00
3c2a086296
//merge
2013-09-05 19:10:59 +02:00
4b2ef10dd6
//dashboard data-chart-line added
2013-09-05 19:07:49 +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
8868271c07
// push changes
2013-09-05 18:37:25 +02:00
06b54d0519
//typo
2013-09-05 16:35:15 +02:00
c306b2a425
// Small fix dashboard push
2013-09-05 15:41:10 +02:00
c34dbcf43a
//dashboard range date choice in ajax 👍
2013-09-05 15:25:41 +02:00
1c88bdd24e
//dashboard widget regardless refresh
2013-09-05 11:52:18 +02:00
6e3d24b567
// add push
2013-09-04 19:33:05 +02:00
6b2492b62c
//added data into dashproducts module
2013-09-04 18:26:58 +02:00
b4ecaf3ddb
// Carrier Wizard with bootstrap WIP
2013-09-04 15:38:45 +02:00
2990497a26
// header notifications
2013-09-03 12:25:48 +02:00
f165dae15d
//now you can refresh each dashboard module you want
2013-09-02 17:22:51 +02:00
81c47a085e
//fix remove class loading
2013-09-02 15:41:28 +02:00
f778b0da25
//remove class loading after widget filling
2013-09-02 15:09:27 +02:00
0cf96cd059
//small fix
2013-09-02 14:58:17 +02:00
d10a339542
//kevin special commit
2013-09-02 14:47:47 +02:00
a6aed9632a
//dashboard data binding first part
2013-09-02 11:43:50 +02:00
08b8277a7a
/////
2013-08-29 17:21:27 +02:00
c736c28ab5
// small ajax.php clean
2013-08-29 11:47:11 +02:00
ad428dfb2b
//MERGE branche release
2013-08-26 10:59:36 +02:00
7bcd8ee83c
//Added missing file
2013-08-23 09:42:37 +02:00
6ad274e39d
//Small fix
2013-08-22 10:33:03 +02:00
eea79052e0
[-] BO : fixed bug #PSCFV-10169 - now you can go backward from step 3 to 2 when no ranges are set
2013-08-22 10:15:55 +02:00
3005ca39f2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
admin-dev/themes/default/template/controllers/products/shipping.tpl
admin-dev/themes/default/template/controllers/shipping/content.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
admin-dev/themes/default/template/toolbar.tpl
classes/helper/HelperList.php
controllers/admin/AdminCategoriesController.php
controllers/admin/AdminManufacturersController.php
controllers/admin/AdminModulesPositionsController.php
controllers/admin/AdminPerformanceController.php
controllers/admin/AdminStockInstantStateController.php
css/admin.css
js/admin-products.js
js/admin.js
2013-08-21 09:14:10 +02:00
41190a66d4
[+] BO : Product tab fieldset and accordion fix
2013-08-19 18:45:57 +02:00
5336467e04
[-] BO : FixBug Friendly URL by language
2013-08-19 17:51:53 +02:00
68d7a320cd
[-] BO : FixBug Friendly URL change
2013-08-19 17:48:58 +02:00
0aa908bd25
[+] BO : Products add fileset for informations and prices tab
2013-08-19 11:59:27 +02:00
bad151a66f
[-] BO : fixed range deletion when press enter on input 'all' on carrier wizard
2013-08-19 10:20:22 +02:00
Kevin Granger