Commits · 3e0752dac35ec5f43d54270b6ac77bb0b28ea62e · afi / opacce

Jun 28, 2016
- Merge branch 'gitlab_ci_concurrent' · 3e0752da
  Laurent authored 8 years ago
```
Conflicts:
	.gitlab-ci.yml
```
  3e0752da
- Merge remote-tracking branch 'refs/remotes/origin/hotline-master' · d82ccd5a
  Laurent authored 8 years ago
```
Conflicts:
	VERSIONS
```
  d82ccd5a
- back to one stage · af501d3f
  Laurent authored 8 years ago
  
  af501d3f
Jun 27, 2016
- add gitlab stages · 7cd56b4e
  Laurent authored 8 years ago
  
  7cd56b4e
- add gitlab stages · 74c6e015
  Laurent authored 8 years ago
  
  74c6e015
- add gitlab stages · 1cf85db3
  Laurent authored 8 years ago
  
  1cf85db3
- add gitlab stages · fe688c65
  Laurent authored 8 years ago
  
  fe688c65
- add gitlab stages · ae97c5be
  Laurent authored 8 years ago
  
  ae97c5be
- test gitlab concurrency · c4fea10d
  Laurent authored 8 years ago
  
  c4fea10d
- test gitlab concurrency · f23a572e
  Laurent authored 8 years ago
  
  f23a572e
- test gitlab concurrency · 50fc785b
  Laurent authored 8 years ago
  
  50fc785b
- test gitlab concurrency · 815acd8a
  Laurent authored 8 years ago
  
  815acd8a
- Merge branch 'dev#44528_reserve_annuaire_retirer_rue_de_l_index_de_recherche' into 'master' · 80a6788c
  Laurent authored 8 years ago
```
dev #44528 library widget: remove adress from search fields

See merge request !1697
```
  80a6788c
- Merge branch 'dev#44602_recette_aller_de_l_agenda_a_la_fiche_bibliotheque' into 'master' · d8b5b4a2
  Laurent authored 8 years ago
```
Dev#44602 recette aller de l agenda a la fiche bibliotheque

See merge request !1696
```
  d8b5b4a2
- Merge branch 'dev#43877_recette_boite_bibliotheque_facette_bibliotheque_hyperlien' into 'master' · 185de163
  Laurent authored 8 years ago
```
dev #43877: library widget: automatically scroll to widget top when clicking on a facet

See merge request !1695
```
  185de163
- Fix cosmopath when a directory named '0' exists · e2bcb5b1
  Laurent authored 8 years ago
  
  7.5.33
  
  e2bcb5b1
- Fix cosmopath when a directory named '0' exists · 78dc8477
  Laurent authored 8 years ago
  
  78dc8477
- fix update skin script · 0ed35a22
  Ghislain Loas authored 8 years ago
  
  0ed35a22
- fix bokeh74 & retro css · 7214f043
  Ghislain Loas authored 8 years ago
  
  7214f043
- test fix · 811d0406
  Laurent authored 8 years ago
  
  811d0406
- 7.5.33 · d1018cba
  Laurent authored 8 years ago
```
Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
```
  d1018cba
- Merge branch 'dev#44518_articles_widget_allow_custom_anchor_on_widget_title' into 'master' · c696b995
  Ghislain Loas authored 8 years ago
```
Dev#44518 articles widget allow custom anchor on widget title

See merge request !1694
```
  c696b995
- version 7.4.25 · f2917572
  Ghislain Loas authored 8 years ago
  
  7.4.25
  
  f2917572
- Merge branch 'hotline#44920_probleme_bouton_accueil_sur_portail' into 'stable' · f664593b
  Ghislain Loas authored 8 years ago
```
Hotline#44920 probleme bouton accueil sur portail

See merge request !1689
```
  f664593b
Jun 25, 2016
- add soft link for gitlab compat · 3f59952b
  Laurent authored 8 years ago
  
  3f59952b
- add gitlab-ci automation · 8677acc1
  Laurent authored 8 years ago
  
  8677acc1
- dev #44528 library widget: remove adress from search fields · ce98dd5e
  Laurent authored 8 years ago
  
  ce98dd5e
- dev #43877: library widget: automatically scroll to widget top when clicking on a facet · 2c720904
  Laurent authored 8 years ago
  
  2c720904
- hotline #44920 fix Home link when BASE_URL empty · 2ca0c740
  Laurent authored 8 years ago
  
  2ca0c740
Jun 24, 2016
- update storm ref · 5a6fa241
  Ghislain Loas authored 8 years ago
  
  5a6fa241
- Merge branch 'hotline-master' into 'master' · d774e376
  Ghislain Loas authored 8 years ago
```
Hotline master

See merge request !1688
```
  d774e376
- fix drag and drop in admin/profil/accueil · 274e3724
  Ghislain Loas authored 8 years ago
  
  274e3724
- dev #44602 test fix · 4a107f2b
  Laurent authored 8 years ago
  
  4a107f2b
- dev #44602 add link to library view in article view · b545eda9
  Laurent authored 8 years ago
  
  b545eda9
- Merge branch 'origin-master' into dev#44518_articles_widget_allow_custom_anchor_on_widget_title · 64f4ab47
  Ghislain Loas authored 8 years ago
```
Conflicts:
	tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
```
  64f4ab47
- Merge branch 'dev#44524_openings_validity_ranges' into 'master' · cf4bed1d
  Ghislain Loas authored 8 years ago
```
Dev#44524 openings validity ranges

See merge request !1682
```
  cf4bed1d
Jun 23, 2016
- update version · 261a1939
  Ghislain Loas authored 8 years ago
  
  261a1939
- dev #44518 fix test failure · 211036d7
  Ghislain Loas authored 8 years ago
  
  211036d7
- dev #44518 implement story · d9070c82
  Ghislain Loas authored 8 years ago
  
  d9070c82
- dev #44518 fix tests errors · 53d643ca
  Ghislain Loas authored 8 years ago
  
  53d643ca

Admin message