 rMalie
|
49468717c2
|
// Fix #PSFV-48
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8032 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 14:42:31 +00:00 |
|
|
tDidierjean
|
5ef6b3b0d6
|
// fix autoExecute with null values
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8030 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 14:32:04 +00:00 |
|
|
rMalie
|
3ab2ba9a75
|
// HTML flag can be used in ObjectModel->getTranslationsFieldsChild() to keep html on language fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8026 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 13:39:30 +00:00 |
|
|
lBrieu
|
03596be790
|
[+] Add the TinyMCE editor on categories description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8024 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 12:35:47 +00:00 |
|
|
rMalie
|
52d1d13891
|
// Merge -> revision 8014
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 12:00:05 +00:00 |
|
|
rMalie
|
d1d4d57eca
|
// Revert normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 10:20:59 +00:00 |
|
|
rMalie
|
a01a13274a
|
// Fix Product->setStock()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8018 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 09:59:23 +00:00 |
|
|
rMalie
|
f62cdb1963
|
// Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8017 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 09:58:20 +00:00 |
|
|
rMalie
|
e093ecd554
|
// Fix on shops + remove id_group_shop from stock + fix stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8015 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 09:38:24 +00:00 |
|
|
tDidierjean
|
09977516c2
|
// fix product comparison
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8012 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 08:39:52 +00:00 |
|
|
tDidierjean
|
7c67fd84c2
|
// Context part 30
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8008 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 16:45:48 +00:00 |
|
|
rMalie
|
183e1289c4
|
// Fix bug of toto on line 451 of carrier.php (he report modifications after change on signature function)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8007 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 16:04:59 +00:00 |
|
|
bMancone
|
4de7854629
|
// Fix ObjectModel->associateTo()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8002 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 15:16:37 +00:00 |
|
|
tDidierjean
|
eb2c483f2f
|
// changes to header and footer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7997 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 13:11:56 +00:00 |
|
|
rMalie
|
7411db9a69
|
// Merge -> revision 7979
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7981 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 08:36:17 +00:00 |
|
|
rMalie
|
f4a3e88283
|
// Fix virtual uri rewrite in htaccess + keep old specific code in htaccess
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7980 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 08:08:32 +00:00 |
|
|
gBrunier
|
d36b369b45
|
// Fix getProductLink (double slash when id_shop)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7977 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 16:31:53 +00:00 |
|
|
rMalie
|
671162a5f5
|
[-] Add a new option in admin preference to recompile smarty templates only when they are updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7976 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 16:25:40 +00:00 |
|
|
tDidierjean
|
d61637c5e5
|
// fix front controller initialization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7974 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 16:08:18 +00:00 |
|
|
fBrignoli
|
5f778cb23a
|
// debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7971 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 15:24:40 +00:00 |
|
|
fBrignoli
|
e22bc403e6
|
[-] Project : index file is now regenerated when a class is removed from the override directory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7970 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 15:24:03 +00:00 |
|
|
rMalie
|
f48b1ffc45
|
// Add cache on products stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7966 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 14:50:48 +00:00 |
|
|
rMalie
|
6e46649631
|
// Add cache on products stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7965 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 14:50:30 +00:00 |
|
|
tDidierjean
|
8d1435dfd0
|
// fix uninitialized front controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7964 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 14:46:03 +00:00 |
|
|
rMalie
|
269121a9c4
|
// Add cache on products stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7963 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 14:43:04 +00:00 |
|
|
rMalie
|
a86e95fc5a
|
// Fix shop_url when no physical_uri + fix shop association when multistore is disactivated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7958 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 13:20:26 +00:00 |
|
|
fBrignoli
|
58769824ce
|
// replace !is_core by substr($classname, -4) != 'Core'
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7947 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 15:52:23 +00:00 |
|
|
rMalie
|
f48792054a
|
// Fix some bugs on multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7942 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 15:24:21 +00:00 |
|
|
rMalie
|
8508481d36
|
// Add some comments in new autoload class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7939 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 14:24:32 +00:00 |
|
|
fBrignoli
|
8b6a67327e
|
// debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7938 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 14:08:08 +00:00 |
|
|
fBrignoli
|
953c9e0262
|
[-] Project : Autoload now handle weird syntax (eg. class Product{)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7937 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 14:07:38 +00:00 |
|
|
fBrignoli
|
5155b92591
|
[*] Project : Autoload is now able to load classes from /classes or /override subdirectories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7936 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 13:34:01 +00:00 |
|
|
tDidierjean
|
653ef8d115
|
// Context part 29
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7935 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 13:17:12 +00:00 |
|
|
rMalie
|
89cc9649cf
|
// Fix on discounts with multishop + index?controller=index fixed to be only index.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7929 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 08:29:32 +00:00 |
|
|
rMalie
|
0811404de8
|
// Refactoring of admin options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7922 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 15:52:45 +00:00 |
|
|
fBrignoli
|
13da28a2a8
|
[~] Hook::get replaced by Hook::getIdByName
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7916 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 14:49:18 +00:00 |
|
|
fBrignoli
|
03ffa388af
|
// missing static keyword
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7911 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 13:53:53 +00:00 |
|
|
rMalie
|
239f92eaf1
|
// Merge -> revision 7906
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7909 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 13:26:44 +00:00 |
|
|
rMalie
|
e4825ac555
|
// Refactoring of preferences
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7907 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 13:21:40 +00:00 |
|
|
rMalie
|
bd9366daf5
|
// Fix physical_uri during install + required paramaters in dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7903 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 09:53:42 +00:00 |
|
|
fBrignoli
|
9066b7e8c4
|
// oops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7901 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 08:31:37 +00:00 |
|
|
fBrignoli
|
3e090ce36d
|
// notice id_shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7898 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 08:13:04 +00:00 |
|
|
rMalie
|
06cc9cff99
|
// Improve ergonomy of configuration for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7879 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-03 18:06:51 +00:00 |
|
|
rMalie
|
f2b5ee338b
|
// Merge -> revision 7875
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-03 16:16:49 +00:00 |
|
|
rMalie
|
6f08bcb12e
|
[+] Add a route system to personalize rewrited URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7876 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-03 16:02:49 +00:00 |
|
|
rMalie
|
3e298ba94f
|
// Fix categories (duplicate cause of multishop)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7861 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-03 08:07:20 +00:00 |
|
|
rMalie
|
fa42cc38ae
|
// Routes for dispatcher (part 5)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7860 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-03 07:53:59 +00:00 |
|
|
rMalie
|
e2b883f617
|
// Remove PS_HTACCESS_SPECIFIC configuration (we don't need it anymore since .htaccess now keep automatically all what he need)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7856 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 15:06:31 +00:00 |
|
|
rMalie
|
6fc10e23f8
|
// Some fix on canonical URL + remove PS_HOMEPAGE_PHP_SELF configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7853 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 14:24:28 +00:00 |
|
|
rMalie
|
26efd329a3
|
// Move theme choice from AdminTheme page to Shop page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7848 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 13:47:34 +00:00 |
|