Permalink
Browse files

Merge branch '1.6.1.x'

* 1.6.1.x: (107 commits)
  // Changelog 1.6.1.6
  // Fix specific price display
  MO: Fix blockwishlist utf8 entities
  [BO] Display all carriers in Dashbord Configuration
  [-] BO : fixed bug when no results with address and map does not exist
  [-] CORE PSCSX-7986
  [-] FO : Fix CSS 404 when using subdirectory
  [+] IN: All key must not be nullable
  Update AdminAttachmentsController.php
  fix virtual for mysql 5.7
  [-] TEST : Fix PHP 7 tests
  [-] CORE : Check for displayPaymentEU to fix advanced checkout restrictions
  [-] PDF : Fix generation of PDF files
  // Changelog 1.6.1.5
  Update shopping-cart-advanced.tpl
  [*] CORE Update shopping-cart-advanced.tpl
  [-] FO : Only display vouchers available 'only' for customers
  // fix ccc for admin CCC has never been available for Admin there is no need to split anything for IE9
  [-] FO : smartyHook now returns empty string when module is not installed.
  Revert "[*] CORE: Add a fallback to curl when file_get_content() return an empty response"
  ...
  • Loading branch information...
2 parents 1e93cdb + 6e6cc75 commit 81aa7fda2ffd8c747b99262ecae76fd22efddb3f @julienbourdeau julienbourdeau committed Jun 27, 2016
Showing with 1,930 additions and 2,050 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 .travis.yml
  3. +2 −2 Adapter/Adapter_AddressFactory.php
  4. +2 −2 Adapter/Adapter_CacheManager.php
  5. +2 −2 Adapter/Adapter_Configuration.php
  6. +2 −2 Adapter/Adapter_Database.php
  7. +2 −2 Adapter/Adapter_EntityMapper.php
  8. +2 −2 Adapter/Adapter_EntityMetaDataRetriever.php
  9. +2 −2 Adapter/Adapter_Exception.php
  10. +2 −2 Adapter/Adapter_HookManager.php
  11. +2 −2 Adapter/Adapter_PackItemsManager.php
  12. +2 −2 Adapter/Adapter_ProductPriceCalculator.php
  13. +2 −2 Adapter/Adapter_ServiceLocator.php
  14. +2 −2 Adapter/Adapter_StockManager.php
  15. +12 −0 CONTRIBUTORS.md
  16. +2 −2 Core/Business/CMS/Core_Business_CMS_CMSRepository.php
  17. +2 −2 Core/Business/CMS/Core_Business_CMS_CMSRoleRepository.php
  18. +2 −2 Core/Business/Core_Business_ConfigurationInterface.php
  19. +2 −2 Core/Business/Core_Business_ContainerBuilder.php
  20. +2 −2 Core/Business/Email/Core_Business_Email_EmailLister.php
  21. +2 −2 Core/Business/Payment/Core_Business_Payment_PaymentOption.php
  22. +3 −2 Core/Business/Stock/Core_Business_Stock_StockManager.php
  23. +2 −2 Core/Foundation/Database/Core_Foundation_Database_DatabaseInterface.php
  24. +2 −2 Core/Foundation/Database/Core_Foundation_Database_EntityInterface.php
  25. +2 −2 Core/Foundation/Database/Core_Foundation_Database_EntityManager.php
  26. +2 −2 Core/Foundation/Database/Core_Foundation_Database_EntityMetaData.php
  27. +2 −2 Core/Foundation/Database/Core_Foundation_Database_EntityRepository.php
  28. +2 −2 Core/Foundation/Database/Core_Foundation_Database_Exception.php
  29. +2 −2 Core/Foundation/Database/EntityManager/Core_Foundation_Database_EntityManager_QueryBuilder.php
  30. +2 −2 Core/Foundation/Exception/Core_Foundation_Exception_Exception.php
  31. +2 −2 Core/Foundation/Filesystem/Core_Foundation_FileSystem_Exception.php
  32. +2 −2 Core/Foundation/Filesystem/Core_Foundation_FileSystem_FileSystem.php
  33. +2 −2 Core/Foundation/IoC/Core_Foundation_IoC_Container.php
  34. +2 −2 Core/Foundation/IoC/Core_Foundation_IoC_Exception.php
  35. +1,308 −1,454 LICENSES
  36. +2 −2 admin-dev/ajax-tab.php
  37. +2 −2 admin-dev/ajax.php
  38. +2 −2 admin-dev/ajax_products_list.php
  39. +2 −2 admin-dev/backup.php
  40. +2 −2 admin-dev/cron_currency_rates.php
  41. +2 −2 admin-dev/displayImage.php
  42. +2 −2 admin-dev/drawer.php
  43. +2 −2 admin-dev/export/index.php
  44. +2 −2 admin-dev/filemanager/config/index.php
  45. +2 −2 admin-dev/filemanager/css/index.php
  46. +2 −2 admin-dev/filemanager/img/ico/index.php
  47. +2 −2 admin-dev/filemanager/img/ico_dark/index.php
  48. +2 −2 admin-dev/filemanager/img/index.php
  49. +2 −2 admin-dev/filemanager/include/index.php
  50. +2 −2 admin-dev/filemanager/index.php
  51. +2 −2 admin-dev/filemanager/jPlayer/add-on/index.php
  52. +2 −2 admin-dev/filemanager/jPlayer/index.php
  53. +2 −2 admin-dev/filemanager/jPlayer/popcorn/index.php
  54. +2 −2 admin-dev/filemanager/jPlayer/skin/blue.monday/index.php
  55. +2 −2 admin-dev/filemanager/jPlayer/skin/index.php
  56. +2 −2 admin-dev/filemanager/js/index.php
  57. +2 −2 admin-dev/filemanager/lang/index.php
  58. +2 −2 admin-dev/filemanager/uploader/index.php
  59. +2 −2 admin-dev/footer.inc.php
  60. +2 −2 admin-dev/functions.php
  61. +2 −2 admin-dev/get-file-admin.php
  62. +2 −2 admin-dev/grider.php
  63. +2 −2 admin-dev/header.inc.php
  64. +2 −2 admin-dev/index.php
  65. +2 −2 admin-dev/init.php
  66. +2 −2 admin-dev/login.php
  67. +2 −2 admin-dev/password.php
  68. +2 −2 admin-dev/pdf.php
  69. +3 −3 admin-dev/searchcron.php
  70. +2 −2 admin-dev/tabs/index.php
  71. +2 −2 admin-dev/themes/default/css/index.php
  72. +2 −2 admin-dev/themes/default/css/schemes/index.php
  73. +2 −2 admin-dev/themes/default/css/schemes_rtl/index.php
  74. +2 −2 admin-dev/themes/default/css/vendor/index.php
  75. +2 −2 admin-dev/themes/default/fonts/index.php
  76. +2 −2 admin-dev/themes/default/img/index.php
  77. +2 −2 admin-dev/themes/default/img/patterns/index.php
  78. +2 −2 admin-dev/themes/default/index.php
  79. +1 −1 admin-dev/themes/default/js/admin-theme.js
  80. +1 −1 admin-dev/themes/default/js/help.js
  81. +2 −2 admin-dev/themes/default/js/index.php
  82. +2 −2 admin-dev/themes/default/js/vendor/bootstrap/index.php
  83. +2 −2 admin-dev/themes/default/js/vendor/index.php
  84. +2 −2 admin-dev/themes/default/sass/controllers/index.php
  85. +2 −2 admin-dev/themes/default/sass/index.php
  86. +2 −2 admin-dev/themes/default/sass/modules/colors/index.php
  87. +2 −2 admin-dev/themes/default/sass/modules/index.php
  88. +2 −2 admin-dev/themes/default/sass/partials/index.php
  89. +2 −2 admin-dev/themes/default/sass/schemes/index.php
  90. +2 −2 admin-dev/themes/default/sass/schemes_rtl/index.php
  91. +2 −2 admin-dev/themes/default/sass/vendor/bi-app/index.php
  92. +2 −2 admin-dev/themes/default/sass/vendor/bootstrap-rtl-sass/index.php
  93. +2 −2 admin-dev/themes/default/sass/vendor/bootstrap-sass/index.php
  94. +2 −2 admin-dev/themes/default/sass/vendor/bootstrap-sass/mixins/index.php
  95. +2 −2 admin-dev/themes/default/sass/vendor/font-awesome/index.php
  96. +2 −2 admin-dev/themes/default/sass/vendor/index.php
  97. +2 −2 admin-dev/themes/default/template/content.tpl
  98. +2 −2 admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
  99. +2 −2 admin-dev/themes/default/template/controllers/access/helpers/form/index.php
  100. +2 −2 admin-dev/themes/default/template/controllers/access/helpers/index.php
  101. +2 −2 admin-dev/themes/default/template/controllers/access/index.php
  102. +2 −2 admin-dev/themes/default/template/controllers/addons_catalog/content.tpl
  103. +2 −2 admin-dev/themes/default/template/controllers/addons_catalog/index.php
  104. +2 −2 admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
  105. +2 −2 admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php
  106. +2 −2 admin-dev/themes/default/template/controllers/addresses/helpers/index.php
  107. +2 −2 admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php
  108. +2 −2 admin-dev/themes/default/template/controllers/addresses/helpers/list/list_header.tpl
  109. +2 −2 admin-dev/themes/default/template/controllers/addresses/index.php
  110. +2 −2 admin-dev/themes/default/template/controllers/attachments/helpers/list/list_action_delete.tpl
  111. +2 −2 admin-dev/themes/default/template/controllers/attachments/index.php
  112. +2 −2 admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
  113. +2 −2 admin-dev/themes/default/template/controllers/attribute_generator/index.php
  114. +2 −2 admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
  115. +2 −2 admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php
  116. +2 −2 admin-dev/themes/default/template/controllers/attributes/helpers/index.php
  117. +2 −2 admin-dev/themes/default/template/controllers/attributes/index.php
  118. +2 −2 admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl
  119. +2 −2 admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php
  120. +2 −2 admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php
  121. +2 −2 admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php
  122. +2 −2 admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl
  123. +2 −2 admin-dev/themes/default/template/controllers/attributes_groups/helpers/view/index.php
  124. +2 −2 admin-dev/themes/default/template/controllers/attributes_groups/index.php
  125. +2 −2 admin-dev/themes/default/template/controllers/backup/download/index.php
  126. +2 −2 admin-dev/themes/default/template/controllers/backup/download/view.tpl
  127. +2 −2 admin-dev/themes/default/template/controllers/backup/helpers/index.php
  128. +2 −2 admin-dev/themes/default/template/controllers/backup/helpers/list/index.php
  129. +2 −2 admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
  130. +2 −2 admin-dev/themes/default/template/controllers/backup/helpers/view/index.php
  131. +2 −2 admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
  132. +2 −2 admin-dev/themes/default/template/controllers/backup/index.php
  133. +2 −2 admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
  134. +2 −2 admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php
  135. +2 −2 admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php
  136. +2 −2 admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php
  137. +2 −2 admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
  138. +2 −2 admin-dev/themes/default/template/controllers/carrier_wizard/index.php
  139. +2 −2 admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
  140. +2 −2 admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
  141. +2 −2 admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl
  142. +2 −2 admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php
  143. +2 −2 admin-dev/themes/default/template/controllers/carriers/helpers/index.php
  144. +2 −2 admin-dev/themes/default/template/controllers/carriers/helpers/list/index.php
  145. +2 −2 admin-dev/themes/default/template/controllers/carriers/helpers/list/list_content.tpl
  146. +2 −2 admin-dev/themes/default/template/controllers/carriers/helpers/view/index.php
  147. +2 −2 admin-dev/themes/default/template/controllers/carriers/helpers/view/view.tpl
  148. +2 −2 admin-dev/themes/default/template/controllers/carriers/index.php
  149. +5 −4 admin-dev/themes/default/template/controllers/cart_rules/form.js
  150. +2 −2 admin-dev/themes/default/template/controllers/cart_rules/helpers/index.php
  151. +2 −2 admin-dev/themes/default/template/controllers/cart_rules/helpers/list/index.php
  152. +2 −2 admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl
  153. +2 −2 admin-dev/themes/default/template/controllers/cart_rules/index.php
  154. +2 −2 admin-dev/themes/default/template/controllers/carts/helpers/index.php
  155. +2 −2 admin-dev/themes/default/template/controllers/carts/helpers/view/index.php
  156. +2 −2 admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
  157. +2 −2 admin-dev/themes/default/template/controllers/carts/index.php
  158. +2 −2 admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
  159. +2 −2 admin-dev/themes/default/template/controllers/categories/helpers/form/index.php
  160. +2 −2 admin-dev/themes/default/template/controllers/categories/helpers/index.php
  161. +2 −2 admin-dev/themes/default/template/controllers/categories/helpers/list/index.php
  162. +2 −2 admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
  163. +2 −2 admin-dev/themes/default/template/controllers/categories/index.php
  164. +2 −2 admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
  165. +2 −2 admin-dev/themes/default/template/controllers/cms/helpers/form/index.php
  166. +2 −2 admin-dev/themes/default/template/controllers/cms/helpers/index.php
  167. +2 −2 admin-dev/themes/default/template/controllers/cms/index.php
  168. +2 −2 admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
  169. +2 −2 admin-dev/themes/default/template/controllers/cms_categories/helpers/form/index.php
  170. +2 −2 admin-dev/themes/default/template/controllers/cms_categories/helpers/index.php
  171. +2 −2 admin-dev/themes/default/template/controllers/cms_categories/index.php
  172. +2 −2 admin-dev/themes/default/template/controllers/cms_content/content.tpl
  173. +2 −2 admin-dev/themes/default/template/controllers/cms_content/index.php
  174. +2 −2 admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
  175. +2 −2 admin-dev/themes/default/template/controllers/countries/helpers/form/index.php
  176. +2 −2 admin-dev/themes/default/template/controllers/countries/helpers/index.php
  177. +2 −2 admin-dev/themes/default/template/controllers/countries/helpers/list/index.php
  178. +2 −2 admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
  179. +2 −2 admin-dev/themes/default/template/controllers/countries/index.php
  180. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/helpers/index.php
  181. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/helpers/list/index.php
  182. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl
  183. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/helpers/options/index.php
  184. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl
  185. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/helpers/view/index.php
  186. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/helpers/view/message.tpl
  187. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/helpers/view/modal.tpl
  188. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/helpers/view/timeline_item.tpl
  189. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
  190. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/index.php
  191. +2 −2 admin-dev/themes/default/template/controllers/customer_threads/message.tpl
  192. +2 −2 admin-dev/themes/default/template/controllers/customers/helpers/index.php
  193. +2 −2 admin-dev/themes/default/template/controllers/customers/helpers/list/index.php
  194. +2 −2 admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
  195. +2 −2 admin-dev/themes/default/template/controllers/customers/helpers/required_fields.tpl
  196. +2 −2 admin-dev/themes/default/template/controllers/customers/helpers/view/index.php
  197. +2 −2 admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
  198. +2 −2 admin-dev/themes/default/template/controllers/customers/index.php
  199. +2 −2 admin-dev/themes/default/template/controllers/dashboard/helpers/index.php
  200. +2 −2 admin-dev/themes/default/template/controllers/dashboard/helpers/view/index.php
  201. +2 −2 admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
  202. +2 −2 admin-dev/themes/default/template/controllers/dashboard/index.php
  203. +2 −2 admin-dev/themes/default/template/controllers/emails/content.tpl
  204. +2 −2 admin-dev/themes/default/template/controllers/emails/index.php
  205. +2 −2 admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
  206. +2 −2 admin-dev/themes/default/template/controllers/employees/helpers/form/index.php
  207. +2 −2 admin-dev/themes/default/template/controllers/employees/helpers/index.php
  208. +2 −2 admin-dev/themes/default/template/controllers/employees/index.php
  209. +2 −2 admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
  210. +2 −2 admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php
  211. +2 −2 admin-dev/themes/default/template/controllers/feature_value/helpers/index.php
  212. +2 −2 admin-dev/themes/default/template/controllers/feature_value/index.php
  213. +2 −2 admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
  214. +2 −2 admin-dev/themes/default/template/controllers/features/helpers/form/index.php
  215. +2 −2 admin-dev/themes/default/template/controllers/features/helpers/index.php
  216. +2 −2 admin-dev/themes/default/template/controllers/features/index.php
  217. +2 −2 admin-dev/themes/default/template/controllers/geolocation/helpers/index.php
  218. +2 −2 admin-dev/themes/default/template/controllers/geolocation/helpers/options/index.php
  219. +2 −2 admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
  220. +2 −2 admin-dev/themes/default/template/controllers/geolocation/index.php
  221. +2 −2 admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
  222. +2 −2 admin-dev/themes/default/template/controllers/groups/helpers/form/index.php
  223. +2 −2 admin-dev/themes/default/template/controllers/groups/helpers/index.php
  224. +2 −2 admin-dev/themes/default/template/controllers/groups/helpers/tree/index.php
  225. +2 −2 admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_categories.tpl
  226. +2 −2 admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl
  227. +2 −2 admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl
  228. +2 −2 admin-dev/themes/default/template/controllers/groups/helpers/view/index.php
  229. +2 −2 admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
  230. +2 −2 admin-dev/themes/default/template/controllers/groups/index.php
  231. +2 −2 admin-dev/themes/default/template/controllers/images/content.tpl
  232. +2 −2 admin-dev/themes/default/template/controllers/images/index.php
  233. +2 −2 admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
  234. +2 −2 admin-dev/themes/default/template/controllers/import/helpers/form/index.php
  235. +2 −2 admin-dev/themes/default/template/controllers/import/helpers/index.php
  236. +2 −2 admin-dev/themes/default/template/controllers/import/helpers/view/index.php
  237. +2 −2 admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
  238. +2 −2 admin-dev/themes/default/template/controllers/import/index.php
  239. +2 −2 admin-dev/themes/default/template/controllers/index.php
  240. +2 −2 admin-dev/themes/default/template/controllers/information/helpers/index.php
  241. +2 −2 admin-dev/themes/default/template/controllers/information/helpers/view/index.php
  242. +2 −2 admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
  243. +2 −2 admin-dev/themes/default/template/controllers/information/index.php
  244. +2 −2 admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
  245. +2 −2 admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php
  246. +2 −2 admin-dev/themes/default/template/controllers/invoices/helpers/index.php
  247. +2 −2 admin-dev/themes/default/template/controllers/invoices/index.php
  248. +2 −2 admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
  249. +2 −2 admin-dev/themes/default/template/controllers/languages/helpers/form/index.php
  250. +2 −2 admin-dev/themes/default/template/controllers/languages/helpers/index.php
  251. +2 −2 admin-dev/themes/default/template/controllers/languages/index.php
  252. +2 −2 admin-dev/themes/default/template/controllers/localization/content.tpl
  253. +2 −2 admin-dev/themes/default/template/controllers/localization/index.php
  254. +2 −2 admin-dev/themes/default/template/controllers/login/content.tpl
  255. +15 −5 admin-dev/themes/default/template/controllers/login/header.tpl
  256. +2 −2 admin-dev/themes/default/template/controllers/login/index.php
  257. +2 −2 admin-dev/themes/default/template/controllers/login/layout.tpl
  258. +2 −2 admin-dev/themes/default/template/controllers/logs/employee_field.tpl
  259. +2 −2 admin-dev/themes/default/template/controllers/logs/helpers/index.php
  260. +2 −2 admin-dev/themes/default/template/controllers/logs/helpers/list/index.php
  261. +2 −2 admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl
  262. +2 −2 admin-dev/themes/default/template/controllers/logs/index.php
  263. +2 −2 admin-dev/themes/default/template/controllers/maintenance/helpers/index.php
  264. +2 −2 admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php
  265. +2 −2 admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
  266. +2 −2 admin-dev/themes/default/template/controllers/maintenance/index.php
  267. +2 −2 admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php
  268. +2 −2 admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php
  269. +2 −2 admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
  270. +2 −2 admin-dev/themes/default/template/controllers/manufacturers/index.php
  271. +2 −2 admin-dev/themes/default/template/controllers/marketing/helpers/index.php
  272. +2 −2 admin-dev/themes/default/template/controllers/marketing/helpers/view/index.php
  273. +2 −2 admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl
  274. +2 −2 admin-dev/themes/default/template/controllers/marketing/index.php
  275. +2 −2 admin-dev/themes/default/template/controllers/meta/helpers/index.php
  276. +2 −2 admin-dev/themes/default/template/controllers/meta/index.php
  277. +2 −2 admin-dev/themes/default/template/controllers/modules/ad_bar.tpl
  278. +2 −2 admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
  279. +2 −2 admin-dev/themes/default/template/controllers/modules/configure.tpl
  280. +2 −2 admin-dev/themes/default/template/controllers/modules/content.tpl
  281. +2 −2 admin-dev/themes/default/template/controllers/modules/favorites.tpl
  282. +2 −2 admin-dev/themes/default/template/controllers/modules/filters.tpl
  283. +2 −2 admin-dev/themes/default/template/controllers/modules/index.php
  284. +2 −2 admin-dev/themes/default/template/controllers/modules/js.tpl
  285. +2 −2 admin-dev/themes/default/template/controllers/modules/list.tpl
  286. +2 −2 admin-dev/themes/default/template/controllers/modules/login_addons.tpl
  287. +2 −2 admin-dev/themes/default/template/controllers/modules/modal_not_trusted.tpl
  288. +2 −2 admin-dev/themes/default/template/controllers/modules/modal_not_trusted_blocked.tpl
  289. +2 −2 admin-dev/themes/default/template/controllers/modules/modal_not_trusted_country.tpl
  290. +2 −2 admin-dev/themes/default/template/controllers/modules/modal_translation.tpl
  291. +2 −2 admin-dev/themes/default/template/controllers/modules/page.tpl
  292. +2 −2 admin-dev/themes/default/template/controllers/modules/page_header_toolbar.tpl
  293. +2 −2 admin-dev/themes/default/template/controllers/modules/quickview.tpl
  294. +2 −2 admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
  295. +2 −2 admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
  296. +2 −2 admin-dev/themes/default/template/controllers/modules/warning_module.tpl
  297. +2 −2 admin-dev/themes/default/template/controllers/modules_positions/form.tpl
  298. +2 −2 admin-dev/themes/default/template/controllers/modules_positions/index.php
  299. +2 −2 admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
  300. +2 −2 admin-dev/themes/default/template/controllers/not_found/content.tpl
Sorry, we could not display the entire diff because too many files (2,290) changed.
View
1 .gitignore
@@ -30,6 +30,7 @@ admin-dev/backups/*
admin-dev/import/*
themes/*/cache/*
+admin-dev/themes/*/cache/*
# Config
View
1 .travis.yml
@@ -16,6 +16,7 @@ before_install:
- sudo apt-get update
before_script:
+ - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then sudo cp tests/php7-pool.conf ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/; fi
- sudo apt-get install apache2 libapache2-mod-fastcgi
- cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
- sudo a2enmod rewrite actions fastcgi alias
View
4 Adapter/Adapter_AddressFactory.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_CacheManager.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_Configuration.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_Database.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_EntityMapper.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_EntityMetaDataRetriever.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_Exception.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_HookManager.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_PackItemsManager.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_ProductPriceCalculator.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_ServiceLocator.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Adapter/Adapter_StockManager.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
12 CONTRIBUTORS.md
@@ -13,6 +13,7 @@ GitHub contributors:
- Alexander Grosul
- Alexander Otchenashev
- Alexandra Even
+- Alexandre Segura
- AlexEven
- Alexey Svistunov
- alexey-svistunov
@@ -79,6 +80,7 @@ GitHub contributors:
- Daniele Giachino
- danoosh
- Danoosh Mir
+- daresh
- David Eschmeyer
- David Gasperoni
- David Sivocha
@@ -135,6 +137,7 @@ GitHub contributors:
- Gabriel Schwardy
- Gaelle ITZKOVITZ
- Gamesh
+- Geoffray
- ggedamed
- Giant Leap Lab
- Gordon Coubrough
@@ -155,6 +158,8 @@ GitHub contributors:
- harelguy
- hiousi
- htrex
+- Ian Fung
+- idnovate
- indesign47
- iNem0o
- ironwo0d
@@ -163,6 +168,7 @@ GitHub contributors:
- ivancasasempere
- J. Danse
- janisVincent
+- Jaume
- Javsmile
- JEAN
- jeanbe
@@ -205,6 +211,7 @@ GitHub contributors:
- ldecoker
- Lesley Paone
- LOIC ROSSET ltd
+- lozal2244
- luc
- Luc Vandesype
- Luca T.
@@ -241,6 +248,7 @@ GitHub contributors:
- Michael Hjulskov
- Michel Courtade
- Mickael Desgranges
+- Mickael Andrieu
- Mikael Blotin
- Mikko Hellsing
- Milow
@@ -254,6 +262,7 @@ GitHub contributors:
- natrim
- neemzy
- nezenmoins
+- Nicolas Martin
- Nicolas Sorosac
- Niklas Ekman
- Niko Wicaksono
@@ -262,6 +271,7 @@ GitHub contributors:
- Nino Uzelac
- nodexpl
- nturato
+- okom3pom
- oleacorner
- Otto Nascarella
- Pan P
@@ -301,6 +311,7 @@ GitHub contributors:
- Quetzacoalt91
- Racochejl
- Rafael Cunha
+- raphael-homann
- Raphael Droz
- Raphael Malie
- raulgundin
@@ -311,6 +322,7 @@ GitHub contributors:
- robert
- Roland Schütz
- romainberger
+- Roy
- runningz
- Remi Gaillard
- s-duval
View
4 Core/Business/CMS/Core_Business_CMS_CMSRepository.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Business/CMS/Core_Business_CMS_CMSRoleRepository.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Business/Core_Business_ConfigurationInterface.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Business/Core_Business_ContainerBuilder.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Business/Email/Core_Business_Email_EmailLister.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Business/Payment/Core_Business_Payment_PaymentOption.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
5 Core/Business/Stock/Core_Business_Stock_StockManager.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
@@ -125,6 +125,7 @@ public function updateQuantity($product, $id_product_attribute, $delta_quantity,
// The product is not a pack
$stockAvailable->quantity = $stockAvailable->quantity + $delta_quantity;
$stockAvailable->id_product = (int)$product->id;
+ $stockAvailable->id_product_attribute = (int)$id_product_attribute;
$stockAvailable->update();
// Decrease case only: the stock of linked packs should be decreased too.
View
4 Core/Foundation/Database/Core_Foundation_Database_DatabaseInterface.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Foundation/Database/Core_Foundation_Database_EntityInterface.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Foundation/Database/Core_Foundation_Database_EntityManager.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Foundation/Database/Core_Foundation_Database_EntityMetaData.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Foundation/Database/Core_Foundation_Database_EntityRepository.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Foundation/Database/Core_Foundation_Database_Exception.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 ...Foundation/Database/EntityManager/Core_Foundation_Database_EntityManager_QueryBuilder.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Foundation/Exception/Core_Foundation_Exception_Exception.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Foundation/Filesystem/Core_Foundation_FileSystem_Exception.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Foundation/Filesystem/Core_Foundation_FileSystem_FileSystem.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Foundation/IoC/Core_Foundation_IoC_Container.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 Core/Foundation/IoC/Core_Foundation_IoC_Exception.php
@@ -1,6 +1,6 @@
<?php
/**
- * 2007-2015 PrestaShop
+ * 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2015 PrestaShop SA
+ * @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
2,762 LICENSES
1,308 additions, 1,454 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
4 admin-dev/ajax-tab.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/ajax.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/ajax_products_list.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/backup.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/cron_currency_rates.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/displayImage.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/drawer.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/export/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/config/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/css/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/img/ico/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/img/ico_dark/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/img/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/include/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/jPlayer/add-on/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/jPlayer/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/jPlayer/popcorn/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/jPlayer/skin/blue.monday/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/jPlayer/skin/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/js/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/lang/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/filemanager/uploader/index.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/footer.inc.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/functions.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/get-file-admin.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2015 PrestaShop SA
+* @copyright 2007-2016 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
4 admin-dev/grider.php
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2015 PrestaShop
+* 2007-2016 PrestaShop
*
* NOTICE OF LICENSE