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
Damien Metzger 8f10e42b60 // Small fixes 2013-10-14 15:49:57 +02:00
Jerome Nadaud f4118c4f9d // Fix some table header column title 2013-10-14 15:06:09 +02:00
Kevin Granger 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	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/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
gRoussac 1358c696cd [-] BO : Fix #PSCFV-10678 warning in chrome 2013-10-14 11:37:15 +02:00
djfm 5e407db21e [*] LO : Fixed a few bugs with currency formats in Back-Office orders 2013-10-14 09:30:45 +00:00
Kevin Granger 59435fa2ee // login flip WIP 2013-10-14 09:57:02 +02:00
indesign47 4f9191fe0c Update form.tpl 2013-10-12 11:45:07 +02:00
Kevin Granger 89251a667b // feedback button 2013-10-11 18:26:12 +02:00
Kevin Granger cd5a308ad7 // login : tabindex + ux 2013-10-11 12:28:01 +02:00
Damien Metzger c68101653d // Fixed tabs 2013-10-11 12:10:24 +02:00
Damien Metzger 28118cf33a // Code cleaning (backoffice javascript) 2013-10-11 10:47:48 +02:00
Kevin Granger 447f1d4ba7 // quick fix customer view 2013-10-10 19:04:25 +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
Kevin Granger 6c35b20b02 // organize css 2013-10-10 11:43:24 +02:00
Damien Metzger fb9204ebd6 // Fixed module page 2013-10-10 09:14:58 +02:00
Kevin Granger 9de6ec0379 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 20:28:15 +02:00
Kevin Granger 5b509c2c20 // login WIP 2013-10-09 20:26:04 +02:00
Jerome Nadaud 6245b05b6e // Remove flags from language select 2013-10-09 19:39:05 +02:00
Jerome Nadaud 5ec76a759a // Fix Dashboard toolbar 2013-10-09 19:12:20 +02:00
Kevin Granger 719e5f4faf Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-10-09 18:55:46 +02:00
Kevin Granger 74f12c23be // login WIP 2013-10-09 18:54:13 +02:00
Jerome Nadaud cfbb0d872b // Add confirmation on category image delete 2013-10-09 18:47:33 +02:00
Jerome Nadaud eae76eb63e // Pagination bootstraping 2013-10-09 18:36:19 +02:00
Fabio Chelly 246340b78c [*] BO Module search: Enter key is now disabled in quick search field (field is correctly aligned) 2013-10-09 18:33:41 +02:00
Fabio Chelly 75ffa8c4f8 [*] BO Module search: Enter key is now disabled in quick search field 2013-10-09 18:30:09 +02:00
Kevin Granger 2c7ed00b39 // pagination 2013-10-09 17:21:53 +02:00
Damien Metzger 9b24cca088 // Fixed category breadcrumb 2013-10-09 16:44:58 +02:00
Jerome Nadaud f5452aea66 // Products fix 2013-10-09 15:23:44 +02:00
Damien Metzger a2371067bf // CSS fixes 2013-10-09 15:11:04 +02:00
Jerome Nadaud 3cca8206b9 // Fix missing unwanted div 2013-10-09 14:06:22 +02:00
Jerome Nadaud 8c9dffd854 // Add pagination to states list 2013-10-09 10:03:27 +02:00
Jerome Nadaud 9bdde5c5c0 // Add pagination to countries list 2013-10-09 09:59:49 +02:00
Jerome Nadaud 18d909c05d // Add cache control to ajax request for ipad 2013-10-09 09:55:17 +02:00
Kevin Granger daa1cc47db Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 09:43:10 +02:00
Kevin Granger b4459e39a4 // Orders WIP 2013-10-09 09:43:04 +02:00
Jerome Nadaud 57c34488ff // Orders refund buttons 2013-10-09 09:41:51 +02:00
Jerome Nadaud 5a4548bd51 // Toolbar for search 2013-10-09 09:41:10 +02:00
Damien Metzger d9b40b8f35 // Added Modules KPIs 2013-10-08 19:39:52 +02:00
Kevin Granger 797a6c121a // Orders WIP 2013-10-08 18:53:41 +02:00
Jerome Nadaud d595cd2f12 // Toolbar modif for products 2013-10-08 18:51:10 +02:00
Jerome Nadaud b9cfc24922 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-08 18:42:19 +02:00
Jerome Nadaud d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Damien Metzger 53748c3119 // Code cleaning 2013-10-08 15:01:46 +02:00
Damien Metzger c75cb99b51 // Code cleaning 2013-10-08 14:45:22 +02:00
Damien Metzger a14118863e // Code cleaning 2013-10-08 14:45:21 +02:00
Kevin Granger 3e6f425bd4 // Orders WIP 2013-10-08 12:26:48 +02:00
Damien Metzger b7e13e2e7f // Code cleaning 2013-10-08 11:55:10 +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
Sarah Lorenzini 8f1b19a30b // update customer service page 2013-10-07 16:45:48 +02:00