Commits · 1362f9e44c8b8bbe2d4eb5f65788001f1436f820 · afi / opacce

Dec 04, 2017
- Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-master · 1362f9e4
  Patrick Barroca authored 7 years ago
```
# Conflicts:
#	VERSIONS
#	cosmogramme/sql/patch/patch_338.php
#	library/Class/Users.php
#	library/startup.php
#	tests/db/UpgradeDBTest.php
```
  1362f9e4
- version 7.10.14 · d5009474
  Patrick Barroca authored 7 years ago
  
  7.10.14
  
  d5009474
- Merge branch... · d4e5d9e9
  Ghislain Loas authored 7 years ago
```
Merge branch 'dev#64923_contractuel_concarneau_personnaliser_le_fonds_de_la_carte_bib' into 'master'

Dev#64923 contractuel concarneau personnaliser le fonds de la carte bib

See merge request !2430
```
  d4e5d9e9
- Merge branch 'dev#62896_contractuel_sanop_miop_evolution_boite_sitotheque' into 'master' · 3cdb7a8f
  Ghislain Loas authored 7 years ago
```
Dev#62896 contractuel sanop miop evolution boite sitotheque

See merge request !2428
```
  3cdb7a8f
- Merge branch 'sandbox-user-password-hash' into 'stable' · 89455a49
  Patrick Barroca authored 7 years ago
```
Sandbox user password hash

See merge request !2424
```
  89455a49
Dec 01, 2017
- reset-password action finished · 368f9027
  Patrick Barroca authored 7 years ago
  
  368f9027
Nov 30, 2017
- wip : reset-password action · 83d6bcca
  Patrick Barroca authored 7 years ago
  
  83d6bcca
- wip : lostpass refactoring · 4019730d
  Patrick Barroca authored 7 years ago
  
  4019730d
- Merge branch 'dev#65267_bonus_moderation_des_videos' into 'master' · 0129c7c2
  Patrick Barroca authored 7 years ago
```
Dev#65267 bonus moderation des videos

See merge request !2427
```
  0129c7c2
- Merge branch... · 1e065005
  Patrick Barroca authored 7 years ago
```
Merge branch 'dev#64852_contractuel_migration_des_avis_pod_bokeh_caluire_et_cuire_et_seyssinet_pariset' into 'master'

Dev#64852 contractuel migration des avis pod bokeh caluire et cuire et seyssinet pariset

See merge request !2426
```
  1e065005
- Merge branch 'dev#52054_s91_contractuelaspiration_des_notices_de_musicme' into 'master' · 265b14b9
  Patrick Barroca authored 7 years ago
```
Dev#52054 s91 contractuelaspiration des notices de musicme

See merge request !2425
```
  265b14b9
Nov 29, 2017
- dev #65267 : fix test · 54f6b1b4
  Patrick Barroca authored 7 years ago
  
  54f6b1b4
- dev #65267 : fix test · 1d509b59
  Patrick Barroca authored 7 years ago
  
  1d509b59
- dev #65267 : fix RT · ea2b5215
  Patrick Barroca authored 7 years ago
  
  ea2b5215
- dev #62896 : fix features file · c147223f
  efalcy authored 7 years ago
  
  c147223f
- dev #52054 : modify features file · 1e16baca
  efalcy authored 7 years ago
  
  1e16baca
- dev #52054 : modify FEATURES file · 22f1bf34
  efalcy authored 7 years ago
  
  22f1bf34
- dev #52054 : add patch for Skilleos, LaSourisQuiRaconte, Lekiosk to set... · 720232e6
  efalcy authored 7 years ago
```
dev #52054 : add patch for Skilleos, LaSourisQuiRaconte, Lekiosk to set default url_origine in album
```
  720232e6
Nov 28, 2017
- pass hash plugged in cosmogramme auth · 42f3ec38
  Patrick Barroca authored 7 years ago
  
  42f3ec38
- pass hash : become user different for patrons and others · 5971e6fa
  Patrick Barroca authored 7 years ago
  
  5971e6fa
- pass hash are case insensitive, cannot login with hash · f86f9533
  Patrick Barroca authored 7 years ago
  
  f86f9533
- dev #62896 : move buttons on sito box · 51c96b04
  efalcy authored 7 years ago
  
  51c96b04
- dev #62896 : manage permission on sito box configuration · 3f7f3ac6
  efalcy authored 7 years ago
  
  3f7f3ac6
- dev #65267 update trailer link is a button · d8fe604b
  Laurent authored 7 years ago
  
  d8fe604b
- dev #65267 update trailer tests · f41c2600
  Laurent authored 7 years ago
  
  f41c2600
- dev #62896 : add buttons modify and edit from sitotheque · e48e6747
  efalcy authored 7 years ago
  
  e48e6747
Nov 27, 2017
- dev #65267 add upload trailer · 728bb364
  Laurent authored 7 years ago
  
  728bb364
- Merge branch 'hotline-master' into 'master' · 89c6f03f
  Patrick Barroca authored 7 years ago
```
Hotline master

See merge request !2420
```
  89c6f03f
- dev #64852 POD import: tune script · 8c247e7e
  Laurent authored 7 years ago and Patrick Barroca committed 7 years ago
  
  8c247e7e
- dev #64852 add POD comments import script · 63d9da75
  Laurent authored 7 years ago and Patrick Barroca committed 7 years ago
  
  63d9da75
- Update 64923 · c2f6bd1b
  Ghislain Loas authored 7 years ago and Patrick Barroca committed 7 years ago
  
  c2f6bd1b
- dev #64923 update version and feature · e5cf9147
  Ghislain Loas authored 7 years ago and Patrick Barroca committed 7 years ago
  
  e5cf9147
- dev #64923 improve geojson rendering · 541c3b29
  Ghislain Loas authored 7 years ago and Patrick Barroca committed 7 years ago
  
  541c3b29
- dev #64923 add tests on librariesMap helper · aecdcf76
  Ghislain Loas authored 7 years ago and Patrick Barroca committed 7 years ago
  
  aecdcf76
- dev #64923 improve osm rendering · 8952a3ae
  Ghislain Loas authored 7 years ago and Patrick Barroca committed 7 years ago
  
  8952a3ae
- dev #64923 add checkbox to toggle osm layer · dd3800b0
  Ghislain Loas authored 7 years ago and Patrick Barroca committed 7 years ago
  
  dd3800b0
- dev #64923 add custom geojson to osm · 1d7bacfb
  Ghislain Loas authored 7 years ago and Patrick Barroca committed 7 years ago
  
  1d7bacfb
Nov 24, 2017
- fix RT · 29013d32
  Patrick Barroca authored 7 years ago
  
  29013d32
- upgrade all admins to hashed pass · 26ddd87f
  Patrick Barroca authored 7 years ago
  
  26ddd87f
- fix failures · e030f173
  Patrick Barroca authored 7 years ago
  
  e030f173

Admin message