brianjlowe
de05954218
ongoing work on ISF support
2013-08-27 10:33:22 -04:00
tworrall
35d136fec3
VIVO-112 ISF changes relating to custom forms and list views
2013-08-26 16:58:49 -04:00
Jim Blake
fbdbf5eb9d
Merge pull request #7 from vivo-project/feature/concept2departments
...
Feature/concept2departments
Thanks, Stephen, and thanks to Tim, for reviewing.
2013-08-26 12:25:45 -07:00
j2blake
c1801fc2a2
VIVO-4 remove the license substitution code from the license scanner
...
Now, it only scans.
2013-08-26 14:57:05 -04:00
Stephen V. Williams
4c99e948f4
Merge branch 'develop' into feature/concept2departments
2013-08-26 09:41:59 -06:00
Stephen V. Williams
957b6345e7
Merge branch 'develop' of github.com:vivo-project/VIVO into develop
2013-08-26 09:41:23 -06:00
Stephen V. Williams
2e9e64ebe9
fix links to use context appropriate title instead of 'research area' and 'organization'
2013-08-26 09:40:44 -06:00
tworrall
fe7106e22b
fixed bug that disabled tabs when navigating from the home page map while not logged in
2013-08-23 17:06:33 -04:00
tworrall
dfa1abd2ec
VIVO-263: corrected counts on map display and updated us-states.rdf file to include relationship between states and the US.
2013-08-23 16:30:04 -04:00
tworrall
621be26e73
VIVO-263: corrected counts on map display and updated us-states.rdf file to include relationship between states and the US.
2013-08-23 16:27:10 -04:00
brianjlowe
43d92a8cd8
VCard migration (in progress)
2013-08-23 11:03:04 -04:00
brianjlowe
0312ebd448
ISF filegraph improvements
2013-08-23 11:02:39 -04:00
hudajkhan
706e0ae1c1
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
...
Conflicts:
.gitignore
2013-08-22 15:54:37 -04:00
hudajkhan
e3dc0e4dfc
updates for preprocessor
2013-08-22 15:49:28 -04:00
hudajkhan
0511404a47
updates to remove errant file and updates for adding concept
2013-08-22 15:48:56 -04:00
Stephen V. Williams
3f723dcb27
Merge branch 'develop' of github.com:vivo-project/VIVO into develop
2013-08-21 20:53:14 -06:00
Stephen V. Williams
27a1c1a542
add reverse links to on the details pages for dept-subjArea and subjArea-dept
2013-08-21 20:47:21 -06:00
Stephen V. Williams
76238887b1
added departments to concept page based on researcher selecting concept as research area
...
* 4 new files for handling the new linkage (individual--skos-concept.ftl, individual-affiliated-departments.ftl, individual-affiliated-dept-details.ftl, vivoConceptDataGetters.n3)
* added invdividual--skos-concept.ftl to the skos:Concept definition in vivo-core-1.5-annotations.rdf
* added i18n entries for the new ftl pages
2013-08-21 16:48:01 -06:00
j2blake
e97d2259e8
VIVO-248 Describe RDF changes in upgrade document
2013-08-21 17:16:28 -04:00
brianjlowe
3230186415
in-process update of TBox filegraphs for latest ISF
2013-08-21 16:25:17 -04:00
j2blake
d084e9620d
Accidentally committed catalog-v001.xml
2013-08-21 16:16:48 -04:00
j2blake
5f7bbc6799
VIVO-248 Use /rdf instead of /rdffiles
2013-08-21 15:55:07 -04:00
brianjlowe
7eb6f92d69
improvements to ISF filegraphs
2013-08-21 11:44:16 -04:00
j2blake
37c35468ca
VIVO-248 Move more RDF files into the home directory
...
Files for initializing the display, displayTbox and displayDisplay models. Also restructure the RDFFilesLoader.
2013-08-21 11:27:41 -04:00
j2blake
71ce2beffc
VIVO-248 Move more RDF files into the home directory
...
Files for initializing the TBOX, ABOX, ApplicationMetadata and UserAccounts models.
2013-08-20 17:14:09 -04:00
brianjlowe
12b384f5eb
changing bearerOf/inheresIn in diff.tab.txt to use the RO URIs instead of BFO2 URIs
2013-08-20 16:54:09 -04:00
brianjlowe
0e92596459
removing unneeded bfo file from file graphs
2013-08-20 15:45:01 -04:00
j2blake
ca951c6bf3
VIVO-248 Move filegraph RDF files into the home directory
2013-08-20 15:26:09 -04:00
brianjlowe
1d5864809c
update to add publication generator to deal with generic Relationship properties
2013-08-19 15:24:55 -04:00
tworrall
55a4d1dc35
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
2013-08-19 14:52:19 -04:00
tworrall
e5df3b70ba
another minor correction to the text
2013-08-19 14:52:03 -04:00
hudajkhan
4b52ccd687
updates to remove debugging statements, etc.
2013-08-13 15:26:57 -04:00
hudajkhan
6ea7d9ef37
adding licence to classes, removing sparql feed related classes
2013-08-13 12:23:49 -04:00
hudajkhan
ad0ae3c09a
updates for semantic services, temporarily commenting out concept semantic type which is still in progress
2013-08-12 13:09:04 -04:00
hudajkhan
a728d53c22
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
2013-08-12 11:22:34 -04:00
brianjlowe
ed71f74e10
continued work on ISF conversion and data migration
2013-08-09 16:24:08 -04:00
j2blake
1c9f9f5f1a
VIVO-246 Re-implement the FreemarkerConfiguration
...
The Configuration must contain mutable information like the theme directory and the TemplateLoader. It must also be request-specific so it can have the correct Locale for language support. But we should only have one instance, so there is only one TemplateCache (alternatively, one TemplateCache per theme).
Previously, this was addressed by intercepting the Template processing and adding the request-based info to the Environment. However, this interception code needed to appear each time a Template was processed. This was sometimes overlooked, and at best introduced a bunch of duplicated code.
Instead, I extended the freemarker Configuration class to include a ThreadLocal that holds request-specific information.
2013-08-08 13:23:40 -04:00
hudajkhan
0f64658c5e
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
2013-08-08 12:25:31 -04:00
hudajkhan
2ea474b6ef
External vocabulary service and integration of Agrovoc with work beginning for applying concept semantic type to UMLS concepts.
2013-08-07 16:08:11 -04:00
tworrall
6950aab59c
fixed a typo
2013-08-07 15:02:42 -04:00
brianjlowe
a8f1bfcf15
working on converting position editing to ISF
2013-08-07 13:47:17 -04:00
brianjlowe
c162d3d84b
position form updates for ISF
2013-08-06 16:55:15 -04:00
brianjlowe
afedf991f2
in-process conversion of position rendering to ISF
2013-08-06 16:23:44 -04:00
brianjlowe
f30917d357
Merge remote-tracking branch 'origin/develop' into dev-isf
2013-08-06 11:06:35 -04:00
brianjlowe
cd3ae0d0ad
publication form updates for ISF
2013-08-06 10:35:13 -04:00
brianjlowe
4598aae578
work in progress on data migration and related changes for ISF properties
2013-08-05 16:46:25 -04:00
tworrall
be11fc589f
VIVO-208: all fields now displayed when custom forms are rendered; customized 2-stage forms will still work as before
2013-08-05 14:57:59 -04:00
j2blake
9fda9d2922
VIVO-235 Improve build instructions.
...
Tell the user what to expect when they run "ant all", and how to distinguish success from failure.
2013-08-01 17:18:17 -04:00
brianjlowe
5fad9b85fa
initial example file of application configuration for property/class combination
2013-07-24 17:04:30 -04:00
brianjlowe
087e33f137
person subtypes for 1.6
2013-07-24 16:38:45 -04:00
