brianjlowe
b0c4ad4e4a
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-25 16:17:24 -05:00
brianjlowe
0e2ae52c5a
fixes duplication bug when a faux has the same label as its "parent"
2013-11-25 16:17:19 -05:00
j2blake
70298026ea
Reduce warning messages in unit tests.
...
We get a warning on any attempt to use anything that may be affected by DeveloperSettings, because DeveloperSetting tries to use ConfigurationProperties to find its properties file. We could avoid this by requiring the use of a ConfigurationPropertiesStub, but it seems to make more sense to routinely create a DeveloperSettingsStub on each ServletContextStub.
2013-11-25 12:31:51 -05:00
j2blake
0b43a44097
VIVO-522 fix memory leak in FreemarkerConfigurationImpl
2013-11-25 11:48:11 -05:00
brianjlowe
2df39c9e24
change to PropertyGroupTemplateModel to prevent drawing meaningless headers when a DataProperty is not visible or editable
2013-11-25 10:42:32 -05:00
j2blake
04f9d98399
VIVO-568 Exclude individuals whose most specific type is a Vitro term
...
It looks like this was the intent of ExcludeNonFlagVitro, but it was getting the VClasses of the individual, which filtered out things like PropertyGroup, ClassGroup, etc. Changed it to test the most specific types instead, which seems to be right.
2013-11-22 13:46:32 -05:00
brianjlowe
11d766ba34
VIVO-564 reimplemented RDFServiceSparql.sparqlSelectQuery() using direct HttpClient calls instead of using Jena's stuff
2013-11-21 16:14:26 -05:00
j2blake
3bca31ea14
VIVO-541 Rearrange the links on the site admin page.
2013-11-20 17:06:48 -05:00
brianjlowe
216b1ac6eb
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-20 16:48:30 -05:00
brianjlowe
99da2bc5a4
VIVO-561 faux property indication in verbose display
2013-11-20 16:48:24 -05:00
j2blake
00f3e363e5
VIVO-541 Add functions and formatting to the developer panel.
2013-11-20 15:54:37 -05:00
j2blake
1f5c34bde9
VIVO-533 Simplify the code in the template loader.
2013-11-20 11:02:12 -05:00
j2blake
b3c5892679
VIVO-541 Add a link on the Site Admin page to activate the developer panel.
2013-11-19 16:45:13 -05:00
j2blake
cd0cb50798
VIVO-533 When loading properties files, mimic the language filtering of the RDFService.
2013-11-19 15:25:43 -05:00
brianjlowe
4e9e4216da
removing a mention of vivo from vitro
2013-11-19 13:29:32 -05:00
brianjlowe
7057b40931
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-19 13:29:01 -05:00
brianjlowe
5212b29e50
ensuring that inverse gets deleted when forward property gets deleted
2013-11-19 13:28:54 -05:00
hudajkhan
319c495617
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-19 13:25:46 -05:00
hudajkhan
d5fa8b0613
enable type dropdown to have subclasses for new individual page,prevent template errors if no addurl for property, show edit link if only one label and no locales
2013-11-19 13:24:50 -05:00
j2blake
09dacc8e5a
VIVO-541 Tweaks to the .ftl and .js
2013-11-18 18:13:09 -05:00
j2blake
818962d0a6
VIVO-533 When loading templates, mimic the language filtering of the RDFService.
2013-11-18 17:13:09 -05:00
brianjlowe
19f2d14b5f
performance tweak in ABoxRecomputer
2013-11-18 15:28:56 -05:00
brianjlowe
5038451685
VIVO-542 fixes bug with restriction deletion and various small improvements
2013-11-18 14:31:51 -05:00
j2blake
d0458047cb
VIVO-552 Reduce “memory leak” messages at shutdown.
...
Back out the changes - locks up on the develop branch.
2013-11-17 15:27:24 -05:00
j2blake
ebe1e1430e
VIVO-552 Reduce “memory leak” messages at shutdown.
...
Tomcat also complains if the VALUE of a ThreadLocal is an instance of a class that is defined in the Webapp. So even though the key type was HttpServleetRequest, some of the values were VitroRequest objects. Refactor so the value is the hash code of the request.
2013-11-17 13:35:18 -05:00
j2blake
2064bbd7e0
VIVO-453 language filtering defaults to “false”
2013-11-17 13:20:18 -05:00
j2blake
4619571f12
VIVO-552 Reduce “memory leak” messages at shutdown.
...
ThreadLocal stores objects in the threads. If the key type of the ThreadLocal is a class that is specific to the webapp, then that class cannot be unloaded when the app is shutdown, unless the threads themselves are garbage-collected. By using HttpServletRequest as the key to the ThreadLocal, that should be avoided.
2013-11-17 12:56:57 -05:00
j2blake
bfa274528c
Reduce chatter in the log on startup.
2013-11-17 12:54:29 -05:00
j2blake
0fce9f6a7b
VIVO-541 First cut at the developer panel.
2013-11-17 11:52:18 -05:00
hudajkhan
35251e89f4
enable check for creating new individual to get faux property information correctly
2013-11-15 12:33:47 -05:00
j2blake
d3f6af6981
VIVO-523 Change the way the example language files are presented.
2013-11-14 17:05:04 -05:00
hudajkhan
815215fbd7
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-11 18:28:30 -05:00
hudajkhan
769b53e919
Updates to enable deletion of object individuals for vcard editing
2013-11-11 18:28:11 -05:00
brianjlowe
fc90df70f3
VIVO-511 allowing only 1 complete migration
2013-11-11 16:03:46 -05:00
j2blake
5d19e746e1
VIVO-469 run the URL Finders from an RDFService, not an OntModel
2013-11-11 09:41:46 -05:00
j2blake
5af822f7ab
VIVO-469 print progress messages while looking for URIs to re-index.
2013-11-11 09:41:36 -05:00
brianjlowe
1e60661a00
VIVO-510 fixes bug with spanish labels appearing on populated faux properties
2013-11-08 12:29:08 -05:00
brianjlowe
8185b04ea0
VIVO-503 add a null pointer check
2013-11-07 12:49:41 -05:00
brianjlowe
690072d00d
VIVO-502 fix bugs in editable property merge
2013-11-07 11:29:36 -05:00
brianjlowe
5b6e86ab01
VIVO-500 property deletion updates for faux props
2013-11-06 17:29:19 -05:00
j2blake
bc0cf6be63
VIVO-483 Obsolete VIVO URIs in Vitro search code.
...
Break out the mechanism for building a list of Additional URI Finder instances. Override that in VIVO. Move AdditionalURIsForContextNodes to VIVO. References to obsolete URIs are in comments.
2013-11-06 13:07:08 -05:00
brianjlowe
725b2e7a57
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-06 12:46:18 -05:00
brianjlowe
85e9e16659
supporting stub deletion annotation in faux properties
2013-11-06 12:45:59 -05:00
j2blake
98f80dfd71
VIVO-483 Adjust indexing code for the ISF
...
This class should not have been in Vitro, since it uses VIVO URIs and is never referenced in Vitro. Also, it needed updating to match the ISF.
2013-11-06 12:26:59 -05:00
j2blake
171f47d392
Merge branch 'maint-rel-1.6' of git+ssh://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-06 11:45:17 -05:00
j2blake
7f67b1b7da
VIVO-495 fix bug in query-binding code.
2013-11-06 11:43:33 -05:00
brianjlowe
c2e8541732
fixes bug retrieving property inverses
2013-11-06 11:03:17 -05:00
brianjlowe
9914d3e4b9
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-06 11:02:39 -05:00
brianjlowe
b276cd5049
VIVO-499 fixes bug in deduping applicable properties
2013-11-06 11:02:33 -05:00
j2blake
ef25ee4dd6
Make it easier to monitor the ABoxReasoner thread.
2013-11-06 09:23:43 -05:00
