Commits · 17b2544e8152b524539fc7207b3cabe09eae7b07 · afi / opacce

Jun 06, 2016
- Merge branch 'hotline-master' · 17b2544e
  Laurent authored 8 years ago
```
Conflicts:
	VERSIONS
```
  7.5.30
  
  17b2544e
- 7.5.29 · 8dc4882e
  Laurent authored 8 years ago
  
  8dc4882e
- Merge branch 'origin-dev#24_storytime_import_des_articles_au_format_ical' · 881938ed
  Laurent authored 8 years ago
  
  881938ed
Jun 03, 2016
- add script to promote a profil to main portal · 8c36edff
  Laurent authored 8 years ago
  
  8c36edff
May 30, 2016
- dev #24 calendar : handle VEVENT:CREATED & LAST-MODIFIED · 3b5cfbcc
  Laurent authored 8 years ago
  
  3b5cfbcc
- dev #24 calendar : fix categories duplication · 7f416621
  Laurent authored 8 years ago
  
  7f416621
- dev #24 force ical files to CRLF · 0c6cae0a
  Laurent authored 8 years ago
  
  0c6cae0a
May 28, 2016
- dev #24 display number of events and links to imported events · c4b59bcd
  Laurent authored 8 years ago
  
  c4b59bcd
- dev#24 Add admin menu entry · 95f26284
  Laurent authored 8 years ago
  
  95f26284
- dev #24 article status set to calendar configuration · a1108864
  Laurent authored 8 years ago
  
  a1108864
- dev#24 Import events dates and location · 21550718
  Laurent authored 8 years ago
  
  21550718
- dev#24 events deduplication. Display updated events · 8aef89d0
  Laurent authored 8 years ago
  
  8aef89d0
- dev #24 ical: register origin id & repository in events for deduplication · 5637b192
  Laurent authored 8 years ago
  
  5637b192
- dev #24 improve bokeh console & emacs integration · 3dc13029
  Laurent authored 8 years ago
  
  3dc13029
- dev #24 add back button on import screen · b819efbe
  Laurent authored 8 years ago
  
  b819efbe
May 27, 2016
- fix line ending for ical file · 7f5351ab
  Laurent authored 8 years ago
  
  7f5351ab
- fix text files attributes · e7f8c484
  Laurent authored 8 years ago
  
  e7f8c484
- rel #24 : why ? oh why ? · 081000ff
  Patrick Barroca authored 8 years ago
  
  081000ff
- rel #24 : fix test failure ? · 3d7f4c7e
  Patrick Barroca authored 8 years ago
  
  3d7f4c7e
- rel #24 : ics import · 76729122
  Patrick Barroca authored 8 years ago
  
  76729122
- rel #24 : external agendas admin edit and deletion · 5f2bdd34
  Patrick Barroca authored 8 years ago
  
  5f2bdd34
May 26, 2016
- rel #24 : fix tests failures · b7d0b8d1
  Patrick Barroca authored 8 years ago
  
  b7d0b8d1
- rel #24 : external agenda admin index tests + table creation · 6a69c4e9
  Patrick Barroca authored 8 years ago
  
  6a69c4e9
- rel #24 : external agendas admin continued · 49d64908
  Patrick Barroca authored 8 years ago
  
  49d64908
- version 7.5.29 · 70830e02
  Patrick Barroca authored 8 years ago
  
  7.5.29
  
  70830e02
- Merge branch... · 24573371
  Patrick Barroca authored 8 years ago
```
Merge branch 'hotline#43484_lille_metro_impossible_d_ajouter_une_nouvelle_bibliotheque' into 'hotline-master'

Hotline#43484 lille metro impossible d ajouter une nouvelle bibliotheque

See merge request !1671
```
  24573371
- rel #43484 : fix add library url · 5ad6257d
  Patrick Barroca authored 8 years ago
  
  5ad6257d
May 25, 2016
- dev #24 : categories helpers refactoring · 07d64d94
  Laurent authored 8 years ago
  
  07d64d94
- dev #24 : start external agenda admin · 3b5b9a0a
  Laurent authored 8 years ago
  
  3b5b9a0a
May 20, 2016
- version 7.5.28 · af4c77aa
  Ghislain Loas authored 9 years ago
  
  7.5.28
  
  af4c77aa
- Merge branch 'hotline-master' · 240a0cc8
  Ghislain Loas authored 9 years ago
```
Conflicts:
	tests/application/modules/admin/controllers/OuverturesControllerTest.php
```
  240a0cc8
- Merge branch 'stable' into 'hotline-master' · a2c9133f
  Ghislain Loas authored 9 years ago
```
Stable

See merge request !1667
```
  a2c9133f
- Merge branch 'hotline#41294_fix_openings_add_action_for_one_day' into 'hotline-master' · 60f718a5
  Ghislain Loas authored 9 years ago
```
Hotline#41294 fix openings add action for one day

See merge request !1663
```
  60f718a5
- hotline #41294 fix test failures · 15e7ea70
  Ghislain Loas authored 9 years ago
  
  15e7ea70
- fix rt comment · dab0a1bb
  Ghislain Loas authored 9 years ago
  
  dab0a1bb
May 19, 2016
- hotline #41294 add test for patch 296 · 1ca85f0c
  Ghislain Loas authored 9 years ago
  
  1ca85f0c
- dirty solution without modifying zf/element->isValid() · 01d36b57
  Ghislain Loas authored 9 years ago
  
  01d36b57
- reset ref to storm / zf · 3cde2105
  Ghislain Loas authored 9 years ago
  
  3cde2105
- Merge branch 'hotline#38841_probleme_de_catalogage_dans_bokeh' into 'hotline-master' · 843540b4
  Ghislain Loas authored 9 years ago
```
Hotline#38841 probleme de catalogage dans bokeh

See merge request !1665
```
  843540b4
- Merge branch... · aeae781d
  Ghislain Loas authored 9 years ago
```
Merge branch 'hotline#42862_probleme_a_la_creation_de_notice_bibliotheque_numeriquecollections' into 'hotline-master'

Hotline#42862 probleme a la creation de notice bibliotheque numeriquecollections

See merge request !1666
```
  aeae781d

Admin message