dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,089 Commits 9 Branches 19 Tags
bb35a5b00414bbca76569fa2b9d5df875f6b0140
Commit Graph

1698 Commits

Author SHA1 Message Date
Jerome Nadaud 874e17aa6f // remove javascript include from tpl 2013-10-03 17:55:30 +02:00
Jerome Nadaud 1dc07ab2ba // Modules positions drag and drop 2013-10-03 17:49:24 +02:00
Jerome Nadaud 39f0284aa3 // Modules positions drag and drop for bootstrap 2013-10-03 17:47:09 +02:00
Jerome Nadaud 6059ad163b // Fix supply order state change save button 2013-10-03 11:51:08 +02:00
Jerome Nadaud 75771e0723 // Supply order bootstraping 2013-10-02 18:59:21 +02:00
Jerome Nadaud f891f64cc4 // Stock cover bootstraping 2013-10-02 18:58:47 +02:00
Jerome Nadaud b472aaed96 // Fix Stock Cover select submit 2013-10-02 17:53:56 +02:00
Jerome Nadaud dc06ef9c6d // Stock movement fix export button on select filter 2013-10-02 17:09:31 +02:00
Damien Metzger 84a251a575 [*] BO : you can noww override header and footer for each controller 2013-10-02 17:04:18 +02:00
Jerome Nadaud f63e1065b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 16:58:37 +02:00
Jerome Nadaud 04e5617d7d // Instant stock bootstraping 2013-10-02 16:58:27 +02:00
Sarah Lorenzini 5993c188c5 // update login page 2013-10-02 16:50:09 +02:00
Sarah Lorenzini 791481e149 // update login page 2013-10-02 16:00:54 +02:00
Jerome Nadaud 3ce163449e // Advanced stock management bootstraping 2013-10-02 14:48:23 +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 661e18916b // Permission bootstrap design 2013-10-02 12:30:07 +02:00
Jerome Nadaud 43c874e06e // Fix line feed on address observation 2013-10-02 09:59:14 +02:00
Kevin Granger 65fc1fea63 // orders WIP 2013-10-01 18:50:41 +02:00
Jerome Nadaud 301de7a3a1 // Webservice and advanced stock list bootstraping 2013-10-01 18:29:35 +02:00
Jerome Nadaud 9c40dbb222 // Fix group view for bootstrap - removing limit restriction 'cause is now fixed 2013-10-01 17:00:56 +02:00
Jerome Nadaud 99a4ffe583 // Fix enable friendly url button generator on multishop 2013-10-01 16:44:03 +02:00
Jerome Nadaud 55a5c69d40 // Remove language select on only one language 2013-10-01 16:03:34 +02:00
Jerome Nadaud bc8e972dfa // Fix language id in features and quantities 2013-10-01 15:32:13 +02:00
Jerome Nadaud 759a3e191a // Groups and language bootsrapify 2013-10-01 15:14:46 +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 9e58e3edfd // Advanced stock bootstrap design 2013-09-27 12:24:44 +02:00
Jerome Nadaud 9ea723d07e // Slip and Statuses bootstrap design 2013-09-26 17:30:34 +02:00
Jerome Nadaud a93ce00af8 // Groups view bootstrap design 2013-09-26 15:59:28 +02:00
Jerome Nadaud 2d65f5a8c0 // Cart rules bootstrap design 2013-09-26 14:55:28 +02:00
Jerome Nadaud b9ccfe858b // Localization Bootstrap design 2013-09-26 11:36:28 +02:00
Jerome Nadaud 4c5a6d1efb // Payment bootstrap design 2013-09-26 10:09:50 +02:00
Jerome Nadaud d6a59a1dbd // Maintenance bootstrap design 2013-09-26 09:37:38 +02:00
Damien Metzger 1b010da64f // Fixed typo and configuration parse error 2013-09-25 20:21:41 +02:00
Damien Metzger 01e5cec634 [*] BO : improved performances (cache systems) and countries tabs 2013-09-25 19:41:46 +02:00
Jerome Nadaud 8cc892ecce // Trad 2013-09-25 17:47:10 +02:00
Jerome Nadaud bf86da782a // Add confirmation for memcached server delete 2013-09-25 17:44:57 +02:00
Jerome Nadaud 875120f145 // Advanced parameters bootstrap design 2013-09-25 15:22:38 +02:00
Jerome Nadaud e81c9490b0 // Advanced parameters bootstrap design 2013-09-25 15:15:28 +02:00
Jerome Nadaud 2a8d251cd6 // Webservice controller bootstrap design 2013-09-25 11:29:11 +02:00
dlage 81ca3ac1f9 BO: Modules - show update button even if module is not installed but don't 
warn for modules with updates available but not installed.
 2013-09-24 17:42:43 +01:00
Jerome Nadaud 72a7ac2d03 // Special external link in warehouse view 2013-09-24 17:19:01 +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 a175e603ef // Wharehouse view bootstrap fix 2013-09-24 16:20:05 +02:00
Jerome Nadaud 003ba20238 // Products multistore bootstrap fix 2013-09-24 16:19:00 +02:00
gRoussac 3d477c62eb // remove notice 2013-09-24 16:03:39 +02:00
Jerome Nadaud 00ddfeba05 // CMS select size in form 2013-09-24 13:09:22 +02:00
Jerome Nadaud c9eb5b5be6 // Products multistore design 2013-09-24 12:29:12 +02:00
Jerome Nadaud f04126c436 // Customers groups - Add special tree handle for categories tree 2013-09-23 18:16:47 +02:00
Damien Metzger 6796b64e18 Merge pull request #691 from djfm/development 
// fixed translation of modules descriptions containing quotes
 2013-09-23 07:51:57 -07:00