This website requires JavaScript.
6640abc7b6
Merge pull request #554 from lovenunu/security-fix
Julien
2014-08-05 08:35:57 +02:00
967dbc15d4
Fix point usage in regex modifié: core/lib/Thelia/Controller/Admin/FileController.php
Benjamin Perche
2014-08-04 11:27:09 +02:00
b8a9518deb
Add missing points in extensions modifié: core/lib/Thelia/Controller/Admin/FileController.php
Benjamin Perche
2014-08-04 11:22:20 +02:00
29c0aa0368
Remove MimeTypeTools tests supprimé: core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
Benjamin Perche
2014-08-04 10:47:38 +02:00
008f94fe66
Add translation modifié: core/lib/Thelia/Config/I18n/en_US.php modifié: core/lib/Thelia/Config/I18n/fr_FR.php
Benjamin Perche
2014-08-04 10:46:33 +02:00
b01a6d9871
Change extension checking method modifié: core/lib/Thelia/Config/Resources/config.xml modifié: core/lib/Thelia/Controller/Admin/FileController.php supprimé: core/lib/Thelia/Tools/MimeTypeTools.php supprimé: local/config/mime.types
Benjamin Perche
2014-08-04 10:42:04 +02:00
ddcaf9fbab
Fix tests modifié: core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
Benjamin Perche
2014-07-28 15:19:37 +02:00
b26c61be96
Refactor MimeTypeTools as a service modifié: core/lib/Thelia/Config/Resources/config.xml modifié: core/lib/Thelia/Controller/Admin/FileController.php modifié: core/lib/Thelia/Tools/MimeTypeTools.php
Benjamin Perche
2014-07-28 15:11:02 +02:00
d541b56429
Fix tests modifié: core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
Benjamin Perche
2014-07-28 11:30:43 +02:00
5d9f120c81
Fix tests and add translation modifié: core/lib/Thelia/Config/I18n/en_US.php modifié: core/lib/Thelia/Config/I18n/fr_FR.php modifié: core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php modifié: core/lib/Thelia/Tools/MimeTypeTools.php modifié: local/config/mime.types
Benjamin Perche
2014-07-28 11:29:42 +02:00
172d7c06ca
Fix URLTest namespace modifié: core/lib/Thelia/Tests/Tools/URLTest.php
Benjamin Perche
2014-07-28 11:20:13 +02:00
d1a9115626
Fix cs modifié: core/lib/Thelia/Controller/Admin/FileController.php modifié: core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php modifié: core/lib/Thelia/Tools/MimeTypeTools.php
Benjamin Perche
2014-07-28 11:19:57 +02:00
4b2ee0d357
Fix tests modifié: core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
Benjamin Perche
2014-07-28 11:03:49 +02:00
d186ec4320
Fix security breaches modifié: core/lib/Thelia/Controller/Admin/FileController.php nouveau fichier: core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php nouveau fichier: core/lib/Thelia/Tools/MimeTypeTools.php nouveau fichier: local/config/mime.types
Benjamin Perche
2014-07-28 10:59:57 +02:00
8b685e1818
Fixed update sql for coupon and export
Julien Chanseaume
2014-08-05 06:32:15 +02:00
94a2952b36
fixed typo
Julien Chanseaume
2014-08-04 22:38:06 +02:00
2e830a25dd
added extra version
Julien Chanseaume
2014-08-04 22:22:00 +02:00
b2cf836353
prepared release 2.0.3-beta
Julien Chanseaume
2014-08-04 22:17:00 +02:00
d30dc2c30b
Merge pull request #561 from bibich/improvements
Julien
2014-08-04 21:33:25 +02:00
88ec8bc661
fixed rebase conflictssssss
Julien Chanseaume
2014-08-04 21:21:57 +02:00
a3021a0768
Added fallback method to product page when pse use differrents attributes.
Julien Chanséaume
2014-08-04 18:05:50 +02:00
18b3a12771
removed tax when there is no tax
Julien Chanséaume
2014-08-04 16:31:18 +02:00
a50f79a9f4
removed debug values
Julien Chanséaume
2014-08-04 16:30:06 +02:00
2b2a5690a7
php-cs-fixer
Julien Chanséaume
2014-08-01 09:59:21 +02:00
f7f32c35f8
Updated Changelog
Julien Chanséaume
2014-08-01 09:58:47 +02:00
c0bf7110d2
changed default customer password, added missing
Julien Chanséaume
2014-08-01 09:58:00 +02:00
7f4b1d24c8
Removed hhvm for Travis
Julien Chanséaume
2014-08-01 09:54:18 +02:00
034f92ae1a
changed smarty variables
Julien Chanséaume
2014-07-31 17:18:07 +02:00
0f35dc123e
added translations
Julien Chanséaume
2014-07-31 17:17:43 +02:00
d8873cdf2e
added informations on prices on cart
Julien Chanséaume
2014-07-31 16:54:44 +02:00
2f5c3ee5ea
set default folder for contents
Julien Chanséaume
2014-07-31 14:46:53 +02:00
0610b8037a
Better UI for brands
Julien Chanséaume
2014-07-31 14:22:51 +02:00
09c124c6ae
optimized templates, UI
Julien Chanséaume
2014-07-31 14:22:15 +02:00
27e0596ca7
added new block to initialize variables
Julien Chanséaume
2014-07-31 14:16:54 +02:00
b8dd60d0ec
improved produc detail page, fixed quick view issue
Julien Chanséaume
2014-07-25 11:22:41 +02:00
5ab74a423b
modified product form to split attribute.
Julien Chanséaume
2014-07-24 17:14:26 +02:00
0aa43bb773
Added more content to demo : feature, folders, content
Julien Chanséaume
2014-07-23 17:16:16 +02:00
c2cb4f79a4
Added fallback for meta description for page category, product, folder, content, brand
Julien Chanséaume
2014-07-22 11:48:16 +02:00
3eab43992c
Added new brands to demo import
Julien Chanseaume
2014-07-22 00:36:21 +02:00
867944f06c
fixed issue for product page when there is only 1 PSE
Julien Chanseaume
2014-07-31 06:07:44 +02:00
cab99af210
Added output var to product loop to get the number of PSE for a product
Julien Chanseaume
2014-07-31 06:00:24 +02:00
8c09605e32
temp changes
Julien Chanséaume
2014-07-30 17:03:44 +02:00
0076a63cf2
fixed issue to remove the summary, description or conclusion on an image or a document
Julien Chanseaume
2014-07-30 12:28:25 +02:00
2471147357
added update sql for terms and conditions
Julien Chanséaume
2014-07-29 14:13:32 +02:00
160ccaa4ff
Moved Terms aggrement from account to order, display terms and conditions
Julien Chanséaume
2014-07-29 14:08:47 +02:00
9410881da9
Added sql for config key default_available_stock
Julien Chanséaume
2014-07-29 11:49:33 +02:00
c243da002a
Fixed link on image on search page
Julien Chanséaume
2014-07-29 11:19:17 +02:00
4f8b17bfef
Improved pdf template
Julien Chanséaume
2014-07-29 10:47:13 +02:00
953a6300f9
changes on front office template UI
Julien Chanséaume
2014-07-28 17:08:21 +02:00
ca3cdb278c
redirect to order when creating or updating address from the order
Julien Chanséaume
2014-07-28 09:39:03 +02:00
d105879fa1
display a message when a combination does not exist
Julien Chanséaume
2014-07-28 09:37:53 +02:00
bd5dd4a172
small fixes on frontoffice
Julien Chanséaume
2014-07-25 17:07:58 +02:00
e76ad60342
Added the combination attibutes on cart popup
Julien Chanséaume
2014-07-25 11:51:46 +02:00
691553060b
improved produc detail page, fixed quick view issue
Julien Chanséaume
2014-07-25 11:22:41 +02:00
4e1e082a7c
modified product form to split attribute.
Julien Chanséaume
2014-07-24 17:14:26 +02:00
b4d0d085fe
optimisation of the frontoffice. Product list is ten times faster. But only the default product sale element can be added to cart.
Julien Chanséaume
2014-07-23 17:20:45 +02:00
00baae6da0
Fixed brand substitution issue.
Julien Chanséaume
2014-07-23 17:17:21 +02:00
f679e8e9cb
Added more content to demo : feature, folders, content
Julien Chanséaume
2014-07-23 17:16:16 +02:00
1e8e26cb1d
Added fallback for meta description for page category, product, folder, content, brand
Julien Chanséaume
2014-07-22 11:48:16 +02:00
9ec204899c
Fixed typo
Julien Chanséaume
2014-07-22 11:20:27 +02:00
9d8230b57c
Added new brands to demo import
Julien Chanseaume
2014-07-22 00:36:21 +02:00
628170086a
Fixed typo
Julien Chanséaume
2014-07-21 15:59:38 +02:00
eaad1afdff
Added possibility to change the main product reference
Julien Chanséaume
2014-07-21 15:01:49 +02:00
f37625e5cf
Added missing translation
Julien Chanséaume
2014-07-21 14:56:13 +02:00
2a0db68211
Fixed typo
Julien Chanséaume
2014-07-21 14:20:22 +02:00
fa134bb9a3
Fixed translations for coupon
Julien Chanséaume
2014-07-21 12:26:24 +02:00
c1c47ced52
renamed template in gabarit for french translation in back office
Julien Chanséaume
2014-07-21 11:21:43 +02:00
00df3636c3
Merge pull request #509 from lovenunu/export
Julien
2014-08-04 19:15:06 +02:00
7ba2295799
Fix url parameter accessing modifié: core/lib/Thelia/Controller/Admin/ExportController.php modifié: core/lib/Thelia/Controller/Admin/ImportController.php
Benjamin Perche
2014-08-04 16:40:35 +02:00
573a21e643
Clear Container usage in position action and fix slashes adding in CSV formatter modifié: core/lib/Thelia/Action/Export.php modifié: core/lib/Thelia/Action/Import.php modifié: core/lib/Thelia/Config/Resources/action.xml modifié: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
Benjamin Perche
2014-08-04 16:37:29 +02:00
60b599f8c1
Add order date modifié: core/lib/Thelia/ImportExport/Export/Type/OrderExport.php modifié: core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
Benjamin Perche
2014-08-04 14:56:07 +02:00
83db209adf
Add document tests and use left join instead of inner join for documents modifié: core/lib/Thelia/ImportExport/Export/Type/ContentExport.php modifié: core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
Benjamin Perche
2014-08-04 11:40:16 +02:00
018ddb642b
remove buggy left join on document join modifié: core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
Benjamin Perche
2014-08-04 10:13:41 +02:00
5f4e7f74fa
Fix sql query for ContentExport document modifié: core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
Benjamin Perche
2014-08-04 09:22:58 +02:00
78fdce8aee
Refactor addI18nCondition method, place it in I18n tool modifié: core/lib/Thelia/ImportExport/Export/ExportHandler.php modifié: core/lib/Thelia/ImportExport/Export/Type/ContentExport.php modifié: core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php modifié: core/lib/Thelia/ImportExport/Export/Type/OrderExport.php modifié: core/lib/Thelia/ImportExport/Export/Type/ProductTaxedPricesExport.php modifié: core/lib/Thelia/Tools/I18n.php
Benjamin Perche
2014-08-04 08:52:03 +02:00
df27aff534
Fix usage modifié: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
Benjamin Perche
2014-08-01 16:30:06 +02:00
81454c047d
Fix bug if there's no row modifié: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
Benjamin Perche
2014-08-01 16:28:40 +02:00
373840240b
Add imports and exports on 2.0.3 modifié: CHANGELOG.md modifié: setup/update/2.0.3.sql
Benjamin Perche
2014-08-01 14:50:16 +02:00
c1dd11575a
Add imports and exports in module skeleton modifié: core/lib/Thelia/Command/Skeleton/Module/config.xml
Benjamin Perche
2014-08-01 14:20:09 +02:00
5812c92752
Fix test modifié: core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
Benjamin Perche
2014-08-01 13:29:24 +02:00
39267d8a83
Fix file loader modifié: core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
Benjamin Perche
2014-08-01 12:55:03 +02:00
c6b72abd8f
Fix cs modifié: core/lib/Thelia/Action/Export.php modifié: core/lib/Thelia/Action/Import.php modifié: core/lib/Thelia/Model/Export.php modifié: core/lib/Thelia/Model/ExportCategory.php modifié: core/lib/Thelia/Model/Import.php modifié: core/lib/Thelia/Model/ImportCategory.php
Benjamin Perche
2014-08-01 12:46:48 +02:00
396bafd7a9
Refactor position management with trait nouveau fichier: core/lib/Thelia/Action/Export.php nouveau fichier: core/lib/Thelia/Action/Import.php modifié: core/lib/Thelia/Config/Resources/action.xml modifié: core/lib/Thelia/Config/Resources/routing/admin.xml modifié: core/lib/Thelia/Controller/Admin/ExportController.php modifié: core/lib/Thelia/Controller/Admin/ImportController.php modifié: core/lib/Thelia/Core/Event/TheliaEvents.php modifié: core/lib/Thelia/ImportExport/Export/Type/ProductTaxedPricesExport.php modifié: core/lib/Thelia/Model/Export.php modifié: core/lib/Thelia/Model/ExportCategory.php modifié: core/lib/Thelia/Model/Import.php modifié: core/lib/Thelia/Model/ImportCategory.php modifié: templates/backOffice/default/export.html
Benjamin Perche
2014-08-01 12:25:51 +02:00
0e7a1117b0
Add taxed prices export modifié: core/lib/Thelia/Config/Resources/export.xml modifié: core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/ProductTaxedPricesExport.php nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ProductTaxedPricesExportTest.php
Benjamin Perche
2014-08-01 10:24:58 +02:00
9ff74bece8
Fix cs modifié: core/lib/Thelia/ImportExport/Export/Type/OrderExport.php modifié: core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
Benjamin Perche
2014-07-31 16:55:46 +02:00
c85fe24d96
Add tests on OrderExport modifié: core/lib/Thelia/ImportExport/Export/Type/OrderExport.php nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
Benjamin Perche
2014-07-31 13:52:07 +02:00
e8c8857cce
Finish OrderExport modifié: core/lib/Thelia/ImportExport/Export/Type/OrderExport.php modifié: core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
Benjamin Perche
2014-07-30 16:57:49 +02:00
806e2631aa
Fix exports and imports parsing modifié: core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
Benjamin Perche
2014-07-29 14:01:48 +02:00
f66dd43c55
Begin OrderExport nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
Benjamin Perche
2014-07-29 13:43:17 +02:00
1aded1b6d6
Fix tests modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php modifié: core/lib/Thelia/ImportExport/Export/Type/ContentExport.php modifié: core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
Benjamin Perche
2014-07-29 10:25:15 +02:00
bf9ffedefd
Readd real_escape method for addI18nCondition modifié: core/lib/Thelia/ImportExport/Export/ExportHandler.php
Benjamin Perche
2014-07-29 09:36:03 +02:00
0d37e3470b
Fix escape usage modifié: core/lib/Thelia/ImportExport/Export/ExportHandler.php modifié: core/lib/Thelia/ImportExport/Export/Type/ContentExport.php modifié: core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php modifié: core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php modifié: core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
Benjamin Perche
2014-07-29 09:29:22 +02:00
ae4fe387a7
Fix archive builders extensions modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
Benjamin Perche
2014-07-28 16:42:44 +02:00
40605c1893
Add content export modifié: core/lib/Thelia/Config/Resources/export.xml modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/ContentExport.php nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
Benjamin Perche
2014-07-28 16:26:58 +02:00
c208d8bb19
Fix export modifié: core/lib/Thelia/ImportExport/Export/ExportHandler.php modifié: core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
Benjamin Perche
2014-07-28 15:02:53 +02:00
c461a5e92b
Add image and document export helpers modifié: core/lib/Thelia/Controller/Admin/ExportController.php modifié: core/lib/Thelia/ImportExport/Export/ExportHandler.php
Benjamin Perche
2014-07-28 12:52:23 +02:00
b2588a8fca
Fix cs modifié: core/lib/Thelia/ImportExport/AbstractHandler.php modifié: core/lib/Thelia/ImportExport/Export/DocumentsExportInterface.php modifié: core/lib/Thelia/ImportExport/Export/ExportHandler.php modifié: core/lib/Thelia/ImportExport/Export/ImagesExportInterface.php modifié: core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php modifié: core/lib/Thelia/ImportExport/Export/Type/MailingExport.php modifié: core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php modifié: core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php modifié: core/lib/Thelia/ImportExport/Import/ImportHandler.php modifié: core/lib/Thelia/ImportExport/Import/Type/ProductPricesImport.php modifié: core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php modifié: core/lib/Thelia/Tests/ContainerAwareTestCase.php modifié: core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php modifié: core/lib/Thelia/Tests/ImportExport/Export/ExportHandlerTest.php modifié: core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php modifié: core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php modifié: core/lib/Thelia/Tests/ImportExport/Export/ProductSEOExportTest.php modifié: core/lib/Thelia/Tests/ImportExport/Import/ProductPricesImportTest.php modifié: core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
Benjamin Perche
2014-07-25 10:22:28 +02:00
f891d8b788
Add ContainerAwareTestCase and ExportHandlerTest modifié: core/lib/Thelia/ImportExport/Export/ExportHandler.php modifié: core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php nouveau fichier: core/lib/Thelia/Tests/ContainerAwareTestCase.php modifié: core/lib/Thelia/Tests/Controller/ControllerTestBase.php nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ExportHandlerTest.php
Benjamin Perche
2014-07-25 10:19:52 +02:00
f61006912d
Fix bug modifié: core/lib/Thelia/ImportExport/Export/ExportHandler.php
Benjamin Perche
2014-07-25 09:02:31 +02:00
7adc31514e
Fix tests and bugs modifié: core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php modifié: core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php modifié: core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php modifié: core/lib/Thelia/Tests/Controller/ImportControllerTest.php modifié: core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
Benjamin Perche
2014-07-25 08:50:16 +02:00