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

Merged Master

master into WIP

Merged Laurent requested to merge master into WIP 9 years ago

Aug 31, 2015
- Merge branch 'hotline-master' into 'master' · 76869664
  Laurent authored 9 years ago
```
Hotline master

See merge request !1045
```
  76869664
- 7.3.4 · f165f76a
  Laurent authored 9 years ago
```
Merge branch 'stable' into hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
```
  f165f76a
- 7.2.8 · 5ea51926
  Laurent authored 9 years ago
  
  5ea51926
- Merge branch 'hotline#27951_deleting_numilog_album_should_delete_its_record' into 'stable' · 74ffa3cf
  Laurent authored 9 years ago
```
Hotline#27951 deleting numilog album should delete its record

See merge request !1035
```
  74ffa3cf
- Merge branch 'hotline#28245_fix_random_displaying_of_critics' into 'stable' · 38618e9c
  Laurent authored 9 years ago
```
Hotline#28245 fix random displaying of critics

See merge request !1036
```
  38618e9c
- hotline #28245 Fix random displaying of critics: add tests · c3a00d1c
  Laurent authored 9 years ago
  
  c3a00d1c
- Merge branch 'hotline#28796_Fix_thesaurus_integration' into 'stable' · a4f04646
  Laurent authored 9 years ago
```
Hotline#28796 fix thesaurus integration

See merge request !1043
```
  a4f04646
- Fix youtube test · 5c13fdb4
  Laurent authored 9 years ago
  
  5c13fdb4
- hotline #28796 fix generation of unique id_thesaurus · 7abea139
  Laurent authored 9 years ago
  
  7abea139
- hotline #28796 fix duplicate entries for dynamic facets when label size is more than 20 characters · b82f093b
  Laurent authored 9 years ago
  
  b82f093b
Aug 28, 2015
- hotline#28796 : Fix thesaurus integration · 36c00623
  Matthias Meusburger authored 9 years ago
  
  36c00623
Aug 26, 2015
- VERSION 7.3.3 · f3188176
  Matthias Meusburger authored 9 years ago
  
  f3188176
- Fix #27657 tests · 89a2785a
  Matthias Meusburger authored 9 years ago
  
  89a2785a
Aug 25, 2015
- VERSION 7.3.2 · c6595e22
  Matthias Meusburger authored 9 years ago
```
Merge remote-tracking branch 'origin/stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
```
  c6595e22
- VERSION 7.2.7 · a83eaabc
  Matthias Meusburger authored 9 years ago
  
  a83eaabc
- Merge branch 'hotline#11784_type_doc' into 'stable' · 2b47a5ce
  Meusburger authored 9 years ago
```
Hotline#11784 type doc

See merge request !1033
```
  2b47a5ce
- Merge branch 'hotline_#13566_default_nb_display_viewcritics' into 'stable' · 3dd08c8a
  Meusburger authored 9 years ago
```
Hotline #13566 default nb display viewcritics

See merge request !1039
```
  3dd08c8a
- Merge branch 'hotline#26007_order_article_categories_by_title' into 'stable' · 2558281f
  Meusburger authored 9 years ago
```
Hotline#26007 order article categories by title

See merge request !1037
```
  2558281f
- Merge branch 'hotline#25392_rename_facets_labels_when_renaming_domains' into 'stable' · 74402074
  Meusburger authored 9 years ago
```
Hotline#25392 rename facets labels when renaming domains

See merge request !1034
```
  74402074
- Merge branch 'hotline#11217_album_indexation' into 'stable' · 7b45e4de
  Meusburger authored 9 years ago
```
Hotline#11217 album indexation

See merge request !1032
```
  7b45e4de
- Merge branch 'hotline#28472_Fix_add_box_in_front' into 'hotline-master' · aff074cb
  Meusburger authored 9 years ago
```
Hotline#28472 fix add box in front

See merge request !1042
```
  aff074cb
- Merge branch 'hotline_#27816_alert_user_no_mail' into 'stable' · 5adf27a7
  Meusburger authored 9 years ago
```
Hotline #27816 alert user no mail

See merge request !1040
```
  5adf27a7
- hotline#28472: Add tests. · 72b82fba
  Matthias Meusburger authored 9 years ago
  
  72b82fba
- Merge branch 'hotline#28472_Fix_add_box_in_front' into 'hotline-master' · 856137d7
  Laurent authored 9 years ago
```
Hotline#28472 fix add box in front

See merge request !1041
```
  856137d7
Aug 20, 2015
- hotline#28472: Add version file. · c96ead02
  Matthias Meusburger authored 9 years ago
  
  c96ead02
Aug 17, 2015
- hotline#28472: Fix the addition of a new box in front office. · c4ab98da
  Matthias Meusburger authored 9 years ago
  
  c4ab98da
Aug 11, 2015
- hotline #11784 : fix tests · bd875f35
  efalcy authored 9 years ago
  
  bd875f35
- hotline #11784 : fix tests · 30a70989
  efalcy authored 9 years ago
  
  30a70989
- hotline #11217 : add version file · 3bc125fc
  efalcy authored 9 years ago
  
  3bc125fc
- hotline #11784 : follow RT (add constants and prevent exception) · a9b13290
  efalcy authored 9 years ago
  
  a9b13290
- hotline #25392 : fix tests · d8bbe743
  efalcy authored 9 years ago
  
  d8bbe743
- hotline #26007 : add tests · 66b6c013
  efalcy authored 9 years ago
  
  66b6c013
- hotline #27816 : change sentence when user doesn't have an email · 719cb817
  efalcy authored 9 years ago
  
  719cb817
- hotline #13566 : add version file · c06e5791
  efalcy authored 9 years ago
  
  c06e5791
- Merge branch 'hotline#25396_advanced_search' into 'stable' · 527b2889
  Ghislain Loas authored 9 years ago
```
Hotline#25396 advanced search

See merge request !1030
```
  527b2889
- Merge branch 'hotline_#25883_new_order_by_tomes' into 'stable' · f243fbe2
  Ghislain Loas authored 9 years ago
```
Hotline #25883 new order by tomes

See merge request !1038
```
  f243fbe2
Aug 10, 2015
- hotline #13566 : viewcritics fix test · 9e18c4c8
  efalcy authored 9 years ago
  
  9e18c4c8
- hotline #13566 : viewcritics should display 50 if number display set to null or empty · 0d585fe6
  efalcy authored 9 years ago
  
  0d585fe6
- hotline #13566 : default value for display critics to 50 · 5994f0da
  efalcy authored 9 years ago
  
  5994f0da
- hotline #13566 : default value for display critics to 50 · b79bcbc0
  efalcy authored 9 years ago
  
  b79bcbc0
- hotline #15721 : add version file · c38ad554
  efalcy authored 9 years ago
  
  c38ad554
- hotline #25883 : order tomes by integer · 4a98aca2
  efalcy authored 9 years ago
  
  4a98aca2
Aug 06, 2015
- hotline #26007 - Sort articles categories by title in list view mode · e4d2c2d3
  Alex Arnaud authored 9 years ago
  
  e4d2c2d3
- hotline #28245 - Fix random displaying of critics · 300ff4ff
  Alex Arnaud authored 9 years ago
  
  300ff4ff
Aug 04, 2015
- hotline #27951 - Fix tests failures / errors · 66c01388
  Alex Arnaud authored 9 years ago
  
  66c01388
- hotline #25392 - Fix test errors · bc82b834
  Alex Arnaud authored 9 years ago
  
  bc82b834
- hotline #27951 - Deleting an album now delete the associated record · 00ba1a5b
  Alex Arnaud authored 9 years ago
  
  00ba1a5b
- hotline #25392 - Rename thesaurus labels when its domain is renamed · 3152aeff
  Alex Arnaud authored 9 years ago
  
  3152aeff
Jul 31, 2015
- hotline #11784 type doc · 28462f45
  Laurent authored 9 years ago
```
test fix
```
  28462f45
- hotline #11784 type doc · 9ed3a4bc
  Laurent authored 9 years ago
```
fix type doc display in record header
```
  9ed3a4bc
- hotline #11784 type doc · 96c7370f
  Laurent authored 9 years ago
```
fix type doc display in record header
```
  96c7370f
- hotline #11217 album indexation · d267a7ca
  Laurent authored 9 years ago
```
resources now indexed on mass upload
```
  d267a7ca
Jul 30, 2015
- dev #22209 search result feed · 5d0779f6
  Laurent authored 9 years ago
```
wrong tix number
```
  5d0779f6
- hotline #25396 advanced search · 559cdefa
  Laurent authored 9 years ago
```
fix done
```
  559cdefa

Admin message

Master

Merge request reports

Activity