 Vincent Augagneur
|
669a49be59
|
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
|
2013-12-06 10:17:12 +01:00 |
|
|
Vincent Augagneur
|
c2e0edcc7a
|
[-] BO : carrier wizard no fees display
|
2013-12-06 10:17:07 +01:00 |
|
|
Vincent Augagneur
|
7117a6f4fd
|
[-] BO : fixed bug #PSCSX-76 - carrier wizard fees not display after reload carrier
|
2013-12-05 10:35:51 +01:00 |
|
|
Vincent Augagneur
|
36a70d83d5
|
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
|
2013-12-04 18:31:19 +01:00 |
|
|
Vincent Augagneur
|
b1304f0379
|
//carrier wizard range table auto size
|
2013-12-04 18:27:08 +01:00 |
|
|
Vincent Augagneur
|
98d02d94b9
|
[-] BO : carrier wizard range tab now overflow scroll
|
2013-12-03 14:15:24 +01:00 |
|
|
Vincent Augagneur
|
a9f2bd053a
|
[-] BO : carrier wizard fixed when select zone and set no shipping fees
|
2013-12-03 11:45:43 +01:00 |
|
|
Vincent Augagneur
|
0a2ba0015b
|
[-] BO : carrier wizard, remove fees when desabled zone
|
2013-12-03 10:34:53 +01:00 |
|
|
Vincent Augagneur
|
66947b5354
|
//multiple small fix on carrier wizard
|
2013-11-28 17:38:05 +01:00 |
|
|
Vincent Augagneur
|
dde8540a86
|
//carrier wizard logo location fixed
|
2013-11-28 11:27:34 +01:00 |
|
|
Vincent Augagneur
|
ddf00b3e98
|
//small fix #PSCSX-50
|
2013-11-28 11:06:46 +01:00 |
|
|
Vincent Augagneur
|
484501169a
|
//added move up/down on selected item on blocktopmenu
|
2013-11-28 10:52:17 +01:00 |
|
|
Vincent Augagneur
|
56afe10128
|
//added gapi logo in dashactivity
|
2013-11-28 10:18:54 +01:00 |
|
|
Vincent Augagneur
|
33b7c554f7
|
//small fix #PSCSX-39
|
2013-11-26 10:59:03 +01:00 |
|
|
Vincent Augagneur
|
e3f3f8a58f
|
//oups
|
2013-11-26 10:25:03 +01:00 |
|
|
Vincent Augagneur
|
690b6b160a
|
//small js fix
|
2013-11-26 10:24:19 +01:00 |
|
|
Vincent Augagneur
|
d2c600a5e3
|
//updated .gitignore
|
2013-11-21 09:51:22 +01:00 |
|
|
Vincent Augagneur
|
a3282025cf
|
//referralprogram retro compat 1.5 when using helper form in module configuration
|
2013-11-20 18:05:56 +01:00 |
|
|
Vincent Augagneur
|
6ec8e4e70e
|
mailalerts retro compat 1.5 when using helper form in module configuration
|
2013-11-20 17:57:58 +01:00 |
|
|
Vincent Augagneur
|
64cfe559f1
|
//loyalty retro compat 1.5 when using helper form in module configuration
|
2013-11-20 17:56:11 +01:00 |
|
|
Vincent Augagneur
|
8148d5696d
|
[-] BO : fixed bug #PSCSX-25 - carrier wizard summary design and missing infos
|
2013-11-20 15:20:44 +01:00 |
|
|
Vincent Augagneur
|
0299f3f0cd
|
[-] BO : fixed bug #PSCSX-32 class-danger on mail send error
|
2013-11-20 14:56:31 +01:00 |
|
|
Vincent Augagneur
|
9a0b308846
|
//remove preactivationLink ajax and move in gamification module
|
2013-11-14 10:54:29 +01:00 |
|
|
Vincent Augagneur
|
5963871a01
|
//small fix
|
2013-11-13 11:40:13 +01:00 |
|
|
Vincent Augagneur
|
746d8de9c7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-13 10:09:07 +01:00 |
|
|
Vincent Augagneur
|
5d0117c5ed
|
//added configuration in sql request in dashactivity
|
2013-11-13 10:08:57 +01:00 |
|
|
Vincent Augagneur
|
582ad68875
|
added default configuration value for dashproducts
|
2013-11-13 09:27:48 +01:00 |
|
|
Vincent Augagneur
|
55fa826525
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-13 09:07:54 +01:00 |
|
|
Vincent Augagneur
|
e7869f6b19
|
//added default configuration value for dashactivity
|
2013-11-13 09:07:44 +01:00 |
|
|
Vincent Augagneur
|
52abf62ae1
|
//dashactivity config
|
2013-11-12 17:33:54 +01:00 |
|
|
Vincent Augagneur
|
c6e34ee229
|
//dashproducts added section in tpl
|
2013-11-12 14:43:08 +01:00 |
|
|
Vincent Augagneur
|
249bd5437d
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-12 14:41:11 +01:00 |
|
|
Vincent Augagneur
|
cf9da09f98
|
//remove unused smarty variable
|
2013-11-12 14:40:58 +01: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 |
|
|
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 |
|
|
Vincent Augagneur
|
37e0556c36
|
//fixed carrier logo upload
|
2013-11-05 18:12:53 +01:00 |
|
|
Vincent Augagneur
|
871ebe77b6
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 18:08:22 +01:00 |
|
|
Vincent Augagneur
|
d27fe93daa
|
//modules added ->bootstrap = true;
|
2013-11-05 18:08:01 +01:00 |
|
|
Vincent Augagneur
|
657c8f415a
|
//small css fix
|
2013-11-05 17:01:38 +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 |
|
|
Vincent Augagneur
|
f0e1b9b2b8
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 16:32:12 +01:00 |
|
|
Vincent Augagneur
|
7e872aa581
|
//small fix
|
2013-11-05 16:32:05 +01:00 |
|
|
Vincent Augagneur
|
1a7aa020f6
|
//added new configuration on dashproduct
|
2013-11-05 10:23:26 +01:00 |
|
|
Vincent Augagneur
|
e710942833
|
//small fix on dashboard config save
|
2013-11-05 10:22:22 +01:00 |
|
|
Vincent Augagneur
|
9af3b30135
|
//smal fix on hookDashboardData params
|
2013-11-05 10:21:34 +01:00 |
|
|
Vincent Augagneur
|
5386a4547b
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-04 14:57:50 +01:00 |
|
|
Vincent Augagneur
|
d571920806
|
//small fix
|
2013-11-04 11:09:53 +01:00 |
|
|
Vincent Augagneur
|
02367e5396
|
//missing file for blockwishlist module
|
2013-11-04 10:42:37 +01:00 |
|
|
Vincent Augagneur
|
3de663f9a1
|
//missing files for module followup
|
2013-11-04 10:20:17 +01:00 |
|
|
Vincent Augagneur
|
e03a86ad05
|
//homeslider new use bootstrap design
|
2013-11-04 10:01:29 +01:00 |
|
|
Vincent Augagneur
|
6a3e711cff
|
//small fix
|
2013-10-30 15:43:31 +01:00 |
|
|
Vincent Augagneur
|
ad68105467
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-30 10:52:04 +01:00 |
|
|
Vincent Augagneur
|
0020412aea
|
//added Preactivation request on dashboard
|
2013-10-30 10:51:58 +01:00 |
|
|
Vincent Augagneur
|
6a552be7dd
|
//followup now use bootstrap design
|
2013-10-24 17:23:40 +02:00 |
|
|
Vincent Augagneur
|
f82322e426
|
//typo
|
2013-10-24 16:51:55 +02:00 |
|
|
Vincent Augagneur
|
b38073ad72
|
//watermark now use bootstrap design
|
2013-10-23 18:01:23 +02:00 |
|
|
Vincent Augagneur
|
c61cec9f2a
|
//display date on dashproducts && added param date_from & date_to on dashboard hooks
|
2013-10-23 09:59:16 +02:00 |
|
|
Vincent Augagneur
|
48a70cc8ac
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-23 09:57:47 +02:00 |
|
|
Vincent Augagneur
|
3ec3bf587e
|
//small fix on cache_id in classe Hook
|
2013-10-23 09:38:22 +02:00 |
|
|
Vincent Augagneur
|
537bfb0520
|
//dash configuration cancel button added
|
2013-10-22 18:04:08 +02:00 |
|
|
Vincent Augagneur
|
fea7cd5983
|
//helper list must be wrapped by a form even if it's a simple header
|
2013-10-22 14:48:44 +02:00 |
|
|
Vincent Augagneur
|
a62f9169d5
|
//missing file btn-primary => btn btn-default
|
2013-10-22 09:15:46 +02:00 |
|
|
Vincent Augagneur
|
8144935d76
|
//btn-primary => btn btn-default thanks @Shipow
|
2013-10-22 09:12:01 +02:00 |
|
|
Vincent Augagneur
|
6bc9b54306
|
//small fix - added new link on block top menu
|
2013-10-21 22:29:56 +02:00 |
|
|
Vincent Augagneur
|
10473e09ad
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 14:51:25 +02:00 |
|
|
Vincent Augagneur
|
150c6e0130
|
[+] CORE : helperList action can be rendered from module classe
|
2013-10-21 14:51:14 +02:00 |
|
|
Vincent Augagneur
|
9cf2fe4214
|
//removed commented code
|
2013-10-21 10:24:20 +02:00 |
|
|
Vincent Augagneur
|
459d0232a4
|
//blockcms use boostrap design
|
2013-10-21 10:08:45 +02:00 |
|
|
Vincent Augagneur
|
e058224cf2
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 09:58:18 +02:00 |
|
|
Vincent Augagneur
|
103582be33
|
//blocklink now use bootstrap design
|
2013-10-21 09:58:08 +02:00 |
|
|
Vincent Augagneur
|
fd86a29c5c
|
//small fix
|
2013-10-21 09:50:20 +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
|
37712f0193
|
//when a module is disabled, first option is enable
|
2013-10-16 16:20:51 +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 |
|
|
Vincent Augagneur
|
3e269f211c
|
//blockadvertising now use boostrap design
|
2013-10-16 14:15:22 +02:00 |
|
|
Vincent Augagneur
|
d67be9431a
|
//blocktopmenu now use bootstrap design
|
2013-10-16 13:55:58 +02:00 |
|
|
Vincent Augagneur
|
bd95d03e37
|
//blockwishlist now use boostrap design
|
2013-10-15 09:30:26 +02:00 |
|
|
Vincent Augagneur
|
4da04275fe
|
//small fix related to 1316bd7e1f
|
2013-10-14 15:07:50 +02:00 |
|
|
Vincent Augagneur
|
b9c6b0e8af
|
//dateofdelivery now use bootstrap design
|
2013-10-14 14:55:56 +02:00 |
|
|
Vincent Augagneur
|
5bcacf9b48
|
//statsdata now use boostrap design
|
2013-10-11 14:38:18 +02:00 |
|
|
Vincent Augagneur
|
38a7e90eff
|
//referralprogram now use boostrap design
|
2013-10-11 14:29:56 +02:00 |
|
|
Vincent Augagneur
|
87417ed928
|
//producttooltip now use bootstrap design
|
2013-10-10 18:07:08 +02:00 |
|
|
Vincent Augagneur
|
477973a43e
|
//carrier wizard button good place and order
|
2013-10-09 16:24:25 +02:00 |
|
|
Vincent Augagneur
|
d796d0012e
|
[-] BO : fixed bug #PSCFV-10637 PS_CARRIER_DEFAULT is not updated after edit default carrier
|
2013-10-09 15:25:02 +02:00 |
|
|
Vincent Augagneur
|
ced6554133
|
//loyalty module now use bootstrap design
|
2013-10-09 11:19:32 +02:00 |
|
|
Vincent Augagneur
|
e16676efaa
|
//added prefix & suffix on helper form
|
2013-10-09 10:51:04 +02:00 |
|
|
Vincent Augagneur
|
46fef35348
|
//homefeatured now use bootstrap design
|
2013-10-07 10:25:10 +02:00 |
|
|
Vincent Augagneur
|
3f4f298ad4
|
[-] CORE fixed bug #PSCFV-10595 - small fix in function addJqueryPlugin()
|
2013-10-07 10:01:26 +02:00 |
|
|
Vincent Augagneur
|
5c605067f0
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-07 09:09:26 +02:00 |
|
|
Vincent Augagneur
|
8a6dc6233d
|
//jquery.smartWizard use bootstrap css classes
|
2013-10-07 09:08:20 +02:00 |
|
|
Vincent Augagneur
|
5564b342f4
|
//wizard boostrap and title fix
|
2013-10-04 17:07:10 +02:00 |
|
|
Vincent Augagneur
|
fe6494bf35
|
//fixed bug PSCFV-10567
|
2013-10-04 16:33:50 +02:00 |
|
|
Vincent Augagneur
|
828b838d22
|
//products comparison link
|
2013-10-04 16:25:47 +02:00 |
|
|
Vincent Augagneur
|
d1956572a5
|
//small fix on carrier wizard
|
2013-10-03 10:29:40 +02:00 |
|