tworrall
4e216e9360
related to VIVO-628, there was no validation on the datetimeinterval form when no years are specified
2013-12-09 16:18:02 -05:00
hudajkhan
54e335a330
Merge branch 'maint-rel-1.6' into develop
2013-12-09 11:04:04 -05:00
hudajkhan
1ee2f64f13
VIVO627 submission validation for default template for multiple content types fixed to check for number of content types
2013-12-09 11:03:58 -05:00
hudajkhan
4000813044
Merge branch 'maint-rel-1.6' into develop
2013-12-06 16:44:57 -05:00
hudajkhan
b0c0c71cdb
if range uri is null, error message for null rangeVClass should not be thrown
2013-12-06 16:44:47 -05:00
hudajkhan
34e6dfc33d
Merge branch 'maint-rel-1.6' into develop
2013-12-06 11:08:47 -05:00
hudajkhan
3aca74a7ee
VIVO610 when range uri exists but doesn't have corresponding vclass, show error message with option to go back to individual profile
2013-12-06 11:08:14 -05:00
hudajkhan
b69a0321f4
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-12-06 10:12:30 -05:00
j2blake
c95c812c1d
Merge branch 'maint-rel-1.6' into develop
2013-12-05 16:37:18 -05:00
j2blake
d08c3f61ff
VIVO-618 Revise SearchService to parse uploaded files correctly and to respond properly to authentication errors.
2013-12-05 16:36:26 -05:00
hudajkhan
05be6f36bc
Merge branch 'maint-rel-1.6' into develop
2013-12-05 16:21:34 -05:00
hudajkhan
0944a0d883
updates for page management issues vivo622 and 616
2013-12-05 16:20:55 -05:00
brianjlowe
b422d7a84a
Merge branch 'maint-rel-1.6' into develop
2013-12-05 16:07:16 -05:00
brianjlowe
89d4fc9228
union domains on data property pages
2013-12-05 16:06:42 -05:00
brianjlowe
7b1b41eb17
Merge branch 'maint-rel-1.6' into develop
2013-12-05 14:58:20 -05:00
brianjlowe
8ab6d229a6
VIVO-623 unión domains and ranges on object property displays
2013-12-05 14:57:31 -05:00
brianjlowe
6637a54252
Merge branch 'maint-rel-1.6' into develop
2013-12-04 16:34:38 -05:00
brianjlowe
d2792db057
VIVO-614 faster model reconciliation in ABoxRecomputer
2013-12-04 16:32:01 -05:00
hudajkhan
7bc0863a37
Merge branch 'maint-rel-1.6' into develop
2013-12-04 13:31:19 -05:00
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
