Hotline master (!739) · Merge requests · afi / opacce

Merged Hotline master

hotline-master into master

Merged Patrick Barroca requested to merge hotline-master into master 10 years ago

Mar 03, 2015
- version 7.1.14 : forgotten patch 240 · a4a5f3a4
  Patrick Barroca authored 10 years ago
  
  a4a5f3a4
- version 7.1.14 · f8daeaa6
  Patrick Barroca authored 10 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_233.php
#	library/startup.php
```
  f8daeaa6
- version 7.0.8 · 9d7988ea
  Patrick Barroca authored 10 years ago
  
  9d7988ea
Mar 02, 2015
- Merge branch 'hotline#16321_encoding_issue_in_dewey_table' into 'stable' · 2072e60e
  Patrick Barroca authored 10 years ago
```
Hotline#16321 encoding issue in dewey table

See merge request !727
```
  2072e60e
Feb 25, 2015
- hotline#16321 - Update cosmogramme patch level · efe773c1
  Alex Arnaud authored 10 years ago
  
  efe773c1
- Merge branch 'hotline#16321_encoding_issue_in_dewey_table' into 'stable' · 0884deb1
  Patrick Barroca authored 10 years ago
```
Hotline#16321 encoding issue in dewey table

See merge request !726
```
  0884deb1
- hotline#16321 - Fix bad encoding of 'ç' character in dewey table · ea96c879
  Alex Arnaud authored 10 years ago
  
  ea96c879
- Merge branch 'hotline#18602_calendar_config_icon_disappear' into 'stable' · 81723901
  Patrick Barroca authored 10 years ago
```
Hotline#18602 calendar config icon disappear

See merge request !712
```
  81723901
- Hotline#18602 - Add comment to prevent others developpers to remove this weird fix · fd24238c
  Alex Arnaud authored 10 years ago
  
  fd24238c
Feb 19, 2015
- Hotline#18602 - Fix calendar ajax rendering · 0558671c
  Alex Arnaud authored 10 years ago
  
  0558671c

Admin message

Hotline master

Merge request reports

Activity