mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 17:10:53 +00:00
[UPMERGE] 1.12 -> 1.13 (#15973)
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/1.13 -m "Resolve conflicts between 1.12 and 1.13" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/Sylius` repository. Once the conflicts are resolved, please run `git merge --continue` and change the commit title to ``` Resolve conflicts between 1.12 and 1.13 ```
This commit is contained in:
Jacob Tobiasz
GitHub
commit
84d83bdc8e
9 changed files with 24 additions and 21 deletions
|
|
@ -10,15 +10,6 @@ for your custom e-commerce application.
|
|||
To create your Sylius-based application, first make sure you use PHP 8.1 or higher
|
||||
and have `Composer`_ installed.
|
||||
|
||||
.. note::
|
||||
|
||||
In order to inform you about newest Sylius releases and be aware of shops based on Sylius,
|
||||
the Core Team uses an internal statistical service called GUS.
|
||||
The only data that is collected and stored in its database are hostname, user agent, locale,
|
||||
environment (test, dev or prod), current Sylius version and the date of last contact.
|
||||
If you do not want your shop to send requests to GUS, please visit :doc:`this guide </cookbook/configuration/disabling-admin-notifications>`
|
||||
for further instructions.
|
||||
|
||||
Initiating A New Sylius Project
|
||||
-------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ Roadmap
|
|||
-------
|
||||
|
||||
Are you wondering about Sylius plans for the next releases? If so then you should follow our `Roadmap <https://sylius.com/roadmap>`_.
|
||||
Through our :doc:`Slack and Forum </book/support/index>` you can contribute by conversation and votes on the most desired features and improvements.
|
||||
Through our :doc:`Slack </book/support/index>` you can contribute by conversation and votes on the most desired features and improvements.
|
||||
|
||||
Final Thoughts
|
||||
--------------
|
||||
|
|
|
|||
|
|
@ -4,6 +4,13 @@ How to disable admin version notifications?
|
|||
By default Sylius sends checks from the admin whether you are running the latest version. In case you are not
|
||||
running the latest version, a notification will be shown in the admin panel (top right).
|
||||
|
||||
.. note::
|
||||
|
||||
In order to inform you about the newest Sylius releases and for us to be aware of shops based on Sylius,
|
||||
we are using an internal statistical service called **GUS**.
|
||||
The only data that is collected and stored in the database of GUS are hostname, user agent, locale,
|
||||
app environment (test, dev or prod), current Sylius version and the date of last contact.
|
||||
|
||||
This guide will instruct you how to disable this check & notification.
|
||||
|
||||
How to disable notifications?
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ There are a few tips at the end of this tutorial:
|
|||
|
||||
- if you want to share your work with the Community, check out the :doc:`Sylius Plugins</book/plugins/index>` chapter
|
||||
|
||||
And the most important - if you want to become a part of our collectivity, join our `Slack <https://sylius.com/slack>`_,
|
||||
`Forum <https://forum.sylius.com/>`_ and follow `our repository <https://github.com/Sylius/Sylius>`_ to be always up-to-date
|
||||
with the newest Sylius releases. If you have any ideas about how to make Sylius better and want to support us on catalyzing
|
||||
trade with technology - open issues, pull requests and join discussions on Github. Sylius is only strong with the Community :)
|
||||
And the most important - if you want to become a part of our collectivity, join our `Slack <https://sylius.com/slack>`_
|
||||
and follow `our repository <https://github.com/Sylius/Sylius>`_ to be always up-to-date with the newest Sylius releases.
|
||||
If you have any ideas about how to make Sylius better and want to support us on catalyzing trade with
|
||||
technology - open issues, pull requests and join discussions on Github. Sylius is only strong with the Community :)
|
||||
|
||||
Good luck!
|
||||
|
|
|
|||
|
|
@ -48,6 +48,10 @@ a {
|
|||
padding-left: .2em;
|
||||
}
|
||||
|
||||
.ui-element-spacer {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
// ----------------------------------
|
||||
// ------------ Forms
|
||||
// ----------------------------------
|
||||
|
|
|
|||
|
|
@ -10,10 +10,6 @@
|
|||
<i class="slack icon"></i>
|
||||
{{ 'sylius.ui.join_slack'|trans }}
|
||||
</a>
|
||||
<a href="https://forum.sylius.com" class="item" target="_blank">
|
||||
<i class="discourse icon"></i>
|
||||
{{ 'sylius.ui.join_forum'|trans }}
|
||||
</a>
|
||||
<a href="https://github.com/Sylius/Sylius/issues" class="item" target="_blank">
|
||||
<i class="github icon"></i>
|
||||
{{ 'sylius.ui.issue_tracker'|trans }}
|
||||
|
|
|
|||
|
|
@ -421,7 +421,6 @@ sylius:
|
|||
item_discount: 'Item discount'
|
||||
items: 'Items'
|
||||
items_total: 'Items total'
|
||||
join_forum: 'Join Forum'
|
||||
join_slack: 'Join Slack'
|
||||
jump_to_page: 'Jump to page'
|
||||
label: 'Label'
|
||||
|
|
|
|||
|
|
@ -58,7 +58,9 @@
|
|||
{% block sylius_product_image_widget %}
|
||||
{% apply spaceless %}
|
||||
{{ form_row(form.type) }}
|
||||
<label for="{{ form.file.vars.id }}" class="ui icon labeled button"><i class="cloud upload icon"></i> {{ 'sylius.ui.choose_file'|trans }}</label>
|
||||
<div class="ui-element-spacer">
|
||||
<label for="{{ form.file.vars.id }}" class="ui icon labeled button"><i class="cloud upload icon"></i> {{ 'sylius.ui.choose_file'|trans }}</label>
|
||||
</div>
|
||||
{% if form.vars.value.path|default(null) is not null %}
|
||||
<img class="ui small bordered image" src="{{ form.vars.value.path|imagine_filter('sylius_small') }}" alt="{{ form.vars.value.type }}" />
|
||||
{% endif %}
|
||||
|
|
@ -78,7 +80,9 @@
|
|||
{% apply spaceless %}
|
||||
{{ form_row(form.type) }}
|
||||
{% if form.vars.value.path|default(null) is null %}
|
||||
<div class="ui-element-spacer">
|
||||
<label for="{{ form.file.vars.id }}" class="ui icon labeled button"><i class="cloud upload icon"></i> {{ 'sylius.ui.choose_file'|trans }}</label>
|
||||
</div>
|
||||
{% else %}
|
||||
<img class="ui small bordered image" src="{{ form.vars.value.path|imagine_filter('sylius_small') }}" alt="{{ form.vars.value.type }}" />
|
||||
<label for="{{ form.file.vars.id }}" class="ui icon labeled button"><i class="cloud upload icon"></i> {{ 'sylius.ui.change_file'|trans }}</label>
|
||||
|
|
|
|||
|
|
@ -245,7 +245,9 @@
|
|||
{% block sylius_image_widget %}
|
||||
{% apply spaceless %}
|
||||
{{ form_row(form.type) }}
|
||||
<label for="{{ form.file.vars.id }}" class="ui icon labeled button"><i class="cloud upload icon"></i> {{ 'sylius.ui.choose_file'|trans }}</label>
|
||||
<div class="ui-element-spacer">
|
||||
<label for="{{ form.file.vars.id }}" class="ui icon labeled button"><i class="cloud upload icon"></i> {{ 'sylius.ui.choose_file'|trans }}</label>
|
||||
</div>
|
||||
{% if form.vars.value.path|default(null) is not null %}
|
||||
<img class="ui small bordered image" src="{{ form.vars.value.path|imagine_filter('sylius_small') }}" alt="{{ form.vars.value.type }}" />
|
||||
{% endif %}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue