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

1983 Commits

Author SHA1 Message Date
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
djfm 1cce312aaa // orthograph 2013-09-30 16:15:53 +00: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
djfm 66435cbf4a // grammar 2013-09-27 08:35:48 +00:00
gRoussac 126c21d39a [*] BO : AdminImport, remove csv files 2013-09-26 18:34:18 +02:00
gRoussac d3ad12e536 [*] BO : Add csv file download in AdminImport 2013-09-26 17:40:33 +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
Gregory Roussac 7f9183b1d4 Merge pull request #743 from dlage/modules_update 
[*] BO : Show modules update button even if module is not installed but not notices
 2013-09-24 20:40:56 +02:00
gRoussac e900474b8e // remove notice 2013-09-24 19:01:08 +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
djfm 5c4de83e91 // no quotes around 1 in js=1 please 2013-09-23 15:20:26 +00: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
Jerome Nadaud e128e17f4e // Geoloc bootstrap design 2013-09-23 14:04:15 +02:00
Jerome Nadaud 748d6271a9 // Stores controller bootstrap 2013-09-23 13:56:30 +02:00
Jerome Nadaud 234b6de1b0 // Stores controller bootstrap design 2013-09-23 13:31:45 +02:00
Jerome Nadaud 4bb0a5f794 // Preferences images bootstrap design 2013-09-23 11:43:31 +02:00
Jerome Nadaud 5206496f64 [-] BO : Fix Bug For new Fancy Box events 2013-09-23 11:22:51 +02:00
Kevin Granger c93eb9f40a // orders WIP 2013-09-20 19:11:08 +02:00
Jerome Nadaud 0e87409bd6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-20 18:31:47 +02:00
Jerome Nadaud 8e1cb5cc34 // Kpi update for customers orders 2013-09-20 18:31:35 +02:00
Damien Metzger 1fe17f0eb1 // Removed deprecated option form in stats 2013-09-20 18:18:04 +02:00
gRoussac e2a1f5101c [-] BO : Bad input radio names 2013-09-20 15:27:31 +02:00
Jerome Nadaud f312a055b1 // Multistore bootstrap design 2013-09-20 15:04:43 +02:00
Kevin Granger eeb3b540e2 // orders + css highlight / fixed-width 2013-09-20 14:42:09 +02:00
Jerome Nadaud 74a262f2ed // Shopping carts bootsrap design 2013-09-20 10:29:32 +02:00
Kevin Granger 724ab12122 // orders cleanup 2013-09-19 20:12:05 +02:00
Jerome Nadaud 39edb5a546 // Fix cart rules bootstrap design 2013-09-19 19:33:55 +02:00