Merge master into rtl branch #10

tfrancart · 2018-11-22T09:38:00Z

No description provided.

and superproperty of a property.

in test files.

* 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

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)

Issue 669 1

…sxl-support

#533

graph

rather than making another SPARQL query.

Issue 669 2

… to .gitignore

…osmos into vagrant-virtual-environment

…gnored. Fixes #794

…e URL from which the feedback page was invoked. Fixes #808

(cherry picked from commit 1a55e8b)

…s but is owned by another user)

Fixes #801

…s instead of 3.8.0

…uilds with PHP 7.2. Related to #758

tfrancart and others added 30 commits November 7, 2017 17:15

Merge remote-tracking branch 'upstream/master'

f63a834

Merge remote-tracking branch 'origin/master'

c38d876

Merge remote-tracking branch 'upstream/master'

8c06044

adding limited support for showing skosxl:prefLabels

10252ba

Added SPARQL query to query for super properties of a property

88beb7f

Used graph-agnostic queries through default endpoint to retrieve label

0fc6f90

and superproperty of a property.

Fixed call to Namespace.shorten(). Added types to property declarations

0448f42

in test files.

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)

Merge branch 'master' of https://github.com/tfrancart/Skosmos.git

93cb504

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

Read property label from current vocabulary before querying the default

8359d9b

graph

updating the composer dependencies before 1.10 release

02d872d

Look for property label and superproperties in the current EasyRdf Model

41f54ff

rather than making another SPARQL query.

Merge remote-tracking branch 'upstream/master'

637f917

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

pulled files from master

7c2e1f4

Issue #665 Remove SERVICE_LOGO old constant and related code

17456a2

Add Jena Fuseki to gitignore

d10c4f6

updating composer packages, related to #684

cb3abd4

Takala Joeli A and others added 29 commits August 29, 2018 15:12

Removed old config files and added references to eclipse project file…

4c302cb

… to .gitignore

Remove Fuseki deployment

4465362

Fix apt not installing php-mbstring by updating cache before apt install

4c6e2cb

Turn off verbose/debug mode for Ansible provisioner

b5c4f56

Delete .DS_Store

cdc2da6

Delete second .DS_Store

22ff557

Remove unnecessary, duplicate configuration file

1f630a2

Merge branch 'vagrant-virtual-environment' of github.com:mikipernu/Sk…

a05a54f

…osmos into vagrant-virtual-environment

Merge branch 'mikipernu-vagrant-virtual-environment'

29ce070

reorder .gitignore

811afd7

Use correct value when retrieving settings

5b2dd63

Add tests for GlobalConfig

c6fa757

Add more tests for VoacabularyConfig

65a7f5f

Use array in the test for GlobalConfig::getGlobalPlugins

269a200

Fix parameter order for jena-text queries - MAX_N setting was being i…

14b681f

…gnored. Fixes #794

Loosen the check for port numbers in guessBaseHref. Fixes #796

9bda271

removed references to old configuration files

a8ec734

Choose feedback recipient based on selection on feedback form, not th…

714ddad

…e URL from which the feedback page was invoked. Fixes #808

Fix unit test that broke after the fix to #808

0e8ed3e

(cherry picked from commit 1a55e8b)

Fix fragile unit test (may break if /tmp/skosmos-template-cache exist…

27e53ed

…s but is owned by another user)

Fix config migration of LOG_FILE_NAME=null

2634666

Fixes #801

fixes #804

ef850a7

fix some css; addresses issue #799

34a0cb5

#fixes #791; also update fuseki to 3.9.0

6fbca9e

Reenable Fuseki snapshot builds on Travis; use Fuseki2 3.9.0 on Travi…

d99ef31

…s instead of 3.8.0

Don't allow Travis builds with PHP 7.2 to fail; run Fuseki snapshot b…

8ec66f2

…uilds with PHP 7.2. Related to #758

check which locales are installed in Travis environment

f1a1626

Try to break unit tests by setting LANGUAGE=fr. Part of #816

d39361d

Always set LANGUAGE environment variable when setting LC_ALL. Fixes #816

c1f9a28

tfrancart merged commit bfc60b2 into tfrancart:issue-768-rtl Nov 22, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge master into rtl branch #10

Merge master into rtl branch #10

tfrancart commented Nov 22, 2018

Merge master into rtl branch #10

Merge master into rtl branch #10

Conversation

tfrancart commented Nov 22, 2018