Skip to content

Commit c51830a

Browse files
committed
Merge remote-tracking branch 'origin/enext' into enext
2 parents 5919fd6 + 0645732 commit c51830a

File tree

68 files changed

+248007
-243311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+248007
-243311
lines changed

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eventyay-tickets (ENext)
22
========================
33

4-
.. image:: https://codecov.io/gh/fossasia/eventyay-tickets/branch/master/graph/badge.svg
4+
.. image:: https://codecov.io/gh/fossasia/eventyay/branch/enext/graph/badge.svg
55
:target: https://codecov.io/gh/pretix/pretix
66

77
Project status & release cycle
@@ -41,13 +41,13 @@ Getting Started
4141

4242
.. code-block:: bash
4343
44-
git clone https://github.com/fossasia/eventyay-tickets.git
44+
git clone https://github.com/fossasia/eventyay.git
4545
4646
2. **Enter the project directory and app directory**:
4747

4848
.. code-block:: bash
4949
50-
cd eventyay-tickets/app
50+
cd eventyay/app
5151
5252
3. **Switch to the `enext` branch**:
5353

app/eventyay/agenda/templates/agenda/fragment_nav.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
<i class="fa fa-calendar"></i> {{ phrases.schedule.schedule }}
1111
</a>
1212
{% endif %}
13-
{% if request.event.display_settings.schedule_display != "list" %}
14-
<a href="{{ request.event.urls.talks }}" class="header-tab {% if '/sessions/' in request.path_info %} active{% endif %}">
15-
<i class="fa fa-comments-o"></i> {{ phrases.schedule.sessions }}
16-
</a>
13+
{% if schedule or request.event.current_schedule %}
14+
{% if request.event.display_settings.schedule_display != "list" %}
15+
<a href="{{ request.event.urls.talks }}" class="header-tab {% if '/sessions/' in request.path_info %} active{% endif %}">
16+
<i class="fa fa-comments-o"></i> {{ phrases.schedule.sessions }}
17+
</a>
18+
{% endif %}
1719
{% endif %}
1820
{% if request.event.speakers.exists %}
1921
<a href="{{ request.event.urls.speakers }}" class="header-tab {% if '/speakers/' in request.path_info %} active{% endif %}">

app/eventyay/locale/ar/LC_MESSAGES/django.po

Lines changed: 6401 additions & 6401 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)