d1956572a5
//small fix on carrier wizard
2013-10-03 10:29:40 +02:00
791481e149
// update login page
2013-10-02 16:00:54 +02:00
1cb7f27a21
// update login page bootsrap
2013-10-02 14:38:13 +02:00
ba06b217cc
// update javascript login page
2013-10-02 14:36:14 +02:00
99a4ffe583
// Fix enable friendly url button generator on multishop
2013-10-01 16:44:03 +02:00
8ed77030aa
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/controllers/products/suppliers.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/toolbar.tpl
classes/helper/HelperList.php
controllers/admin/AdminGroupsController.php
controllers/admin/AdminManufacturersController.php
2013-09-30 11:01:23 +02:00
eefccd0891
// Multistore check view now include button element
2013-09-26 09:36:57 +02:00
e81c9490b0
// Advanced parameters bootstrap design
2013-09-25 15:15:28 +02:00
ae760115be
// Fix warning
2013-09-25 11:43:14 +02:00
0247550a0a
// Fix accordion for bootsrap and better bulk action for warehouse
2013-09-24 17:18:37 +02:00
c9eb5b5be6
// Products multistore design
2013-09-24 12:29:12 +02:00
c78c8b04bd
// Multistore checkbox js functions
2013-09-23 18:05:16 +02:00
c6222c51c8
// commit 6b47f5713e is missing
2013-09-23 11:36:15 +02:00
c93eb9f40a
// orders WIP
2013-09-20 19:11:08 +02:00
214b844ef7
// Removed useless tiny mce src
2013-09-20 18:52:42 +02:00
672da852c5
[-] BO - fixed bug #PSCFV-10178
2013-09-18 11:40:58 +02:00
965b8a1bf3
[-] BO - fixed bug #PSCFV-10286 - End range in summary of shipping wizard not correct when range number is a float
2013-09-18 11:18:26 +02:00
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
852faeab7a
Update admin.js
...
Lorsqu'un produit possède trop d'images, il est impossible de réordonner celle-ci car la valeur JSON fourni en URL (GET) est beaucoup trop longue. Il faut envoyer les données JSON en POST pour solutionner le problème de longueur.
---------
When a product has many pictures, we can't reorder them. The JSON value is too long in URL (GET). We need to send data with POST to avoid problem.
2013-09-16 15:57:44 +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
6da1228359
[-] BO : Fix bug #PSCFV-8407 can not customize feature column name if needed
2013-09-13 17:56:45 +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
Vincent Augagneur