Merge branch... (93829b4d) · 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
93829b4d

Commit 93829b4d authored 8 years ago by

Laurent

Downloads
- Plain Diff

Merge branch...

Merge branch 'hotline#43547_plus_d_enrichissement_bande_annonce_youtube_biographie' into 'hotline-master'

Hotline#43547 plus d enrichissement bande annonce youtube biographie

See merge request !1679

parents 972efd59 3486b890

Branches

Tags

1 merge request!1681Hotline master

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/43547 1 addition, 0 deletions

VERSIONS_HOTLINE/43547
application/modules/opac/controllers/NoticeajaxController.php 4 additions, 4 deletions

...ication/modules/opac/controllers/NoticeajaxController.php
cosmogramme/php/_init.php 1 addition, 1 deletion

cosmogramme/php/_init.php
cosmogramme/sql/patch/patch_299.php 6 additions, 0 deletions

cosmogramme/sql/patch/patch_299.php
library/Class/Notice.php 23 additions, 15 deletions

library/Class/Notice.php
tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 20 additions, 2 deletions

...ion/modules/opac/controllers/NoticeAjaxControllerTest.php
tests/db/UpgradeDBTest.php 15 additions, 0 deletions

tests/db/UpgradeDBTest.php
tests/fixtures/dvd_potter.uni 1 addition, 0 deletions

tests/fixtures/dvd_potter.uni

with 71 additions and 22 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