 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 |
|
|
gRoussac
|
26a43260c5
|
[-] CORE : invalid method name in displayAjax method of Controller action
|
2013-11-05 10:18:53 +01:00 |
|
|
Jonathan Danse
|
9f396ada83
|
//remove unnecessary addCSS (fancybox)
|
2013-11-05 10:13:13 +01:00 |
|
|
Gregory Roussac
|
c69429c126
|
Merge pull request #922 from Jacky75/20131105-layered-categories-shop
[-] MO : Missing context shop for categories
|
2013-11-05 01:10:39 -08:00 |
|
|
Daniele Giachino
|
02c04a9884
|
In multistore, layered filters about categories are not loading the category name from the proper shop
|
2013-11-05 09:40:53 +01:00 |
|
|
Daniele Giachino
|
cf65877f3f
|
layered filters involving features are now natural sorted
|
2013-11-05 09:32:36 +01:00 |
|
|
Daniele Giachino
|
f0abdca08f
|
layered filters involving features are now natural sorted
|
2013-11-05 09:30: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 |
|
|
Jerome Nadaud
|
cf44f8d0b4
|
// Uploader helper small fix
|
2013-11-04 19:50:04 +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 |
|
|
Rémi Gaillard
|
569455a7ff
|
// fix on front validators
|
2013-11-04 19:26:51 +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 |
|
|
Kevin Granger
|
8aedd4eb04
|
// Cleaned CSS files
|
2013-11-04 18:31:59 +01:00 |
|
|
Jerome Nadaud
|
d78a268730
|
// Uploader helper part 2
|
2013-11-04 18:31:43 +01:00 |
|
|
gRoussac
|
0e54bf0f76
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-11-04 18:27:39 +01:00 |
|
|
Jerome NadaudandgRoussac
|
12276f41fb
|
// Update image when updated
|
2013-11-04 18:26:24 +01:00 |
|
|
gRoussac
|
be13f82b30
|
[*] FO: Follow up https://github.com/PrestaShop/PrestaShop/commit/e86c56172dad2892d5c7e7dbb0908b0f4ffbaae0
|
2013-11-04 18:20:01 +01:00 |
|
|
Rémi Gaillard
|
f5cc6862cb
|
// don't die on autoload
|
2013-11-04 18:08:24 +01:00 |
|
|
Damien Metzger
|
2a9ebaa6ed
|
Merge pull request #920 from djfm/bootstrap
// English emails
|
2013-11-04 09:07:41 -08:00 |
|
|
djfm
|
71e3a8a937
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-04 16:58:17 +00:00 |
|
|
djfm
|
5372f31b4c
|
// updated English emails
|
2013-11-04 16:57:50 +00:00 |
|
|
Jerome Nadaud
|
b650c349d5
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-04 17:47:46 +01:00 |
|
|
Jerome Nadaud
|
5af2ef38a1
|
// Fix Tagify javascript error
|
2013-11-04 17:47:27 +01:00 |
|
|
Kevin Granger
|
9611c17980
|
// removed install.css http://www.youtube.com/watch?v=Y9mq7Qc4oSM
|
2013-11-04 17:28:50 +01:00 |
|
|
Rémi Gaillard
|
2c3a5c553d
|
// small fix
|
2013-11-04 17:23:04 +01:00 |
|
|
Rémi Gaillard
|
0a65de5e5f
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-11-04 17:22:21 +01:00 |
|
|
Rémi Gaillard
|
f4740088c1
|
// small fix
|
2013-11-04 17:22:08 +01:00 |
|
|
Kevin Granger
|
ddd722dc14
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-04 17:08:43 +01:00 |
|
|
Kevin Granger
|
667848d1df
|
// removed csshover.htc
|
2013-11-04 17:08:32 +01:00 |
|
|
Damien Metzger
|
ac1f142f23
|
// Moved default_language
|
2013-11-04 17:08:17 +01:00 |
|
|
Damien Metzger
|
e8c0195ee9
|
// small fix merge
|
2013-11-04 17:04:09 +01:00 |
|
|
gRoussac
|
c44b1d617c
|
[-] BO : Could not change image position
|
2013-11-04 16:59:03 +01:00 |
|
|
Kevin Granger
|
f3fa65f9be
|
// removed admin-ie.css
|
2013-11-04 16:58:27 +01:00 |
|
|
Kevin Granger
|
68cda947ed
|
// removed login.css
|
2013-11-04 16:53:43 +01:00 |
|
|
Damien Metzger
|
0009556ed5
|
// Fixed no bootstrap for modules
|
2013-11-04 16:51:30 +01:00 |
|
|
Damien Metzger
|
695326bc4e
|
// Filter search BO
|
2013-11-04 16:51:30 +01:00 |
|
|
Damien Metzger
|
0ddc0d9f9a
|
Merge pull request #919 from djfm/bootstrap
// installer typography
|
2013-11-04 07:23:25 -08:00 |
|
|
fram
|
5f1efc6b63
|
// installer typography
|
2013-11-04 16:20:10 +01:00 |
|
|
Damien Metzger
|
d4a6148b64
|
// Anything but a 404 image
|
2013-11-04 16:09:55 +01:00 |
|
|
Kevin Granger
|
48025838df
|
// fixs referrers
|
2013-11-04 16:08:38 +01:00 |
|
|
Kevin Granger
|
d0c6d86eb9
|
// fixs for merge
|
2013-11-04 15:56:24 +01:00 |
|
|
gRoussac
|
c452444620
|
[-] IN : Could not install when session_start() does not fail on ajax requests
|
2013-11-04 15:47:29 +01:00 |
|
|
Francois Gaillard
|
a81cde11d6
|
[-] Classes : ProductSale - Merge fix
|
2013-11-04 15:35:59 +01:00 |
|
|
Damien Metzger
|
f7d346ba99
|
// Added more results link at the end of the BO search
|
2013-11-04 15:03:48 +01:00 |
|
|
Damien Metzger
|
2e80ed8de5
|
// Cleaned conflict
|
2013-11-04 14:58:17 +01:00 |
|
|
Vincent Augagneur
|
5386a4547b
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-04 14:57:50 +01:00 |
|
|
Damien Metzger
|
27273334e3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-04 14:47:16 +01:00 |
|