Commit Graph

132 Commits

Author SHA1 Message Date
rMalie
79fd72e461 // Merge -> revision 8342
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-05 14:56:02 +00:00
rMalie
1e55c19726 // Fix getPush() for notifications
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8336 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-05 12:09:49 +00:00
aFolletete
3eff951265 [+] Project : adding Features detachables in order to improve performance
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-03 17:21:32 +00:00
tDidierjean
c2258ae8e9 //// Merge -> revision 8290
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8295 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-01 09:53:43 +00:00
lBrieu
9a975849ee git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8260 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 14:43:53 +00:00
lBrieu
b66043f886 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8259 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 14:42:27 +00:00
lBrieu
814a847878 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8252 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 13:40:31 +00:00
lBrieu
76f7326832 [+] Add some JS and integrates notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8248 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 12:06:17 +00:00
lBrieu
9a169ae91f [+] Add handling for notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8247 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 12:04:07 +00:00
lBrieu
5dcc1a65bf [+] Add CSS modifications for notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8244 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 12:00:12 +00:00
lBrieu
1134ed9a02 [+] Add icons for notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8243 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 11:59:04 +00:00
lBrieu
e0ea67b2d5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8231 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-29 14:14:13 +00:00
tDidierjean
16516953fb // Merge -> revision 8206
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8210 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-26 15:52:42 +00:00
rMalie
d33325c23f // Fix currencies for multishop + meta
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8209 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-26 15:10:52 +00:00
rMalie
68c7be42c2 // Merge -> revision 8199
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8200 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-26 07:59:29 +00:00
rMalie
b12bf222a9 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8179 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-24 15:57:10 +00:00
rMalie
89fcb38dc7 // Force install of modules in global context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8178 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-24 15:04:50 +00:00
rMalie
60e357bd4b // Fix preview link in BO + tax bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8137 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 10:14:15 +00:00
rMalie
4e0b3ed2f7 // Improve multishop ergonomy (you edit this field for) on languages fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8136 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 09:33:16 +00:00
rMalie
fd645ddb80 // Merge -> revision 8123
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 14:27:41 +00:00
rMalie
382584ad35 // Fix all category_lang sql restrictions with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8124 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 14:21:45 +00:00
rMalie
7cadad5d3e // Fix all product_lang sql restrictions with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8121 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 14:01:23 +00:00
rMalie
c7d4290206 // Fix admin referrers for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8120 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 13:07:23 +00:00
rMalie
a1843c1900 // Merge -> revision 8114
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8115 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 09:46:12 +00:00
fBrignoli
f371f3e3bc [*] Project : US + CA TaxSystem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8105 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-18 10:10:50 +00:00
rMalie
5638172b38 // Add copy data of group shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8101 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-18 07:57:04 +00:00
rMalie
0aada6cc1e // Merge -> revision 8097
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 16:10:20 +00:00
rMalie
89bc665d48 // Fix admin modules positions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8098 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 15:30:44 +00:00
rMalie
acfa8d8600 // Fix share_datas in backoffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8096 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 14:53:18 +00:00
tDidierjean
39d005f222 // Context part 32
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8095 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 13:40:05 +00:00
rMalie
51f2bf2617 // Fix carrier lang copy when a new shop is created + can duplicate data when editing a shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8094 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 13:37:15 +00:00
rMalie
7481712923 // Fix display of breadcrumb (dont show categories disabled) + it's now impossible to browse categories outside of root category for shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8089 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 12:32:04 +00:00
tDidierjean
cb3d802346 // Context part 31
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8087 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 10:07:12 +00:00
rMalie
751ae5d740 // Fix shop selection in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8083 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 08:59:04 +00:00
rMalie
2b05b5308c // Merge -> revision 8076
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8081 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 08:15:38 +00:00
rMalie
e86d668a49 // Fix download products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8080 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 16:22:13 +00:00
fBrignoli
28025e0ff6 // Comment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8079 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 16:05:16 +00:00
rMalie
f6162845ab // Add a message when a shop is created to indicate that the user should create an URL for this shop + fix some bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 15:53:33 +00:00
rMalie
a1303a0cb0 // Add Core prefix for Stock and ProductCompare classes + fix main URL on shop URL + add some translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8072 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 14:13:04 +00:00
rMalie
21ca4d15d7 // Merge -> revision 8059
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8062 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 09:10:40 +00:00
gBrunier
9e0333a664 [+] BO : CB-30 - Customer receive an email when a voucher is created in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8055 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-12 14:24:48 +00:00
lBrieu
a9b94cee4b [+] Add the TinyMCE editor on categories description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8023 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 12:34:52 +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
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
lBrieu
eec48ed7b5 [+] Add the TinyMCE editor on categories description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8013 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 09:10:28 +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
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
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