hudajkhan
5e369a751f
new versions of jar files for sparql query json ld also used in vivo semantic search
2013-12-04 13:31:05 -05:00
tworrall
95c90572e4
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-12-04 13:10:41 -05:00
tworrall
8144bf0516
Trying to amend this commit.
...
no changes but for some reason git is forcing me to commit this in order to do a pull.
2013-12-04 13:02:06 -05:00
hudajkhan
6e330a89db
Merge branch 'maint-rel-1.6' into develop
2013-12-04 11:47:02 -05:00
hudajkhan
95d7f28259
vivo610 when rangeUri empty ensure error does not occur for adding new object of type
2013-12-04 11:46:44 -05:00
hudajkhan
0b33cd0baf
Merge branch 'maint-rel-1.6' into develop
2013-12-03 13:40:05 -05:00
hudajkhan
1abbdfc86d
vivo-608 only display classes that are part of classgroup in type dropdown
2013-12-03 13:39:53 -05:00
hudajkhan
fbad14a4cf
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-12-03 13:07:11 -05:00
brianjlowe
28f70897c8
Merge branch 'maint-rel-1.6' into develop
2013-12-02 16:27:05 -05:00
brianjlowe
345f713f0d
Merge commit '495982ddab1b22ff1c5e49ae5acece7c4cc699e8' into develop
2013-12-02 16:23:54 -05:00
brianjlowe
eebbaba3ca
VIVO-604 getting rid of ExternalIdRetryController
2013-12-02 16:23:10 -05:00
brianjlowe
e822dfb3dc
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-12-02 15:55:27 -05:00
brianjlowe
21e2ae264b
fix line ending problem
2013-12-02 15:54:30 -05:00
brianjlowe
495982ddab
fixes bug that caused misrendering of certain restrictions on vclass edit page
2013-12-02 15:38:37 -05:00
hudajkhan
d30fb357bf
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-12-02 11:55:58 -05:00
hudajkhan
de93fd4f3e
problem with line end character
2013-12-02 11:55:29 -05:00
j2blake
1b1f772a44
Merge branch 'maint-rel-1.6' into develop
2013-12-01 19:33:16 -05:00
j2blake
356e86de70
VIVO-581 Don’t check for “regular files”, just check for “not directory”.
2013-12-01 19:32:43 -05:00
j2blake
f981fd2c53
VIVO-588 Fixed a typo to fix the deadlocked threads.
2013-12-01 19:30:57 -05:00
j2blake
180f0436be
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-11-26 18:02:16 -05:00
j2blake
80130c14f1
Fast forward the changes to develop
2013-11-26 17:58:50 -05:00
j2blake
62f9ed6d39
Merge branch 'maint-rel-1.6' into develop
2013-11-26 16:04:02 -05:00
j2blake
60102fbf28
VIVO-530 Adjust SPARQL Update API
2013-11-26 16:02:52 -05:00
j2blake
09ee9fc0df
Merge branch 'maint-rel-1.6' into develop
2013-11-26 10:23:18 -05:00
j2blake
27c8d4410e
VIVO-530 Fix logic bug in authorization
...
Required actions from the DataGetters were being ignored.
2013-11-26 10:22:37 -05:00
brianjlowe
474cbcb1c4
Merge branch 'maint-rel-1.6' into develop
2013-11-25 16:18:11 -05:00
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
ac82e2d043
Merge branch 'maint-rel-1.6' into develop
2013-11-25 12:32: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
45c2d8e5e3
Merge branch 'maint-rel-1.6' into develop
2013-11-25 11:49:51 -05:00
j2blake
0b43a44097
VIVO-522 fix memory leak in FreemarkerConfigurationImpl
2013-11-25 11:48:11 -05:00
tworrall
e4023f2e76
Merge branch 'maint-rel-1.6' into develop
2013-11-25 10:51:50 -05:00
tworrall
757d643f2d
fix cross browser console issue
2013-11-25 10:51:25 -05:00
brianjlowe
72cf6f0e7b
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-11-25 10:45:35 -05:00
brianjlowe
d8769df306
Merge branch 'maint-rel-1.6' into develop
2013-11-25 10:45:10 -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
547d7d04be
Merge branch 'maint-rel-1.6' into develop
2013-11-22 15:45:10 -05:00
j2blake
98f231a863
VIVO-541 Add links to the developer panel.
2013-11-22 15:44:28 -05:00
j2blake
63ca6c86e9
Merge branch 'maint-rel-1.6' into develop
2013-11-22 13:47:33 -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
tworrall
eedc6215f4
Merge branch 'maint-rel-1.6' into develop
2013-11-22 12:49:29 -05:00
tworrall
9efd0d45aa
hasResearchAreas was not displaying the manage icon
2013-11-22 12:49:15 -05:00
brianjlowe
cfea538cea
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-21 16:14:37 -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
tworrall
664b472204
Merge branch 'maint-rel-1.6' into develop
2013-11-21 10:31:50 -05:00
tworrall
7804040e97
VIVO-561
2013-11-21 10:31:22 -05:00
j2blake
a35afb3151
Merge branch 'maint-rel-1.6' into develop
2013-11-20 17:07:38 -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
