Merge amsl.technology into OntoWiki #411
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
* increase width of filter overlay
* initially use option value for filter
white-gecko
commented
Nov 21, 2016
| @@ -37,3 +37,6 @@ build/ | |||
| # vagrant stuff | |||
| Vagrantfile | |||
| .vagrant | |||
|
|
|||
| # export folder | |||
| dumps/ | |||
| url = https://github.com/amsl-project/template.ontowiki.git | ||
| [submodule "extensions/deadlinehelper"] | ||
| path = extensions/deadlinehelper | ||
| url = https://github.com/amsl-project/deadlinehelper.ontowiki.git |
There was a problem hiding this comment.
All these dependencies are replaced by composer dependencies in OntoWiki
| sh -c "$(PWD)/application/scripts/vocab.sh $(PWD)" | ||
|
|
||
| export-virtuoso: | ||
| sh -c "$(PWD)/application/scripts/export.sh $(PWD)" |
There was a problem hiding this comment.
These tasks of the Makefile are also taken over by composer.
| if (($config->lists) && $config->lists->showHeading === "true") { | ||
| $listHeading = $list->getTitle(); | ||
| } | ||
|
|
| $renderedList = $view->partial( | ||
| 'partials/list.phtml', | ||
| array( | ||
| 'listName' => $listName, | ||
| 'instances' => $list, | ||
| 'mainTemplate' => $mainTemplate, | ||
| 'other' => $other | ||
| 'other' => $other, | ||
| 'heading' => $listHeading |
| case 'csv': | ||
| $contentType = 'text/csv'; | ||
| $filename = 'query-result.csv'; | ||
| break; | ||
| } |
There was a problem hiding this comment.
This is already in the latest OntoWiki: #280
| @@ -8,15 +8,15 @@ | |||
| <div class="has-contextmenu-area" > | |||
| <h3> | |||
| <span class="name">"<?php echo $entry['name'][0]['value']; ?>"</span> | |||
| <span class="views">(<?php echo $numViews ?> views)</span> | |||
| <span class="views">(<?php echo $numViews ?> <?php echo $this->_('views'); ?>)</span> | |||
| </h3> | ||
| open with: | ||
| <?php echo $this->_('Open with:'); ?> |
| <?php | ||
| //always show link to queryeditor | ||
| $QEurl = new OntoWiki_Url(array('controller' => 'queries', 'action'=>'editor'), array()); | ||
| $QEurl->queryUri = $this->instanceUri; | ||
| ?> | ||
| <a class="minibutton" href="<?php echo $QEurl; ?>">Editor</a> | ||
| <a class="minibutton" href="<?php echo $QEurl; ?>"><?php echo $this->_('Editor'); ?></a> |
|
|
||
| $this->_response->setBody(json_encode($result)); | ||
| } | ||
| } |
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.
This Fork is not ready to be merged!
This fork is meant to get an overview on how diverged the amsl.technology branch actually is.