Merge branch... (aa99d90e) · Commits · afi / opacce · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

opacce
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

afi
opacce
Commits
aa99d90e

Commit aa99d90e authored 3 years ago by

Laurent

Downloads
- Plain Diff

Merge branch...

Merge branch 'dev#138425_afficher_les_dates_debut_fin_de_la_serie_dans_un_nouveau_tag_sur_l_agenda' into 'master'

dev #138425 Agenda / Multiple timings :

See merge request !4192

parents 7fd27026 fd5efdcd

Branches

Tags

1 merge request!4192dev #138425 Agenda / Multiple timings :

Pipeline #14630 passed with stage

in 50 minutes and 11 seconds

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_WIP/138425 1 addition, 0 deletions

VERSIONS_WIP/138425
library/Class/Article/EventTimingPeriod.php 49 additions, 0 deletions

library/Class/Article/EventTimingPeriod.php
library/Class/Article/SelectWithTimings.php 1 addition, 1 deletion

library/Class/Article/SelectWithTimings.php
library/ZendAfi/View/Helper/Article/RenderAbstract.php 19 additions, 1 deletion

library/ZendAfi/View/Helper/Article/RenderAbstract.php
library/templates/Intonation/Library/View/Wrapper/Article.php 10 additions, 0 deletions

...ary/templates/Intonation/Library/View/Wrapper/Article.php
tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsCalendarTest.php 124 additions, 26 deletions

...esMultipleTimings/ArticlesMultipleTimingsCalendarTest.php
tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsLoaderTest.php 1 addition, 1 deletion

...clesMultipleTimings/ArticlesMultipleTimingsLoaderTest.php

with 205 additions and 29 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment