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

1753 Commits

Author SHA1 Message Date
Damien Metzger 9dfecbb1b8 // Fixed addons url 2013-10-18 17:05:04 +02:00
Kevin Granger 9c07cb9302 // fix informations 2013-10-17 18:43:15 +02:00
Kevin Granger d933466d04 // fixs add product informations 2013-10-17 18:11:47 +02:00
Kevin Granger 7189aa9de9 // fix yes/no, alert success, cache clear button 2013-10-17 17:33:55 +02:00
Kevin Granger dc43c0f7d3 // fix delete categories 2013-10-17 13:50:14 +02:00
Vincent Augagneur d1ee6e6357 //small fix 2013-10-17 11:27:30 +02:00
Vincent Augagneur 2f34af4646 //remove debug 2013-10-17 09:26:47 +02:00
Vincent Augagneur 22df963c72 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-16 16:09:51 +02:00
Vincent Augagneur c684fa13cb //module anchor now use instant search to filter module list 2013-10-16 16:09:44 +02:00
Rémi Gaillard 7c096d9769 // small fix 2013-10-16 15:48:52 +02:00
Rémi Gaillard 2e65214c39 // manually merge of modules search 2013-10-16 11:36:40 +02:00
Damien Metzger 04999f7624 // Small fixes 2013-10-16 09:43:38 +02:00
Kevin Granger be2ea4ca77 // login 2013-10-15 20:04:19 +02:00
Rémi Gaillard 1b8526cd05 // fix ajax on module list 2013-10-15 18:35:04 +02:00
Kevin Granger 0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +02:00
Jerome Nadaud a85c1d7933 // Add index.php files to dashboard folder 2013-10-15 18:05:02 +02:00
Jerome Nadaud 6c6c3b240e // Fix bug display final price when country have no display tax 2013-10-15 15:06:38 +02:00
Jerome Nadaud 5fd6b9aac6 // Add overflow-y to module payments 2013-10-15 14:53:31 +02:00
Damien Metzger eed6b65914 // Added Addons block in the dashboard 2013-10-15 14:18:50 +02:00
Kevin Granger 2bc927c810 // login css 2013-10-14 18:08:33 +02:00
Jerome Nadaud 7e4329a4dc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-14 17:31:50 +02:00
Kevin Granger 3eeac7f2bb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-14 16:35:01 +02:00
Kevin Granger 3f22a6b6c9 // login flip 2013-10-14 16:34:02 +02:00
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
Kevin Granger 59435fa2ee // login flip WIP 2013-10-14 09:57:02 +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