From bdfa7237a696e5b6f910d9ff09eceaaaec16ba56 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Wed, 18 Apr 2018 11:44:10 +0200 Subject: [PATCH 1/5] Remove badges from readme --- README.md | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/README.md b/README.md index 7fe1c416907..3319c2395e9 100644 --- a/README.md +++ b/README.md @@ -2,22 +2,6 @@ -
- - - - - - - - - - - - - - - Sylius is the first eCommerce framework for tailored solution based on [**Symfony**](http://symfony.com) and [**Doctrine**](http://doctrine-project.org). From 535e7a83cd4ae13eeb543f9c919acccea8592802 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Wed, 18 Apr 2018 12:07:08 +0200 Subject: [PATCH 2/5] Make readme shorter & more beautiful --- README.md | 75 ++++++++++--------------------------------------------- 1 file changed, 13 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index 3319c2395e9..1c833181c97 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ -Sylius is the first eCommerce framework for tailored solution based on [**Symfony**](http://symfony.com) and [**Doctrine**](http://doctrine-project.org). +Sylius is an Open Source eCommerce Framework on top of [**Symfony**](https://symfony.com). The highest quality of code, strong testing culture, built-in Agile (BDD) workflow and exceptional flexibility make it the best solution for application tailored to your business requirements. Powerful REST API allows for easy integrations and creating unique customer experience on any device. @@ -13,81 +13,32 @@ We're using full-stack Behavior-Driven-Development, with [phpspec](http://phpspe Enjoy being an eCommerce Developer again! -Documentation -------------- - -Documentation is available at [docs.sylius.com](http://docs.sylius.com). - -Requirements ------------- - -Read about the Sylius system requirements in detail [here](http://docs.sylius.com/en/latest/book/installation/requirements.html). - Installation ------------ -You need [composer](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-osx) to install PHP packages and [yarn](https://yarnpkg.com/lang/en/docs/install/) to install JS packages. - -```bash -$ composer create-project sylius/sylius-standard my-sylius-shop && cd my-sylius-shop -$ php bin/console sylius:install -$ yarn install && yarn run gulp -$ php bin/console server:start -``` - -> Note: make sure to use PHP ^7.1. Using an older PHP version will result in installing an older version of Sylius. - -Then open `http://localhost:8000/` in your web browser to enjoy your Sylius shop in a development environment. - -Alternatively, you can use [Vagrant](http://docs.sylius.com/en/latest/book/installation/vagrant_installation.html) for your initial setup. - -**Production** - -When you're ready to go live, setup your production database: - -```bash -php bin/console sylius:install --env prod -``` +[Install Sylius](http://docs.sylius.com/en/1.0/book/installation/installation.html) with Composer (see [requirements details](http://docs.sylius.com/en/1.0/book/installation/requirements.html)). -And choose _N_ when it comes to the _Loading sample data_ step. +Alternatively, you can [use our Vagrant setup](http://docs.sylius.com/en/1.0/book/installation/vagrant_installation.html). -Then please refer to [Symfony's documentation](https://symfony.com/doc/current/setup/web_server_configuration.html) to properly setup your Apache/Nginx web server. - - -Troubleshooting ---------------- +Documentation +------------- + +Documentation is available at [docs.sylius.com](http://docs.sylius.com). -If something goes wrong, errors & exceptions are logged at the application level: +Community +--------- -```bash -$ tail -f var/logs/prod.log -$ tail -f var/logs/dev.log -``` +[Get Sylius support](http://docs.sylius.com/en/1.0/support/index.html) on [Slack](https://sylius.com/slack), [Forum](https://forum.sylius.com/) or [Stack Overflow](https://stackoverflow.com/questions/tagged/sylius). -If you are using the supplied Vagrant development environment, please see the related [Troubleshooting guide](http://github.com/Sylius/Vagrant/README.md#Troubleshooting) for more information. +Stay updated by following our [Twitter](https://twitter.com/Sylius) and [Facebook](https://www.facebook.com/SyliusEcommerce/). Contributing ------------ Would like to help us and build the most developer-friendly eCommerce platform? Start from reading our [Contributing Guide](http://docs.sylius.com/en/latest/contributing/index.html)! -Stay Updated ------------- - -If you want to keep up with the updates, [follow the official Sylius account on Twitter](http://twitter.com/Sylius) and [like us on Facebook](https://www.facebook.com/SyliusEcommerce/). - -Bug Tracking ------------- - -If you want to report a bug or suggest an idea, please use [GitHub issues](https://github.com/Sylius/Sylius/issues). - -Community Support ------------------ - -Have a question? Join our [Slack](http://sylius.com/slack) or post it on [StackOverflow](http://stackoverflow.com) tagged with ["sylius"](https://stackoverflow.com/questions/tagged/sylius). - -MIT License ------------ +License +------- Sylius is completely free and released under the [MIT License](https://github.com/Sylius/Sylius/blob/master/LICENSE). From c0f1178fcfcc390fe0fae03226baaaaf52cf07b0 Mon Sep 17 00:00:00 2001 From: Jan Czernin Date: Thu, 19 Apr 2018 21:20:39 +0200 Subject: [PATCH 3/5] Order update error fix --- .../Bundle/UiBundle/Resources/translations/flashes.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/UiBundle/Resources/translations/flashes.en.yml b/src/Sylius/Bundle/UiBundle/Resources/translations/flashes.en.yml index 96a9f9f643b..58958f5c211 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/translations/flashes.en.yml +++ b/src/Sylius/Bundle/UiBundle/Resources/translations/flashes.en.yml @@ -17,7 +17,7 @@ sylius: apply_state_machine_transition_error: 'There was an unexpected problem with updating an order. Please, try to update order again.' promotion_integrity: 'You are no longer eligible for this promotion %promotionName%.' total_integrity: 'Your order total has been changed, check your order information and confirm it again.' - update_error: 'There was an unexpected problem with updating a product. Please, try to update product again.' + update_error: 'There was an unexpected problem with updating an order. Please, try to update order again.' payment: apply_state_machine_transition_error: 'There was an unexpected problem with updating a payment. Please, try to update payment again.' product: From 11fac8c209622832a2f04fddcb206fcd8a7d8c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jib=C3=A9=20Barth?= Date: Sun, 22 Apr 2018 13:33:55 +0200 Subject: [PATCH 4/5] [Components] Fix links for documentation in readme --- src/Sylius/Component/Addressing/README.md | 2 +- src/Sylius/Component/Attribute/README.md | 2 +- src/Sylius/Component/Channel/README.md | 2 +- src/Sylius/Component/Currency/README.md | 2 +- src/Sylius/Component/Grid/README.md | 2 +- src/Sylius/Component/Inventory/README.md | 2 +- src/Sylius/Component/Locale/README.md | 2 +- src/Sylius/Component/Mailer/README.md | 2 +- src/Sylius/Component/Order/README.md | 2 +- src/Sylius/Component/Payment/README.md | 2 +- src/Sylius/Component/Product/README.md | 2 +- src/Sylius/Component/Promotion/README.md | 2 +- src/Sylius/Component/Registry/README.md | 2 +- src/Sylius/Component/Resource/README.md | 2 +- src/Sylius/Component/Shipping/README.md | 2 +- src/Sylius/Component/Taxation/README.md | 2 +- src/Sylius/Component/Taxonomy/README.md | 2 +- src/Sylius/Component/User/README.md | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Sylius/Component/Addressing/README.md b/src/Sylius/Component/Addressing/README.md index 1237f0e7cc8..2a0983f7193 100644 --- a/src/Sylius/Component/Addressing/README.md +++ b/src/Sylius/Component/Addressing/README.md @@ -20,7 +20,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Addressing/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Addressing/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Attribute/README.md b/src/Sylius/Component/Attribute/README.md index cd7f6bb458d..0067baade52 100644 --- a/src/Sylius/Component/Attribute/README.md +++ b/src/Sylius/Component/Attribute/README.md @@ -13,7 +13,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Attribute/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Attribute/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Channel/README.md b/src/Sylius/Component/Channel/README.md index 6e22b4c7730..40f5e4f64bd 100644 --- a/src/Sylius/Component/Channel/README.md +++ b/src/Sylius/Component/Channel/README.md @@ -13,7 +13,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Channel/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Channel/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Currency/README.md b/src/Sylius/Component/Currency/README.md index f246e471a3a..20376bec5fa 100644 --- a/src/Sylius/Component/Currency/README.md +++ b/src/Sylius/Component/Currency/README.md @@ -13,7 +13,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Currency/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Currency/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Grid/README.md b/src/Sylius/Component/Grid/README.md index c2a0b2a28e7..881314f0979 100644 --- a/src/Sylius/Component/Grid/README.md +++ b/src/Sylius/Component/Grid/README.md @@ -13,7 +13,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Grid/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Grid/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Inventory/README.md b/src/Sylius/Component/Inventory/README.md index 26490264901..959d5d65d4f 100644 --- a/src/Sylius/Component/Inventory/README.md +++ b/src/Sylius/Component/Inventory/README.md @@ -13,7 +13,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Inventory/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Inventory/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Locale/README.md b/src/Sylius/Component/Locale/README.md index 97a26cb584e..9d24fe69ad9 100644 --- a/src/Sylius/Component/Locale/README.md +++ b/src/Sylius/Component/Locale/README.md @@ -13,7 +13,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Locale/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Locale/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Mailer/README.md b/src/Sylius/Component/Mailer/README.md index 76183edfb26..a2386451439 100644 --- a/src/Sylius/Component/Mailer/README.md +++ b/src/Sylius/Component/Mailer/README.md @@ -13,7 +13,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Mailer/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Mailer/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Order/README.md b/src/Sylius/Component/Order/README.md index b787dff8311..b10f410aa44 100644 --- a/src/Sylius/Component/Order/README.md +++ b/src/Sylius/Component/Order/README.md @@ -17,7 +17,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Order/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Order/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Payment/README.md b/src/Sylius/Component/Payment/README.md index 92b24972181..ad725dff6b8 100644 --- a/src/Sylius/Component/Payment/README.md +++ b/src/Sylius/Component/Payment/README.md @@ -15,7 +15,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Payment/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Payment/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Product/README.md b/src/Sylius/Component/Product/README.md index afa81ae4261..76f62ee2db1 100644 --- a/src/Sylius/Component/Product/README.md +++ b/src/Sylius/Component/Product/README.md @@ -17,7 +17,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Product/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Product/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Promotion/README.md b/src/Sylius/Component/Promotion/README.md index 4de8753cda3..b4c2d8b55a4 100644 --- a/src/Sylius/Component/Promotion/README.md +++ b/src/Sylius/Component/Promotion/README.md @@ -21,7 +21,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Promotion/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Promotion/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Registry/README.md b/src/Sylius/Component/Registry/README.md index 376c19625f3..a2ea13198c2 100644 --- a/src/Sylius/Component/Registry/README.md +++ b/src/Sylius/Component/Registry/README.md @@ -11,7 +11,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Registry/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Registry/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Resource/README.md b/src/Sylius/Component/Resource/README.md index 28396a34dbb..9720acc6bf6 100644 --- a/src/Sylius/Component/Resource/README.md +++ b/src/Sylius/Component/Resource/README.md @@ -13,7 +13,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Resource/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Resource/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Shipping/README.md b/src/Sylius/Component/Shipping/README.md index cd3f1070393..301a55d587a 100644 --- a/src/Sylius/Component/Shipping/README.md +++ b/src/Sylius/Component/Shipping/README.md @@ -22,7 +22,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Shipping/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Shipping/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Taxation/README.md b/src/Sylius/Component/Taxation/README.md index c5655db67ec..d7c21d25abe 100644 --- a/src/Sylius/Component/Taxation/README.md +++ b/src/Sylius/Component/Taxation/README.md @@ -15,7 +15,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Taxation/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Taxation/index.html). Contributing ------------ diff --git a/src/Sylius/Component/Taxonomy/README.md b/src/Sylius/Component/Taxonomy/README.md index e081ce99cfa..6d100fab464 100644 --- a/src/Sylius/Component/Taxonomy/README.md +++ b/src/Sylius/Component/Taxonomy/README.md @@ -34,7 +34,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/Taxonomy/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/Taxonomy/index.html). Contributing ------------ diff --git a/src/Sylius/Component/User/README.md b/src/Sylius/Component/User/README.md index 44fac6bd140..22e82c1fe33 100644 --- a/src/Sylius/Component/User/README.md +++ b/src/Sylius/Component/User/README.md @@ -13,7 +13,7 @@ Sylius is an Open Source eCommerce solution built from decoupled components with Documentation ------------- -Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components/User/index.html). +Documentation is available on [**docs.sylius.com**](http://docs.sylius.com/en/latest/components_and_bundles/components/User/index.html). Contributing ------------ From 471fc3c9bac474ff82cd0befa35a29c2a5664fa7 Mon Sep 17 00:00:00 2001 From: Sylius Bot Date: Mon, 23 Apr 2018 04:04:03 +0000 Subject: [PATCH 5/5] [Translations] Updated translations from Crowdin --- .../Bundle/UiBundle/Resources/translations/messages.nl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.nl.yml b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.nl.yml index c016df5fc26..95811c7f2b9 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.nl.yml +++ b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.nl.yml @@ -18,7 +18,7 @@ sylius: accept: 'Aanvaard' accepted: 'Aanvaard' access_token: 'Toegangstoken' - access_your_store_account_or_create_a_new_one: 'Ga naar je store-account of maak een nieuwe account' + access_your_store_account_or_create_a_new_one: 'Ga naar je store-account of maak een nieuw account' account_credentials: 'Logingegevens' account_panel_outline: 'Geniet van alle functies die beschikbaar zijn in uw persoonlijke ruimte om al uw gegevens te bekijken, bij te houden en te beheren' action: 'Actie'