Commits · 5f9615cb58ef1ead43253ead59f3a218dbdb78db · afi / opacce

Nov 16, 2016
- dev #48981 : hold with multi cards · 5f9615cb
  Laurent authored 8 years ago
  
  5f9615cb
- dev #48981 loans status with multi cards · 5282da71
  Laurent authored 8 years ago
  
  5282da71
- dev #48981 fix test failure · c003ccc1
  Laurent authored 8 years ago
  
  c003ccc1
Nov 15, 2016
- dev #48981 fix test failure · 73bd777d
  Laurent authored 8 years ago
  
  73bd777d
- dev #48981 back button in cards list · cb146f3f
  Laurent authored 8 years ago
  
  cb146f3f
- dev #48981 current loans count with multi cards · b5977835
  Laurent authored 8 years ago
  
  b5977835
- dev #48981 fix test failure · 2e5887fb
  Laurent authored 8 years ago
  
  2e5887fb
- dev #48981 fix test failures, loan history not multicard · 08ef6f23
  Laurent authored 8 years ago
  
  08ef6f23
- dev #48981 renew loans on multicards · 64fe9f88
  Laurent authored 8 years ago
  
  64fe9f88
- dev #48981 merged multicards loans · e1e92c21
  Laurent authored 8 years ago
  
  e1e92c21
Nov 14, 2016
- dev #48981 linked cards: add delete action · 16a26eb2
  Laurent authored 8 years ago
  
  16a26eb2
- dev #48981 linked cards: display my card + end subscription date · ba8471e9
  Laurent authored 8 years ago
  
  ba8471e9
- dev #48981 add linked_cards input validation · 21f7af56
  Laurent authored 8 years ago
  
  21f7af56
- dev #48981 linked cards: display child cards list · f51e993d
  Laurent authored 8 years ago
  
  f51e993d
- dev #48981 add linked_cards patches + refacto UpgradeDb to run only test patches · 01d39b26
  Laurent authored 8 years ago
  
  01d39b26
Nov 07, 2016
- dev #48981 create add card popup form · 5d00e155
  Laurent authored 8 years ago
  
  5d00e155
- Merge remote-tracking branch 'refs/remotes/afi/hotline-master' into afi-master · 3b30e3b1
  Patrick Barroca authored 8 years ago
  
  3b30e3b1
- Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master · 8b46378c
  Patrick Barroca authored 8 years ago
```
# Conflicts:
#	VERSIONS
#	library/startup.php
#	library/translation/en.mo
#	library/translation/en.po
```
  8b46378c
- Merge branch 'hotline#50177_filter_library_with_commsigb_during_login' into 'hotline-master' · dda2ed82
  Ghislain Loas authored 8 years ago
```
Hotline#50177 filter library with commsigb during login

See merge request !1895
```
  dda2ed82
- version 7.6.15 · 7e270168
  Patrick Barroca authored 8 years ago
  
  7.6.15
  
  7e270168
- hotline #50177 fix test case · e05ff8b7
  Ghislain Loas authored 8 years ago
  
  e05ff8b7
- hotline #50177 filter library without commSigb in borrower update user · 501df0a0
  Ghislain Loas authored 8 years ago
  
  501df0a0
- Merge branch 'hotline#47691_allow_library_modo_to_change_admin_skin' into 'stable' · 621502cf
  Laurent authored 8 years ago
```
hotline #47691 add action right schel in Acl by roles

See merge request !1894
```
  621502cf
- hotline #47691 fix test case · ccd0c69d
  Ghislain Loas authored 8 years ago
  
  ccd0c69d
- Merge branch 'hotline#50042_fix_english_translation' into 'stable' · 7a8389fc
  Ghislain Loas authored 8 years ago
```
hotline #50042 fix english translation file

See merge request !1892
```
  7a8389fc
- byby · e113319d
  Ghislain Loas authored 8 years ago
  
  e113319d
- hotline #47691 add action right schel in Acl by roles · b5dfe49c
  Ghislain Loas authored 8 years ago
  
  b5dfe49c
Nov 04, 2016
- Merge branch 'dev#49273_2155_inscription_a_une_formation_envoi_d_un_mail' into 'master' · 186b3029
  Laurent authored 8 years ago
```
Dev#49273 2155 inscription a une formation envoi d un mail

See merge request !1893
```
  186b3029
- hotline #50042 fix english translation file · 13b6eb41
  Ghislain Loas authored 8 years ago
  
  13b6eb41
- version 7.7.15 · 6715d8e5
  Ghislain Loas authored 8 years ago
  
  7.7.15
  
  6715d8e5
- version 7.6.14 · 55e44341
  Ghislain Loas authored 8 years ago
  
  7.6.14
  
  55e44341
- Merge branch 'origin-stable' into origin-hotline-master · 6e8312b3
  Ghislain Loas authored 8 years ago
```
Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_308.php
	library/Class/CodifThesaurus.php
	library/translation/es.mo
	tests/db/UpgradeDBTest.php
```
  6e8312b3
- Merge branch 'hotline#49992_fix_authentification' into 'hotline-master' · 8d20ea4a
  Patrick Barroca authored 8 years ago
```
Hotline#49992 fix authentification

See merge request !1891
```
  8d20ea4a
Nov 03, 2016
- hotline #49992 : rt : fix classe_abonne indent · cdf0d86a
  Ghislain Loas authored 8 years ago
  
  cdf0d86a
- hotline #49992 : rt : fix useless diff · bceda128
  Ghislain Loas authored 8 years ago
  
  bceda128
- Merge branch 'hotline#45756_fix_js_slider' into 'stable' · 694e90db
  efalcy authored 8 years ago
```
hotline #45756 fix slider behavior

See merge request !1887
```
  694e90db
- Merge branch 'hotline#50053_pb_avec_l_integration_des_pistes_soundcloud' into 'stable' · c8de5307
  Ghislain Loas authored 8 years ago
```
hotline #50053 : use soundcloud /resolve service with provided soundclound url

See merge request !1889
```
  c8de5307
- hotline #49992 : fix tests · bbe27e4b
  Ghislain Loas authored 8 years ago
  
  bbe27e4b
- Merge branch... · b9eb05c1
  efalcy authored 8 years ago
```
Merge branch 'hotline#47280_dispartition_de_la_barre_d_outils_editeur_de_texte_en_modification_d_article_pleine_page' into 'stable'

hotline  #47280 :  syntax error on version file

See merge request !1890
```
  b9eb05c1
- hotline #47280 : syntax error on version file · 0e0e7e9c
  efalcy authored 8 years ago
  
  0e0e7e9c

Admin message