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

Merge V2.1 maintenance from base repository #13

Merged
merged 223 commits into from
Oct 17, 2019
Merged

Merge V2.1 maintenance from base repository #13

merged 223 commits into from
Oct 17, 2019

Conversation

tfrancart
Copy link
Owner

No description provided.

tfrancart and others added 30 commits November 7, 2017 17:15
@tfrancart
Merge remote-tracking branch 'upstream/master'
f63a834
@tfrancart
Merge remote-tracking branch 'origin/master'
c38d876
@tfrancart
Merge remote-tracking branch 'upstream/master'
8c06044
adding limited support for showing skosxl:prefLabels
10252ba
@tfrancart
Added SPARQL query to query for super properties of a property
88beb7f
@tfrancart
Used graph-agnostic queries through default endpoint to retrieve label
0fc6f90 
and superproperty of a property.
@tfrancart
Fixed call to Namespace.shorten(). Added types to property declarations
0448f42 
in test files.
@tfrancart @osma
Issue 666 - squash commits (#8)
59bc3e0 
* Added preferredVocabUri parameter to Model::guessVocabularyFromURI()

* Added preferredVocabUri parameter to Model::guessVocabularyFromURI()

* Comment just to have one additionnal commit

* Compared vocab on IDs rather than URIs

* Add the preferred vocabulary parameter when calling
guessVocabularyFromURI

* Comments
@tfrancart @osma
1. Ability to fetch and return dct:subject of ConceptSchemes in the list
7b235c5 
of Concept schemes.
2. Ability to fetch and return multiple concept schemes for which a
concept is a top concept in the parent hierarchy (new 'tops' key in the
JSON-LD result)
@tfrancart
Merge branch 'master' of https://github.com/tfrancart/Skosmos.git
93cb504
@tfrancart
Merge branch 'master' of https://github.com/NatLibFi/Skosmos.git
d4923c1
skos-xl labels should now work
5978fd5
fixing the preflabel right pad
f424cd6
fixing the unit tests
632169a
Merge pull request #670 from tfrancart/issue-669-1
d3db5de 
Issue 669 1
Merge branch 'master' of https://github.com/NatLibFi/Skosmos into sko…
0f1d785 
…sxl-support
fixing the skosxl qtips not appearing after ajaxing content, related to
0ef48fd 
#533
removing unused ?member variable, fixes #655
4e422d5
moving mapping concept notations inside the a element, related to #623
86adfd4
@tfrancart
Read property label from current vocabulary before querying the default
8359d9b 
graph
updating the composer dependencies before 1.10 release
02d872d
@tfrancart
Look for property label and superproperties in the current EasyRdf Model
41f54ff 
rather than making another SPARQL query.
@tfrancart
Merge remote-tracking branch 'upstream/master'
637f917
@tfrancart
Use locale-based sort to sort values in concept page
07c1286
Merge pull request #671 from tfrancart/issue-669-2
43d19f9 
Issue 669 2
initializing the superprops variable as an empty array
7fdcb18
@kouralex
pulled files from master
7c2e1f4
@osma
Issue #665 Remove SERVICE_LOGO old constant and related code
17456a2
@osma
Add Jena Fuseki to gitignore
d10c4f6
updating composer packages, related to #684
cb3abd4
osma and others added 29 commits November 19, 2018 12:23
@osma
Don't allow Travis builds with PHP 7.2 to fail; run Fuseki snapshot b…
8ec66f2 
…uilds with PHP 7.2. Related to #758
@osma
check which locales are installed in Travis environment
f1a1626
@osma
Try to break unit tests by setting LANGUAGE=fr. Part of #816
d39361d
@osma
Always set LANGUAGE environment variable when setting LC_ALL. Fixes #816
c1f9a28
@osma
update gitignore to match Fuseki2 directory naming (#791)
8418188
@osma
Update fi, sv UI translations for skos:relatedMatch. Fixes #707
835fd24
@joelit
support for MARC sources in REST controller
251b8d9
Merge pull request #820 from NatLibFi/fix-807-marcsource
95e0779 
support for MARC sources in REST controller
@joelit
fix updated, unit tests passed
d81ff75
Merge pull request #814 from NatLibFi/fix-813-undefined-index
7e8bbbb 
Fixes #813
@kinow @joelit
Display concept types for search
fc354b2
@kinow @joelit
Adapt code from concepts page
89a02e2
@joelit
Added the new icon and updated tooltip translations
d8c4fa9
@osma
refactor: rename function for clarity, and make it private since it's…
30ada41 
… only needed internally
@osma
Rewrite concept group handling to take into account multiple hierarch…
feb52f5 
…ical groups. Fixes #811
@osma
Fix display of array property values
92890e1
@osma
Use test-specific template cache dir to avoid permission problems. Fixes
3788c5a 
 #821
@joelit
updated translations for Finnish, Swedish and German
8e41e3b
@osma
Fix case when a concept property value is from another vocabulary. Fixes
9f114c1 
 #819
Merge pull request #827 from NatLibFi/kinow-display-concepttype-search
6995d16 
Kinow display concepttype search
@osma
Fix concept group display also in search result list. Related to #811
0abb274
@osma
Don't perform label and subPropertyOf lookups for well-known properti…
d433fe5 
…es. Part of #836

(cherry picked from commit 9de5b86)
@osma
Switch from FILTER NOT EXISTS to MINUS to avoid Jena 3.8+ performance…
8963918 
… issue. Fixes #829

(cherry picked from commit 00eabb3)
@osma
Also move the VALUES block to avoid Jena 3.8+ performance issues. Fixes
837c7fc 
#829

(cherry picked from commit 3e4884c)
@osma @joelit
Avoid second unnecessary getProperties call in search result list. Pa…
2da18a2 
…rt of #836

(cherry picked from commit 995777a)
@osma @joelit
Avoid unnecessary properties when calling getMappingProperties from s…
b37df8f 
…earch result page. Part of #836

(cherry picked from commit 50bb1a1)
@osma @joelit
Add a cache to avoid computing language order many times during a req…
be21c66 
…uest

(cherry picked from commit c10bd71)
@iltzortz @osma
Update of Fira Sans embedded fonts with newer version from https://gi…
80fbd70 
…thub.com/mozilla/Fira/tree/4.202

- related to bug #855
@joelit
Fixed function calls for getLiteral with property and lang
751cbe8 
(cherry picked from commit 499e38a)
@tfrancart tfrancart merged commit 7effbcb into tfrancart:skosmos-unesco Oct 17, 2019
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.
10 participants
@tfrancart @kinow @kouralex @semanticfire @osma @danmichaelo @henriyli @mikipernu @joelit @iltzortz