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
Rémi Gaillard
1b8526cd05 // fix ajax on module list 2013-10-15 18:35:04 +02:00
Jerome Nadaud
aefd5947d2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 18:12:28 +02:00
Jerome Nadaud
ed2e9bee70 // Small datepicker fix 2013-10-15 18:12:01 +02:00
Kevin Granger
0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +02:00
Damien Metzger
953f4c4686 // Fixed login social links 2013-10-15 18:08:57 +02:00
Jerome Nadaud
a85c1d7933 // Add index.php files to dashboard folder 2013-10-15 18:05:02 +02:00
Jerome Nadaud
2157311f11 // Some improvement for range datepicker 2013-10-15 18:04:28 +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
Damien Metzger
7b307094b6 // Added comparison to the dashboard 2013-10-15 13:52:12 +02:00
Kevin Granger
d19b0ed8e0 // icon for error notice 2013-10-15 12:31:17 +02:00
Kevin Granger
d23714e9e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 12:11:15 +02:00
Kevin Granger
d1bc5eb6e0 // calendar WIP 2013-10-15 12:10:05 +02:00
Gregory Roussac
dec9ef40a8 Merge pull request #841 from indesign47/patch-10 
[+] BO : AdminImport add entity Alias
 2013-10-15 01:03:33 -07:00
Jerome Nadaud
7d85b21e92 // Pagination fix 2013-10-14 18:22:55 +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
Jerome Nadaud
7e9cdbb163 // Pagination fix 2013-10-14 17:30:56 +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
gRoussac
1358c696cd [-] BO : Fix #PSCFV-10678 warning in chrome 2013-10-14 11:37:15 +02:00
Jerome Nadaud
833091674c // Adding translations and PHP date format for datepicker 2013-10-14 11:34:04 +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
Jerome Nadaud
80c8605264 // Adding RTL to calendar helper 2013-10-14 09:14:18 +02:00
indesign47
4f9191fe0c Update form.tpl 2013-10-12 11:45:07 +02:00
Jerome Nadaud
0fe3630a05 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 18:30:16 +02:00
Jerome Nadaud
d575ba8273 // Adding compare dates to date range picker 2013-10-11 18:30:05 +02:00
Kevin Granger
89251a667b // feedback button 2013-10-11 18:26:12 +02:00
Kevin Granger
41f5d9f1f1 // fix datepicker 2013-10-11 17:21:45 +02:00
Jerome Nadaud
0f28393c8f // Fix data range picker 2013-10-11 16:16:03 +02:00
Jerome Nadaud
bedcacf0b4 // Starting development of data range picker 2013-10-11 16:12:40 +02:00
Damien Metzger
1849995291 // Code cleaning 2013-10-11 15:35:45 +02:00
Kevin Granger
dcf7e48f6e // datepicker stylesheet 2013-10-11 15:04:14 +02:00
Damien Metzger
809eac6308 // Fix upgrade and dashboard 2013-10-11 14:07:03 +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
Kevin Granger
b61528057a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/js/admin-theme.js
 2013-10-11 11:28:44 +02:00
Kevin Granger
40d4da04bb // cleaned admin-theme.js - added date range picker 2013-10-11 11:18:27 +02:00
Damien Metzger
f95a4d74df // Added Google Plus to the BO footer 2013-10-11 10:47:48 +02:00
Damien Metzger
28118cf33a // Code cleaning (backoffice javascript) 2013-10-11 10:47:48 +02:00
Damien Metzger
7f5f78a6f3 // Connected footer links and go-top 2013-10-11 09:44:15 +02:00
Kevin Granger
544423ea1e // remove duplicate 2013-10-10 20:05:58 +02:00
Kevin Granger
447f1d4ba7 // quick fix customer view 2013-10-10 19:04:25 +02:00
Kevin Granger
7d717ea207 // fix css + kpi + dashboard 2013-10-10 16:29:40 +02:00
Jerome Nadaud
22dcaf246c // Add icon and specific title to list 2013-10-10 15:36:50 +02:00