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

4313 Commits

Author SHA1 Message Date
Jerome Nadaud
81b9c01824 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:08:39 +02:00
Jerome Nadaud
7454d75fb9 // List simple header bootstraping 2013-10-02 17:08:28 +02:00
Damien Metzger
84a251a575 [*] BO : you can noww override header and footer for each controller 2013-10-02 17:04:18 +02:00
gRoussac
a027dbd061 [*] BO : Add category id in AdminSpecificPriceRule 2013-10-02 17:00:20 +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
Damien Metzger
250a9f17a2 [-] BO : managed decimal format in BO orders 2013-10-02 15:47:21 +02:00
Jerome Nadaud
68c5318706 // Icon change for list details button 2013-10-02 14:49:42 +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
51c1ee0cf0 // Move ajax box and ajax confirmation to content part 2013-10-02 12:23:10 +02:00
Damien Metzger
a876b13c1c [-] BO : fixed currency format on order creation 2013-10-02 12:10:54 +02:00
Jerome Nadaud
a891c9277a // Advanced stock management details list 2013-10-02 12:09:03 +02:00
Jerome Nadaud
43c874e06e // Fix line feed on address observation 2013-10-02 09:59:14 +02:00
Jerome Nadaud
ba2494fa8b // Remove language select on textarea with 1 langue 2013-10-02 09:43:24 +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
f469b69113 // Fix fixed home category And Norm 2013-10-01 15:18:56 +02:00
Jerome Nadaud
759a3e191a // Groups and language bootsrapify 2013-10-01 15:14:46 +02:00
Jerome Nadaud
14b584fc01 // Remove language select if exist only 1 language 2013-10-01 14:36:48 +02:00
djfm
1cce312aaa // orthograph 2013-09-30 16:15:53 +00:00
Damien Metzger
a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
Kevin Granger
0db013f1c8 // fix checkbox 2013-09-30 15:13:08 +02:00
Damien Metzger
80376e9034 // Fixed meta title 2013-09-30 11:27:01 +02:00
Damien Metzger
7019af3a11 // Bound the menu to the employee option 2013-09-30 11:20:49 +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
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
a1c7dd3ee9 // Add row break to color element 2013-09-26 16:44:26 +02:00
Jerome Nadaud
fa2f10ffc6 // Add row break to color element 2013-09-26 16:43:57 +02:00
Jerome Nadaud
bc80846d7d // Requiered fields bootstrap design 2013-09-26 16:25:18 +02:00
Jerome Nadaud
a93ce00af8 // Groups view bootstrap design 2013-09-26 15:59:28 +02:00
Jerome Nadaud
2cc6fe821b // Bootstraping template form checkbox 2013-09-26 14:56:24 +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
10e472e141 // List header template - Remove extra class attribute 2013-09-26 11:35:19 +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