Merge branch... (4f65b2ab) · 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
4f65b2ab

Commit 4f65b2ab authored 9 years ago by

efalcy

Downloads
- Plain Diff

Merge branch...

Merge branch 'dev#37314_bibliotheque_mode_d_affichage_un_champ_saisi_un_bloc_a_styliser_dans_la_charte' into dev#32668_bib_form_custom_fields_refacto_master

Conflicts:
library/Class/Bib.php

parents 2f7a4b02 96a5d6cf

Branches

Tags

4 merge requests!1587Master,!1553Master,!1539Master,!1534Dev#32668 bib form custom fields refacto master

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_WIP/37314 1 addition, 0 deletions

VERSIONS_WIP/37314
cosmogramme/sql/patch/patch_287.sql 0 additions, 7 deletions

cosmogramme/sql/patch/patch_287.sql
library/Class/Bib.php 1 addition, 0 deletions

library/Class/Bib.php
library/ZendAfi/View/Helper/BibView.php 92 additions, 47 deletions

library/ZendAfi/View/Helper/BibView.php
library/ZendAfi/View/Helper/NewsBibHelper.php 18 additions, 8 deletions

library/ZendAfi/View/Helper/NewsBibHelper.php
public/opac/css/global.css 13 additions, 1 deletion

public/opac/css/global.css
tests/application/modules/opac/controllers/BibControllerTest.php 18 additions, 12 deletions

...pplication/modules/opac/controllers/BibControllerTest.php
tests/library/ZendAfi/View/Helper/BibViewTest.php 4 additions, 4 deletions

tests/library/ZendAfi/View/Helper/BibViewTest.php

with 147 additions and 79 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