Kevin Granger
cd5a308ad7
// login : tabindex + ux
2013-10-11 12:28:01 +02:00
Rémi Gaillard
278dc32482
[*] BO: Add an option to autologout to the backoffice after 15 minutes
2013-10-10 12:20:10 +02:00
Jerome Nadaud
067c78f868
// Fix notifications
2013-10-10 11:02:33 +02:00
Kevin Granger
5b509c2c20
// login WIP
2013-10-09 20:26:04 +02:00
Kevin Granger
3e2d2e2afc
// fix Orders
2013-10-07 18:54:28 +02:00
Francois Gaillard
77b2b4b6ca
// Manual merge PS 1.5.6.0
2013-10-07 18:22:55 +02:00
Fabio Chelly
a652590885
Merge remote-tracking branch 'origin/development' into development
2013-10-07 11:34:56 +02:00
Fabio Chelly
2515d81bdd
[*] BO Module search: Quick search can now search modules by name and not only display name
2013-10-07 11:34:16 +02:00
Rémi Gaillard
3477cac1e0
Merge pull request #800 from Ha99y/20131004_retro-compat.js.php
...
__DIR__ is available since PHP 5.3
2013-10-07 00:35:02 -07:00
Vincent Augagneur
5c605067f0
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-07 09:09:26 +02:00
Vincent Augagneur
8a6dc6233d
//jquery.smartWizard use bootstrap css classes
2013-10-07 09:08:20 +02:00
ha99y
98aea24fc3
__DIR__ was never defined
...
The JS files would not lode, when in dev mode because __DIR__ was not
defined
2013-10-04 17:18:23 -07:00
Kevin Granger
2ab3f08eab
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-04 19:13:13 +02:00
Kevin Granger
c2ea0be841
// orders WIP
2013-10-04 19:13:02 +02:00
Rémi Gaillard
b2b0c4f00b
// remove debug
2013-10-04 18:45:18 +02:00
Fabio Chelly
139a74e4cd
[*] BO Module search: the PHP search has been replace by a quick search in JS to display results instantly
2013-10-04 18:15:12 +02:00
Vincent Augagneur
5564b342f4
//wizard boostrap and title fix
2013-10-04 17:07:10 +02:00
Vincent Augagneur
fe6494bf35
//fixed bug PSCFV-10567
2013-10-04 16:33:50 +02:00
Damien Metzger
5c5a989cda
// Added javascript validation functions (demo)
2013-10-04 15:24:50 +02:00
Kevin Granger
bb7dd876af
// orders WIP
2013-10-03 21:04:35 +02:00
Jerome Nadaud
1dc07ab2ba
// Modules positions drag and drop
2013-10-03 17:49:24 +02:00
gRoussac
0f288583ca
[-] BO : Remove dead code in AdminImport
2013-10-03 14:57:03 +02:00
gRoussac
6610bd2067
[-] BO : Could noty save ImportMatchs
2013-10-03 11:15:03 +02:00
Vincent Augagneur
d1956572a5
//small fix on carrier wizard
2013-10-03 10:29:40 +02:00
Sarah Lorenzini
791481e149
// update login page
2013-10-02 16:00:54 +02:00
Sarah Lorenzini
1cb7f27a21
// update login page bootsrap
2013-10-02 14:38:13 +02:00
Sarah Lorenzini
ba06b217cc
// update javascript login page
2013-10-02 14:36:14 +02:00
Jerome Nadaud
99a4ffe583
// Fix enable friendly url button generator on multishop
2013-10-01 16:44:03 +02:00
Kevin Granger
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
Jerome Nadaud
eefccd0891
// Multistore check view now include button element
2013-09-26 09:36:57 +02:00
Jerome Nadaud
e81c9490b0
// Advanced parameters bootstrap design
2013-09-25 15:15:28 +02:00
Jerome Nadaud
ae760115be
// Fix warning
2013-09-25 11:43:14 +02:00
Jerome Nadaud
0247550a0a
// Fix accordion for bootsrap and better bulk action for warehouse
2013-09-24 17:18:37 +02:00
Jerome Nadaud
c9eb5b5be6
// Products multistore design
2013-09-24 12:29:12 +02:00
Jerome Nadaud
c78c8b04bd
// Multistore checkbox js functions
2013-09-23 18:05:16 +02:00
Rémi Gaillard
c6222c51c8
// commit 6b47f5713e is missing
2013-09-23 11:36:15 +02:00
Kevin Granger
c93eb9f40a
// orders WIP
2013-09-20 19:11:08 +02:00
Damien Metzger
214b844ef7
// Removed useless tiny mce src
2013-09-20 18:52:42 +02:00
Vincent Augagneur
672da852c5
[-] BO - fixed bug #PSCFV-10178
2013-09-18 11:40:58 +02:00
Vincent Augagneur
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
Kevin Granger
a53080eefc
// fix bug css
2013-09-17 12:32:36 +02:00
Kevin Granger
5c04e5564c
// tags + fixed-width
2013-09-17 11:59:57 +02:00
Jérôme Nadaud
0ab792cc6e
// Change tagify class
2013-09-17 10:52:21 +02:00
Jerome Nadaud
a4103265e5
// Color picker
2013-09-16 18:17:29 +02:00
CINS
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
Kevin Granger
7c01df9268
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-16 11:45:13 +02:00
Kevin Granger
70b39019bf
// kpi orders
2013-09-16 11:45:02 +02:00
Vincent Augagneur
636c4575f7
//added warning domaine on dashboard && prestashop news improve
2013-09-16 10:59:42 +02:00
gRoussac
6da1228359
[-] BO : Fix bug #PSCFV-8407 can not customize feature column name if needed
2013-09-13 17:56:45 +02:00
Kevin Granger
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
Kevin Granger