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

1773 Commits

Author SHA1 Message Date
Jerome Nadaud a7c7bc68a3 // Fix products form content 2013-10-22 13:38:47 +02:00
Kevin Granger aa95454c4e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/images/content.tpl
 2013-10-22 10:07:03 +02:00
Kevin Granger eb82297f45 // small fixs 2013-10-22 10:04:45 +02:00
Jerome Nadaud 3ba337f19a // Image preference bootstraping 2013-10-22 09:25:05 +02:00
Jerome Nadaud f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02:00
Damien Metzger bf6c57063c // Fixed dashboard style 2013-10-21 18:18:48 +02:00
gRoussac 7c7fe5dc0b // small change 2013-10-21 12:39:48 +02:00
Jerome Nadaud 9c4b975cfc //Module uploader bootstraping 2013-10-21 11:31:50 +02:00
Jerome Nadaud 81042db718 // CSV import uploader bootstraping 2013-10-21 11:24:56 +02:00
Vincent Augagneur fd86a29c5c //small fix 2013-10-21 09:50:20 +02:00
Kevin Granger 067eecdc70 // small fix 2013-10-18 19:07:03 +02:00
Kevin Granger 04b4e548f3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 18:38:17 +02:00
Kevin Granger 5f52a9e171 // fix products 2013-10-18 18:38:02 +02:00
Damien Metzger d1a2c33322 Merge pull request #849 from djfm/bootstrap 
// Translations fix
 2013-10-18 09:35:20 -07:00
Jerome Nadaud 6c37efdb6a // Categories image upload bootstraping 2013-10-18 18:33:32 +02:00
Jerome Nadaud ff81667b5c // Image thumnail fix 2013-10-18 18:28:57 +02:00
Jerome Nadaud 667353d43f // Store contacts bootstraping 2013-10-18 18:24:21 +02:00
Damien Metzger 9dfecbb1b8 // Fixed addons url 2013-10-18 17:05:04 +02:00
djfm 5a3d487e9f // sprintf again 2013-10-18 14:31:48 +00:00
djfm 901f5aeb08 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 08:20:32 +00:00
djfm 37656c2df9 // fixed improper English string for translation 2013-10-18 08:20:20 +00: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