Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Integration #399

Merged
merged 158 commits into from Oct 13, 2015
Merged

Integration #399

merged 158 commits into from Oct 13, 2015

Conversation

literarymachine
Copy link
Contributor

No description provided.

philboeselager and others added 30 commits July 28, 2015 18:05
@philboeselager
Introduce ResourceDenormaliser in BaseRepository
2d3c594
@philboeselager
Intermediate commit
f9a6ec7
@literarymachine
Add outline for ResourceDenormalizerTest
93d14f8
@philboeselager
introduce ResourceTrimmer, reimplement Resource normalization
d8a61ea
@philboeselager
Merge branch 'task/#276_discussionBasis' of https://github.com/hbz/oe…
6d79c96 
…rworldmap into task/#276_discussionBasis

Conflicts:
	test/services/ResourceDenormalizerTest.java
@philboeselager
Add ResourceTrimmerTest and correct Resource.getEmbedView / getListView
ef44efc
@philboeselager
Fix bugs in ResourceDenormalizer - intermediate commit
161a7a6
@philboeselager
Fix bugs and change constructor Resource(String, String)
b141a69
@philboeselager
Denormalizing: all tests green
a0182b0
@philboeselager
Work on ResourceDenormalizerTest
55d3dbb
@literarymachine
Add test case for removal of reference
bb61151
@philboeselager
Draft of wrapper based Resource denormalizing
8a61794
@philboeselager
Make Resource comparable and fix ResourceDenormalizer + green tests
9dc33c3
@philboeselager
Add remove functionality in ResourceDenormalizer and test it
7f31058
@philboeselager
Merge branch master into task/#276_discussionBasis and enable noIdRefs
2b8b73f 
Conflicts:
	app/models/Record.java
	app/models/Resource.java
	app/services/BaseRepository.java
@philboeselager
Fix handling of mentioned Resources without ID
23363c4
@literarymachine
Merge pull request #335 from hbz/task/#276_discussionBasis2
7c9a351 
Task/#276 discussion basis2
@literarymachine
Merge branch 'master' into story/#118
1e86c49 
Conflicts:
	app/models/Resource.java
	build.sbt
	test/services/BaseRepositoryTest.java
@literarymachine
Remove occurrences of external ID generation
9177b6e
@literarymachine
Add denormalization test case
6de410f 
Input is a resource with only literal values and objects that are
unidentified. Thus, the output should equal the input.
@literarymachine
Update denormalization test case
ec31eac 
Also take updating resource in repo into account
@philboeselager
Fix Resource.equals for ResourceDenormalizer
499d14b
@literarymachine
Update denormalization test case
a2bdda6 
Resources should not be modified by the denormalization process, the
modified resource should only be part of the resulting List<Resource>
@philboeselager
Fix merge Resources: prevent adding list items already existing
4717405
@literarymachine
Add denormalization test case
fddcc62 
Arrays containing objects should not be merged but updated with the
content coming in.
@literarymachine
Fix adding values instead of overwriting them
66fcb60 
@boeselager All tests OK, so I assume this is fine. Still, please take a
look. Like we discussed, there is not really a necessity for a
merge-logic here, incoming data is always considered a complete
representation.
@literarymachine
Add test showing wrong handling of nested objects
8b3e8d8 
Nested objects without an ID should not be cut off
@literarymachine
Completely add resources w/o id when denormalizing
794a4d8 
@philboeselager Again, this is a rather small change that does not break
any tests, but please review anyways.
@literarymachine
Allow explicitly setting type when adding resource
9e801d2
@literarymachine
Explicitly load database content for test case
804bf17
@literarymachine
Re-enable user authentification by email token
d1113b0
@literarymachine
Show applied filters, hide available filters
07269ed
@literarymachine
Show all pins on landing page map
68dd010
@literarymachine
Add sameAs links to resource pages
e272ad1 
Fixes #320
@literarymachine
Set default listing size to 25
cbbae4b 
Fixes #397
@literarymachine
Add labels to aggregation pie charts
3ab9637 
Fixes #396
@literarymachine
Remove email as required property
d8952e2 
Schema validation fails when embedding resource in link mode. This is a
general problem we'll have to take care of by defining sub schemas for
the different modes.

/cc @philboeselager
@literarymachine
Fix migration for concept URI strings
4a4333a
@literarymachine
Fix utf-8 encoding for SKOS imports
cd762c5
@literarymachine
Use checkbox input for active facets
689c551
@literarymachine
Zoom map to fit pins on search result page
94e9263
@literarymachine
Migrate all alternate names to localized strings
40deb6c 
Fixes #291
@literarymachine
Fix typo
1a9d638
@literarymachine
Allow non url encoded resource IDs
c169f74
@literarymachine
Copy link
Contributor Author

On https://beta.oerworldmap.org/

@philboeselager
Copy link
Contributor

Looks absolutely great!!

Observed some minor issues on Firefox 38:

  • no map content when clicking on recent additions of "Sandhya Gunness, University of Mauritius" or "Stylianos Mystakidis" (other recent additions work)
  • I would prefer to have "map info boxes" in front of the big right column - but that is definitely no show stopper, as users can easily work around by dragging the map to the left.

The "navigation by filtering" could be optimized in a subsequent update:

  • going back to "Home" by unchecking all filter boxes?
  • having clicked a pie chart element, adjacent check boxes should be selectable on the following site (e. g. "English literature and linguistics" and all other topics to appear on the "Physics" filtered site)

That's my personal point of view. Please advise me, if you think some of these points a worthy a ticket (or feel free to directly create a ticket, of course).

@literarymachine literarymachine mentioned this pull request Oct 9, 2015
Closed
@literarymachine
Copy link
Contributor Author

no map content when clicking on recent additions of "Sandhya Gunness, University of Mauritius" or "Stylianos Mystakidis" (other recent additions work)

Currently for individual entries an exact position is required to display the map, just the country is not enough. So this is expected behavior, albeit one that we probably want to change.

I would prefer to have "map info boxes" in front of the big right column - but that is definitely no show stopper, as users can easily work around by dragging the map to the left.

Known issue: #165

The "navigation by filtering" could be optimized in a subsequent update:

The exact behavior of the filters is something we definitely have to discuss in detail, see #163 (comment).

literarymachine added a commit that referenced this pull request Oct 13, 2015
@literarymachine
Merge pull request #399 from hbz/integration
d4ba970 
Integration
@literarymachine literarymachine merged commit d4ba970 into master Oct 13, 2015
@literarymachine literarymachine deleted the integration branch November 11, 2015 16:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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
4 participants
@literarymachine @philboeselager @acka47 @j0hj0h