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

Merged Master

master into WIP

Merged Ghislain Loas requested to merge master into WIP 10 years ago

Jan 19, 2015
- Merge branch 'hotline_6.59' into 'master' · 63d86b3f
  Ghislain Loas authored 10 years ago
```
Hotline 6.59

See merge request !625
```
  63d86b3f
Jan 15, 2015
- Merge branch 'sandbox#15516-restful-bokeh' · 3094dc3b
  Ghislain Loas authored 10 years ago
```
Conflicts:
	library/startup.php
```
  3094dc3b
- Merge remote-tracking branch 'refs/remotes/afi/dev#18291_sitemap' into afi-master · b8903e6e
  Patrick Barroca authored 10 years ago
```
Conflicts:
	cosmogramme/php/_init.php
```
  b8903e6e
- rel #18291 : remove duplicate version file · 3e26b56c
  Patrick Barroca authored 10 years ago
  
  3e26b56c
Jan 14, 2015
- Merge branch 'dev#19190_help_links_3613_3612_3618' into 'master' · d4df3f7f
  Patrick Barroca authored 10 years ago
```
Dev#19190 help links 3613 3612 3618

Help link from Ardans to Mediawiki

    Ardans pages: 3613 3612 3618
    Moved to wiki pages on wiki.bokeh-library-portal.or

    Bokeh pages improved:
    - /admin/catalogue
    - /admin/profil
    - /admin/profil/menusindex/id_profil/13

See merge request !601
```
  d4df3f7f
- rel #19338 : add afi local instance of validator.nu · 5ec92e55
  Patrick Barroca authored 10 years ago
  
  5ec92e55
- rel #19190 : fix tests failures · 9d29f5ea
  Patrick Barroca authored 10 years ago
  
  9d29f5ea
Jan 09, 2015
- rel #15516 : restful-storm plugged in Bokeh · ccb9d4b1
  Patrick Barroca authored 10 years ago
  
  ccb9d4b1
- dev #19190 Help link from Ardans to Mediawiki · 75be908f
  Claire Hernandez authored 10 years ago
```
Ardans pages: 3613 3612 3618
Moved to wiki pages on wiki.bokeh-library-portal.or

Bokeh pages improved:
- /admin/catalogue
- /admin/profil
- /admin/profil/menusindex/id_profil/13
```
  75be908f
- fix #18291 : PHP <5.6 compatibility · e6edc616
  Patrick Barroca authored 10 years ago
  
  e6edc616

Admin message

Master

Merge request reports

Activity