Master (!1363) · Merge requests · afi / opacce

Merged Master

master into dev#34246_charte_graphique_backoffice

Merged Ghislain Loas requested to merge master into dev#34246_charte_graphique_backoffice 9 years ago

Dec 21, 2015
- fix fatal error in prets.phtml · 0a41f5c4
  Ghislain Loas authored 9 years ago
  
  0a41f5c4
- add script to urldecode libraries fields · 12132607
  Ghislain Loas authored 9 years ago
  
  12132607
- library form : fix photo display group legend · 0f87be96
  Ghislain Loas authored 9 years ago
  
  0f87be96
- add extend all loans button to the top of the table + · 4e97cd85
  Ghislain Loas authored 9 years ago
  
  4e97cd85
- version 7.3.39 · f985e6ef
  Ghislain Loas authored 9 years ago
  
  f985e6ef
- Merge branch 'dev#33376_api_redmine' into 'master' · ac824bd4
  Ghislain Loas authored 9 years ago
```
Dev#33376 api redmine

See merge request !1361
```
  ac824bd4
- patch level · dda136ed
  Ghislain Loas authored 9 years ago
  
  dda136ed
- Merge branch 'master' into dev#33376_api_redmine · 1c183e32
  Ghislain Loas authored 9 years ago
```
Conflicts:
	cosmogramme/sql/patch/patch_283.php
	tests/db/UpgradeDBTest.php
```
  1c183e32
- Merge branch 'dev#34308_pnb_preparation_mise_en_preprod_casa' into 'master' · 786f941f
  Ghislain Loas authored 9 years ago
```
Dev#34308 pnb preparation mise en preprod casa

See merge request !1358
```
  786f941f
- Merge branch 'dev#30641_cas_orthodidacte' into 'master' · 4eef1041
  Ghislain Loas authored 9 years ago
```
Dev#30641 cas orthodidacte

See merge request !1357
```
  4eef1041
- Merge branch 'dev#25892_module_de_demande_de_consultation_sur_place' into 'master' · 238b23e7
  Ghislain Loas authored 9 years ago
```
Dev#25892 module de demande de consultation sur place

See merge request !1356
```
  238b23e7
- Merge branch 'dev#25957_palmares_des_prets_koha_1_connecteur_sur_le_ws' into 'master' · 6aa40ea8
  Ghislain Loas authored 9 years ago
```
Dev#25957 palmares des prets koha 1 connecteur sur le ws

See merge request !1355
```
  6aa40ea8
Dec 18, 2015
- dev #33376 : redmine script , remove comments · 490a8bec
  efalcy authored 9 years ago
  
  490a8bec
- dev #33376 : redmine script , user form refacto revert zendafi action previous modification · 9c0d59e9
  efalcy authored 9 years ago
  
  9c0d59e9
- dev #33376 : redmine script , user form refacto · 116f53f5
  efalcy authored 9 years ago
  
  116f53f5
Dec 17, 2015
- Merge remote-tracking branch 'refs/remotes/origin/master' into... · 6bf21a1d
  lbrun authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#25892_module_de_demande_de_consultation_sur_place

Conflicts:
	library/Class/CommSigb.php
	library/Class/Exemplaire.php
	tests/library/Class/CommSigbTest.php
```
  6bf21a1d
- Merge branch 'hotline-master' into 'master' · ffd230e4
  Patrick Barroca authored 9 years ago
```
Hotline master

See merge request !1350
```
  ffd230e4
- version 7.3.38 · afcb08a0
  Patrick Barroca authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
```
  afcb08a0
- version 7.2.35 · d2e80744
  Patrick Barroca authored 9 years ago
  
  d2e80744
- dev #30641 update orthodidacte cas link with spec · e92403ba
  Ghislain Loas authored 9 years ago
  
  e92403ba
- Merge branch 'hotline#32959_archives_municipales' into 'stable' · e736991c
  Léonard Brun authored 9 years ago
```
Hotline#32959 archives municipales

See merge request !1348
```
  e736991c
- dev#25892: fix tests · 74b119aa
  lbrun authored 9 years ago
  
  74b119aa
- remove xdebug_break · 9cd22b29
  efalcy authored 9 years ago
  
  9cd22b29
- dev #33376 fix fatal error · aac85514
  Ghislain Loas authored 9 years ago
  
  aac85514
Dec 16, 2015
- dev #33376 zend_form user · 96011748
  Ghislain Loas authored 9 years ago
  
  96011748
- rel #32959 : fix test failures · 95f306cd
  Patrick Barroca authored 9 years ago
  
  95f306cd
- rel #32959 : take items availability label from database when no sigb nor service is defined · 31d5ec1c
  Patrick Barroca authored 9 years ago
  
  31d5ec1c
- dev #33376 fix test failure · 038ade4a
  Ghislain Loas authored 9 years ago
  
  038ade4a
- dev #33376 fix test failure · 397f9f6d
  Ghislain Loas authored 9 years ago
  
  397f9f6d
- dev #33376 upgrade bib form · 5d3db744
  Ghislain Loas authored 9 years ago
  
  5d3db744
- dev#25892: syntax error · 4e4ff73b
  lbrun authored 9 years ago
  
  4e4ff73b
- dev#25892: fix tests · 4d826eac
  lbrun authored 9 years ago
  
  4d826eac
- dev#25892: fix tests · 66e3269b
  lbrun authored 9 years ago
  
  66e3269b
- dev#25892: fix tests · 75504dd2
  lbrun authored 9 years ago
  
  75504dd2
- dev #33376 fix merge fail · eb119306
  Ghislain Loas authored 9 years ago
  
  eb119306
- Merge branch 'dev#32668_contenu_bibliotheques_sandbox_gladys_hackfest' into dev#33376_api_redmine · 065df307
  Ghislain Loas authored 9 years ago
```
Conflicts:
	application/modules/admin/controllers/BibController.php
	application/modules/admin/views/scripts/bib/_form.phtml
	tests/application/modules/admin/controllers/BibControllerTest.php
```
  065df307
Dec 15, 2015
- dev#25892: update consultation table · 2cd22386
  lbrun authored 9 years ago
  
  2cd22386
- dev #34308 pnb: fix loan return date display when returned · b741e116
  Laurent authored 9 years ago
  
  b741e116
- dev#25892: remove xdebug_break · 04db1e87
  lbrun authored 9 years ago
  
  04db1e87
- dev#25892: add consultations to module reservations · dd0f88aa
  lbrun authored 9 years ago
  
  dd0f88aa
- dev #34308 pnb: fix duplicates in user loans · 6dabd9fb
  Laurent authored 9 years ago
  
  6dabd9fb
- dev #30641 fix syntax · c25d6eed
  Ghislain Loas authored 9 years ago
  
  c25d6eed
- dev #30641 add cas orthodidacte · a95b1422
  Ghislain Loas authored 9 years ago
  
  a95b1422
- dev#25892: add tests + refacto · 6a62470a
  lbrun authored 9 years ago
  
  6a62470a
- dev #34308 pnb test fix · 12c2e6d8
  Laurent authored 9 years ago
  
  12c2e6d8
- Merge branch 'master' into dev#34308_pnb_preparation_mise_en_preprod_casa · 96175385
  Laurent authored 9 years ago
```
Conflicts:
	cosmogramme/php/_init.php
	tests/db/UpgradeDBTest.php
```
  96175385
- dev #34308 pnb: forgotten file · 12880e6c
  Laurent authored 9 years ago
  
  12880e6c
Dec 14, 2015
- dev #34308 unindex PNB albums when expired · a22f38de
  Laurent authored 9 years ago
  
  a22f38de
- dev#25892: fix rt · 12eae328
  lbrun authored 9 years ago
  
  12eae328
- dev #34308 test fix · 8cb7ba10
  Laurent authored 9 years ago
  
  8cb7ba10
- dev #34308 pnb status table: add order date column · 3e033b54
  Laurent authored 9 years ago
  
  3e033b54
- Merge branch 'hotline-master' into 'master' · 27283c7e
  Patrick Barroca authored 9 years ago
```
Hotline master

See merge request !1343
```
  27283c7e
- dev #34308 pnb: when an item is not loanable, get the next loanable one · 639fae96
  Laurent authored 9 years ago
  
  639fae96
- dev#25892: remove xdebug · 1a0e8ff4
  lbrun authored 9 years ago
  
  1a0e8ff4
- version 7.3.37 · 2f0780ef
  Patrick Barroca authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
```
  2f0780ef
- version 7.2.34 · c762aaa3
  Patrick Barroca authored 9 years ago
  
  c762aaa3
- Merge branch 'master' into origin-dev#25892_module_de_demande_de_consultation_sur_place · 86d5723b
  lbrun authored 9 years ago
  
  86d5723b
- Merge branch... · a093e2df
  Patrick Barroca authored 9 years ago
```
Merge branch 'hotline#33712_affecter_les_paniers_admin_exportes_depuis_nanook_a_sysadm' into 'stable'

Hotline#33712 affecter les paniers admin exportes depuis nanook a sysadm

See merge request !1340
```
  a093e2df
- dev#25892: change success message · 9d2fab44
  lbrun authored 9 years ago
  
  9d2fab44
- dev #34308 check item availability on loan · 19639c08
  Laurent authored 9 years ago
  
  19639c08
- dev#25892: add authors and notice title · 2b1b12df
  lbrun authored 9 years ago
  
  2b1b12df
- rel #33712 : link nanook baskets to super admin · 1e296ed0
  Patrick Barroca authored 9 years ago
  
  1e296ed0
- dev #34308 refactoring to have multible PNB commands in one album | fix album save · b11b86c0
  Laurent authored 9 years ago
  
  b11b86c0
- Merge branch 'hotline#33149_mise_en_place_connecteur_le_kiosk' into 'hotline-master' · 65778f1c
  Patrick Barroca authored 9 years ago
```
Hotline#33149 mise en place connecteur le kiosk

See merge request !1339
```
  65778f1c
Dec 12, 2015
- dev #34308 refactoring to have multible PNB commands in one album · 986f911c
  Laurent authored 9 years ago
```
fix db migration + multiple item import on update
```
  986f911c
- dev #34308 refactoring to have multible PNB commands in one album | test fix · 5d251a92
  Laurent authored 9 years ago
  
  5d251a92
- dev #34308 refactoring to have multible PNB commands in one album : merge... · f0e29dbd
  Laurent authored 9 years ago
```
dev #34308 refactoring to have multible PNB commands in one album : merge common usage constraints between items
```
  f0e29dbd
- dev #34308 refactoring to have multible PNB commands in one album : merge... · 457ee676
  Laurent authored 9 years ago
```
dev #34308 refactoring to have multible PNB commands in one album : merge common usage constraints between items
```
  457ee676
- dev #34308 refactoring to have multible PNB commands in one album : merge... · 8ae1d9ac
  Laurent authored 9 years ago
```
dev #34308 refactoring to have multible PNB commands in one album : merge common usage constraints between items
```
  8ae1d9ac
Dec 11, 2015
- rel #33149 : fix tests failures · 466542f6
  Patrick Barroca authored 9 years ago
  
  466542f6
- dev#25892: fix tests · 37694f2e
  lbrun authored 9 years ago
  
  37694f2e
- rel #33149 : fix SSO link and redirect · 73a30ec9
  Patrick Barroca authored 9 years ago
  
  73a30ec9
- rel #33149 : fix SSO link and redirect · e0369bf8
  Patrick Barroca authored 9 years ago
  
  e0369bf8
- dev#25892: fix tests · 66f20e0a
  lbrun authored 9 years ago
  
  66f20e0a
- dev#25892: fix tests · 6a0e365c
  lbrun authored 9 years ago
  
  6a0e365c
Dec 10, 2015
- dev#25892: add tests · 7af4c32d
  lbrun authored 9 years ago
  
  7af4c32d
- dev#25892: fix tests · a13b1678
  lbrun authored 9 years ago
  
  a13b1678
- Merge branch 'dev#7334_prolonger_tous_les_prets_en_une_seule_fois' into 'master' · bdf4148c
  Léonard Brun authored 9 years ago
```
Dev#7334 prolonger tous les prets en une seule fois

See merge request !1338
```
  bdf4148c
- Merge branch 'hotline-master' into 'master' · 7bb636b9
  Patrick Barroca authored 9 years ago
```
Hotline master

See merge request !1335
```
  7bb636b9
- version 7.3.36 · e30b9160
  Patrick Barroca authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_269.php
#	library/startup.php
#	tests/db/UpgradeDBTest.php
```
  e30b9160
- version 7.2.33 · 96b611d9
  Patrick Barroca authored 9 years ago
  
  96b611d9
- Merge branch 'hotline#25564_la_moderations_des_tags_notices_est_defectieuse' into 'stable' · 3c1d6357
  Patrick Barroca authored 9 years ago
```
Hotline#25564 la moderations des tags notices est defectieuse

See merge request !1334
```
  3c1d6357
- dev#25892: display nbResas + fix tests · 6a11c123
  lbrun authored 9 years ago
  
  6a11c123
- rel #25564 : fix tags to validate count · ee6d4b7c
  Patrick Barroca authored 9 years ago
  
  ee6d4b7c
- Merge branch 'hotline#34623_modification_htaccess_pour_outils_d_exploitations' into 'stable' · 612bb6b1
  Patrick Barroca authored 9 years ago
```
Hotline#34623 modification htaccess pour outils d exploitations

See merge request !1333
```
  612bb6b1
- Merge branch 'hotline#32959_archives_municipales' into 'stable' · c6e1b2ed
  Patrick Barroca authored 9 years ago
```
Hotline#32959 archives municipales

See merge request !1332
```
  c6e1b2ed
- rel #34623 : do not rewrite /exploit url · 87409c42
  Patrick Barroca authored 9 years ago
  
  87409c42
Dec 09, 2015
- dev#25892: fix tests · 4411eda1
  lbrun authored 9 years ago
  
  4411eda1
- rel #32959 : handle avenio in current cosmogramme phase system · 9626d4b0
  Patrick Barroca authored 9 years ago
  
  9626d4b0
- dev#25892: fix tests + refacto · 879a6955
  lbrun authored 9 years ago
  
  879a6955
- rel #32959 : forgotten files · 235508a9
  Patrick Barroca authored 9 years ago
  
  235508a9
- phpunit 5.1 compat · ae2cc489
  Patrick Barroca authored 9 years ago
  
  ae2cc489
- rel #32959 : handle avenio in current cosmogramme phase system · 1ec13e01
  Patrick Barroca authored 9 years ago
  
  1ec13e01
- dev#25892: add consultation reservation table + tests · 27abdd9c
  lbrun authored 9 years ago
  
  27abdd9c
Dec 08, 2015
- dev #32668 : reset path for bib pictures · 3efe6276
  efalcy authored 9 years ago
  
  3efe6276
- dev #34308 refactoring to have multible PNB commands in one album | db migration · e5f757ce
  Laurent authored 9 years ago
  
  e5f757ce
- dev#25892: module consultation : refacto errors + id exemplaire in request · 3844e180
  lbrun authored 9 years ago
  
  3844e180
- dev #34308 refactoring to have multible PNB commands in one album / album form display · 5e07a4f6
  Laurent authored 9 years ago
  
  5e07a4f6
- dev #34308 refactoring to have multible PNB commands in one album · c5ca4f8d
  Laurent authored 9 years ago
  
  c5ca4f8d
- Merge remote-tracking branch 'refs/remotes/origin/master' into... · 329790a7
  efalcy authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#32668_contenu_bibliotheques_sandbox_gladys_hackfest
```
  329790a7

Admin message

Master

Merge request reports

Activity