Skosmos with domains single #2
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Squashed commit of the following: commit 06f5f7a Author: CLARVIE <clarvie-edouard.yetikoua@sparna.fr> Date: Mon Oct 30 12:03:56 2017 +0100 _ commit adf4cb8 Author: CLARVIE <clarvie-edouard.yetikoua@sparna.fr> Date: Mon Oct 30 11:40:25 2017 +0100 add a new key "tops" which contains the array of top concepts commit 7dfa174 Merge: 189e074 e4c7e61 Author: CLARVIE <clarvie-edouard.yetikoua@sparna.fr> Date: Fri Oct 20 09:32:23 2017 +0200 Merge branch 'skosmosWithDomain' of https://github.com/tfrancart/Skosmos into skosmosWithDomain commit 189e074 Author: CLARVIE <clarvie-edouard.yetikoua@sparna.fr> Date: Fri Oct 20 09:20:03 2017 +0200 Revert "adding timeline of concept versions" This reverts commit c24a834. commit 533b276 Author: CLARVIE <clarvie-edouard.yetikoua@sparna.fr> Date: Thu Oct 19 17:48:09 2017 +0200 Revert "Merge branch 'skosmosWithDomain' of https://github.com/tfrancart/Skosmos into skosmosWithDomain" This reverts commit 3f5e3a1, reversing changes made to c24a834. commit 4b1e306 Author: Thomas Francart <thomas.francart@sparna.fr> Date: Thu Oct 19 09:40:02 2017 +0200 Fixed typo commit 26947ea Author: Thomas Francart <thomas.francart@sparna.fr> Date: Thu Oct 19 09:23:25 2017 +0200 Cleaning, remove logs, rename variables and files in english commit e4c7e61 Author: CLARVIE <clarvie-edouard.yetikoua@sparna.fr> Date: Thu Oct 19 17:48:09 2017 +0200 Revert "Merge branch 'skosmosWithDomain' of https://github.com/tfrancart/Skosmos into skosmosWithDomain" This reverts commit 3f5e3a1, reversing changes made to c24a834. commit 3f5e3a1 Merge: c24a834 d36fc2d Author: CLARVIE <clarvie-edouard.yetikoua@sparna.fr> Date: Thu Oct 19 16:28:07 2017 +0200 Merge branch 'skosmosWithDomain' of https://github.com/tfrancart/Skosmos into skosmosWithDomain commit c24a834 Author: CLARVIE <clarvie-edouard.yetikoua@sparna.fr> Date: Thu Oct 19 16:27:27 2017 +0200 adding timeline of concept versions commit d36fc2d Author: Thomas Francart <thomas.francart@sparna.fr> Date: Thu Oct 19 09:40:02 2017 +0200 Fixed typo commit 595415c Author: Thomas Francart <thomas.francart@sparna.fr> Date: Thu Oct 19 09:23:25 2017 +0200 Cleaning, remove logs, rename variables and files in english commit 0c62bb0 Author: CLARVIE <clarvie-edouard.yetikoua@sparna.fr> Date: Thu Oct 12 12:35:49 2017 +0200 access to the hierarchy of a concept select in the list while taking into account the case where there is a domain or not and the case where there is one or more top concept commit e6a4b6d Author: CLARVIE <clarvie-edouard.yetikoua@sparna.fr> Date: Wed Oct 11 11:53:13 2017 +0200 adding domain in the hierarchy
domain nodes before non-domain nodes
https://github.com/tfrancart/Skosmos.git into skosmosWithDomains-single Conflicts: controller/RestController.php resource/js/hierarchy.js
https://github.com/tfrancart/Skosmos.git into skosmosWithDomains-single Conflicts: controller/RestController.php
Fixed test to assert tops (plural) instead of 'opt' (singular) Deleted wrong test
…art/Skosmos into skosmosWithDomains-single
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.