 Jerome Nadaud
|
2ba5dc18fd
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
modules/themeconfigurator/themeconfigurator.php
|
2013-11-18 14:49:27 +01:00 |
|
|
Jerome Nadaud
|
46dc93fd7e
|
// Adding update button on to page header toolbar on module
|
2013-11-18 14:41:49 +01:00 |
|
|
Damien Metzger
|
b62952accf
|
[*] BO : Added simulation mode to the dashboard
|
2013-11-15 18:07:23 +01:00 |
|
|
Jerome Nadaud
|
5106a5f1e3
|
// Fix products controller title
|
2013-11-15 17:25:12 +01:00 |
|
|
Jerome Nadaud
|
5fb4ac5044
|
// Fix missing last actions button in tracking controller list
|
2013-11-15 16:25:31 +01:00 |
|
|
Jerome Nadaud
|
44f89053e4
|
// Invoice search fix
|
2013-11-15 15:00:56 +01:00 |
|
|
Jerome Nadaud
|
18a2e026ef
|
// Adding more buttons to module configuration
|
2013-11-14 15:49:17 +01:00 |
|
|
Jerome Nadaud
|
299a8e9e9f
|
// Update attributes group title
|
2013-11-14 14:13:28 +01:00 |
|
|
Vincent Augagneur
|
9a0b308846
|
//remove preactivationLink ajax and move in gamification module
|
2013-11-14 10:54:29 +01:00 |
|
|
Jerome Nadaud
|
2cbf8af2b2
|
// Cms title
|
2013-11-13 09:36:58 +01:00 |
|
|
Kevin Granger
|
4fbc8deaa8
|
// fix products
|
2013-11-12 18:21:36 +01:00 |
|
|
Jerome Nadaud
|
c7fff6b20d
|
// Change edit title on employees controller
|
2013-11-12 12:05:00 +01:00 |
|
|
Jerome Nadaud
|
d6df601d0e
|
// Preferences identrifer names
|
2013-11-12 11:55:54 +01:00 |
|
|
Jerome Nadaud
|
fe387fa8ed
|
// Set Identifier name for search engine
|
2013-11-12 11:30:26 +01:00 |
|
|
Jerome Nadaud
|
41196f3c5f
|
// General modification for view and edit title
|
2013-11-12 11:06:20 +01:00 |
|
|
Jerome Nadaud
|
44d1ed0982
|
// Add category name to page header title
|
2013-11-12 10:45:17 +01:00 |
|
|
Jerome Nadaud
|
ef469d7782
|
// Move spin and ladda js to products controller
|
2013-11-08 17:47:09 +01:00 |
|
|
Jerome Nadaud
|
bf67bd56a3
|
// Add uploader to products controller
|
2013-11-08 16:29:07 +01:00 |
|
|
fram
|
be38a438e2
|
// sprintf & English
|
2013-11-08 11:39:59 +01:00 |
|
|
Kevin Granger
|
42af175d22
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 21:49:11 +01:00 |
|
|
Kevin Granger
|
51e962195c
|
// This Controller needs a toolbar and a title
|
2013-11-07 17:15:40 +01:00 |
|
|
Jerome Nadaud
|
01d8376ee7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 16:48:56 +01:00 |
|
|
Jerome Nadaud
|
b51b388eaa
|
// Blockcategories thumnail uploader fix
|
2013-11-07 16:44:55 +01:00 |
|
|
Kevin Granger
|
63e31a4585
|
Merge pull request #939 from djfm/bootstrap
Translations (EN) / Mails / Fix Column
|
2013-11-07 05:08:16 -08:00 |
|
|
djfm
|
598034efb4
|
// English
|
2013-11-07 12:27:48 +00:00 |
|
|
Vincent Augagneur
|
9e76f82fb5
|
//merge
|
2013-11-07 12:06:58 +01:00 |
|
|
Vincent Augagneur
|
3c31f1a07f
|
//dashconfig errors return
|
2013-11-07 12:05:03 +01:00 |
|
|
djfm
|
3d22303b90
|
// sprintf
|
2013-11-07 10:01:10 +00:00 |
|
|
Jerome Nadaud
|
7895f8643e
|
// Fix missing page header in combinations generator
|
2013-11-06 14:42:56 +01:00 |
|
|
Jerome Nadaud
|
0c1b77b3da
|
// Fix Combinations list actions button problem
|
2013-11-06 12:18:52 +01:00 |
|
|
Vincent Augagneur
|
a890410a64
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-06 10:57:02 +01:00 |
|
|
Vincent Augagneur
|
c16c239953
|
//typo
|
2013-11-06 10:56:56 +01:00 |
|
|
Jérôme Nadaud
|
54db0b705c
|
Merge pull request #923 from PrestaEdit/1.6.x-fancybox
//remove unnecessary addCSS (fancybox)
|
2013-11-06 00:31:57 -08:00 |
|
|
Damien Metzger
|
a31dbeb68e
|
// Fixed bootstrap mode for modules
|
2013-11-05 17:29:51 +01:00 |
|
|
Kevin Granger
|
b68d8c5d4a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 17:15:51 +01:00 |
|
|
Kevin Granger
|
332101614a
|
// moved nv.d3.css to vendor directory
|
2013-11-05 17:15:36 +01:00 |
|
|
Vincent Augagneur
|
3f3a4ef342
|
//revert
|
2013-11-05 16:58:26 +01:00 |
|
|
Vincent Augagneur
|
217a9124d4
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 16:56:08 +01:00 |
|
|
Vincent Augagneur
|
1dccee0036
|
//remove back button in header toolbar on carrier wizard
|
2013-11-05 16:56:03 +01:00 |
|
|
Damien Metzger
|
ad7dfca9e1
|
// RSS date on the dashboard
|
2013-11-05 16:55:55 +01:00 |
|
|
Damien Metzger
|
ec528fff93
|
// one more groups improvement
|
2013-11-05 16:34:03 +01:00 |
|
|
Damien Metzger
|
161c701ecf
|
// Groups review
|
2013-11-05 16:30:34 +01:00 |
|
|
Damien Metzger
|
e4fe5f6df6
|
// Fixed htmlentities in KPIs
|
2013-11-05 16:01:48 +01:00 |
|
|
Vincent Augagneur
|
9af3b30135
|
//smal fix on hookDashboardData params
|
2013-11-05 10:21:34 +01:00 |
|
|
Jonathan Danse
|
9f396ada83
|
//remove unnecessary addCSS (fancybox)
|
2013-11-05 10:13:13 +01:00 |
|
|
Jerome Nadaud
|
de8bd97831
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-04 19:50:48 +01:00 |
|
|
Kevin Granger
|
fbc93e5632
|
// moved admin css and backward compatibility css to admin theme css directory
|
2013-11-04 19:48:53 +01:00 |
|
|
Damien Metzger
|
8dc29b20f0
|
// Code cleaning and dashgoals improvements (part 1 - not finished yet)
|
2013-11-04 18:52:27 +01:00 |
|
|
Jerome Nadaud
|
fa68e015b3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-04 18:34:51 +01:00 |
|
|
Jerome Nadaud
|
bf2d54e286
|
// Add new uploader helper to blockcategories
|
2013-11-04 18:32:59 +01:00 |
|