Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release unordered hierarchies #29

Merged
merged 199 commits into from
Feb 24, 2016
Merged

Release unordered hierarchies #29

merged 199 commits into from
Feb 24, 2016

Conversation

bramfoo
Copy link
Contributor

@bramfoo bramfoo commented Feb 24, 2016

No description provided.

Luthien-in-edhil and others added 30 commits April 7, 2015 17:49
@Luthien-in-edhil
feat/96-add_swagger: initial installation
9b8a82a
@SAlexandru
edmComponentColor is returning always null
bc49b2d
@SAlexandru
Merge branch 'busymachines' of https://github.com/europeana/corelib i…
cd4b42f 
…nto busymachines
Made elements qualified
80f587d
Merge origin/busymachines into busymachines
de4e404
Fixed USA issue in EDMUtils
af5b739
re-fixing the CRF extraction fields
c1e99df
Added Missing webresources in the EDM generation
50b3ef7
Merge branch 'develop' into busymachines
dc74c66 
Conflicts:
	corelib-storage/src/main/java/eu/europeana/corelib/edm/utils/SolrConstructor.java
	corelib-storage/src/main/java/eu/europeana/corelib/edm/utils/construct/SolrDocumentHandler.java
@andyjmaclean
Re: #1958
6d71e30
@Luthien-in-edhil
upgraded to swagger v2 & limited scope to those endpoints specified
4a6e25a
Avoid NPEs
327a014
Cherrypicked VcapPropertyLoaderListener
5c4641e
@Luthien-in-edhil
Merge branch 'develop' into feat/96-add_swagger
cf873df
@Luthien-in-edhil
grunt, squeak
c1b32de
@Luthien-in-edhil
crf garbage takaway
5d60432
@Luthien-in-edhil
first shiny tweaks
9dfd17c
@SAlexandru
fixed merge problems
9f1ae08
@SAlexandru
fixed stupid merge problems due to develop ....
2067b3d
Modified the way the BriefBean exposes the skos:Preflabel of the Agent
0417ac0
Sanitized description issues
a0ea768
Made dc:description even smaller
14d6eba
Made dc:description even smaller
fed1d43
Added extra check for NPE
ebc2088
Added more extreme value byte checking
1dba304
@SAlexandru
adapted the configs to work
b06a0de
@SAlexandru
working version. Lots of hardcoded elements in xml :(. Must fix that !
3483dab
Merge pull request #12 from europeana/develop
69cb44b 
Develop
Minor changes
49f6a72
@Luthien-in-edhil
sorting_timestamps - code added to pass sort param to Solr
78347aa
wjboogerd and others added 27 commits December 14, 2015 17:25
@wjboogerd
Code cleaning
4c955e8
@wjboogerd
Fix VcapPropertyLoaderListener mapping
bf39723
@wjboogerd
Fixes for jackson2 in API
2251c65
@wjboogerd
Fixes on finders in AccessToken Storage service
c4d900b
@wjboogerd
Change moment of vcap listener init to startup
9cb89ad
@bramfoo
Merge pull request #21 from europeana/feat/288_418_Merge
f0933b4 
Merge required for ReconfigureAPI branch
@paulsabou
Merge remote-tracking branch 'origin/old-hierarchies' into busymachines
14b1b54
@paulsabou
Revert "Merge branch 'develop' into busymachines"
3b90734 
This reverts commit 8fdc898, reversing
changes made to 0f5fe4e.
@paulsabou
refactored fake utils & dependencies in crf fake tags & added depende…
2f00c49 
…ncies
@wjboogerd
#826 - Typo in email templates fixed, directly committed into Develop…
dd4912b 
… branch...
@wjboogerd
Added plugin to corelib-db to generate a schema setup script with "mv…
723771f 
…n hibernate4:export"
Replaced hardcoded SugarCRM connection parameters with europeana.prop…
fbe069d 
…erties values
Typo :-$
688a8f1
@paulsabou
Merge branch 'develop' into busymachines
6e1acbc 
Conflicts:
	corelib-hierarchies/src/test/java/eu/europeana/corelib/neo4j/Neo4jTest.java
	corelib-search/src/main/java/eu/europeana/corelib/search/impl/SearchServiceImpl.java
Revert "Merge remote-tracking branch 'origin/old-hierarchies' into bu…
105b441 
…symachines"

This reverts commit 14b1b54, reversing
changes made to 8fdc898.

Conflicts:
	corelib-hierarchies/src/test/java/eu/europeana/corelib/neo4j/Neo4jTest.java
	corelib-search/src/main/java/eu/europeana/corelib/search/impl/SearchServiceImpl.java
Added missing import; removed missing SOUND enum
616a09e
@Luthien-in-edhil
#1 removed edmOptOut & optoutlist from the codebase, will be ignored …
094c0f9 
…in searches
@Luthien-in-edhil
#1 removed edmOptOut & optoutlist from the codebase, will be ignored …
ca218d3 
…in searches (forgot to add this edit)
@Luthien-in-edhil
#11 unordered hierarchies - fixed broken unittest
5864dd1
@Luthien-in-edhil
#11 unordered hierarchies - fixed broken unittest - removed erroneous…
b3108f0 
… comment
Merge branch 'busymachines' into release-unorderedHierarchies
2bd2eab
@Luthien-in-edhil
#7 UCG property Boolean error fix
19cbaf3
Merge branch 'develop' into release-unorderedHierarchies
b70afe3
@Luthien-in-edhil
#32 added detection & feedback of Solr cursorMark exception
b97428d
@Luthien-in-edhil
#32 added detection & feedback of Solr cursorMark exception
4d67a56
HOTFIX: re-enable Sounds, now called Audio
ccb8aed
Merge branch 'develop' into release-unorderedHierarchies
2fe8562
bramfoo added a commit that referenced this pull request Feb 24, 2016
@bramfoo
Merge pull request #29 from europeana/release-unorderedHierarchies
09787c7 
Release unordered hierarchies
@bramfoo bramfoo merged commit 09787c7 into master Feb 24, 2016
@bramfoo bramfoo deleted the release-unorderedHierarchies branch February 24, 2016 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@bramfoo @Luthien-in-edhil @SAlexandru @andyjmaclean @paulsabou @wjboogerd @rgardien