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
brianjlowe
99da2bc5a4
VIVO-561 faux property indication in verbose display
2013-11-20 16:48:24 -05:00
j2blake
b61f08ce51
Merge branch 'maint-rel-1.6' into develop
2013-11-20 15:55:01 -05:00
j2blake
00f3e363e5
VIVO-541 Add functions and formatting to the developer panel.
2013-11-20 15:54:37 -05:00
j2blake
d4d75932d3
Merge branch 'maint-rel-1.6' into develop
2013-11-20 11:02:41 -05:00
j2blake
1f5c34bde9
VIVO-533 Simplify the code in the template loader.
2013-11-20 11:02:12 -05:00
j2blake
2978813f2c
Merge branch 'maint-rel-1.6' into develop
2013-11-20 10:18:10 -05:00
j2blake
b6da0052ce
VIVO-548 Make unit tests independent of file separator characters.
...
By converting Strings to Paths before comparing, we should get consistent usage of “/“ and “\”. This time for sure.
2013-11-20 10:17:27 -05:00
j2blake
8547befba3
Merge branch 'maint-rel-1.6' into develop
2013-11-19 16:48:57 -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
025f2dd8ec
VIVO-548 Make unit tests independent of file separator characters.
...
By converting Strings to Paths before comparing, we should get consistent usage of “/“ and “\”
2013-11-19 15:50:44 -05:00
j2blake
5bb8a4c698
VIVO-548 Make unit tests independent of file separator characters.
...
By converting Strings to Paths before comparing, we should get consistent usage of “/“ and “\”
2013-11-19 15:49:41 -05:00
j2blake
30fa123948
Merge branch 'maint-rel-1.6' into develop
2013-11-19 15:26:28 -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
64726e21a2
Merge branch 'maint-rel-1.6' into develop
2013-11-19 13:26:02 -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
cc2ca602fa
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-11-19 13:25:21 -05:00
hudajkhan
57e99d4055
Merge branch 'maint-rel-1.6' into develop
2013-11-19 13:25:01 -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
tworrall
971b840f63
Merge branch 'maint-rel-1.6' into develop
2013-11-19 11:32:07 -05:00
tworrall
c8658eb17f
VIVO-532: temporary clean up; will explore other options post-1.6
2013-11-19 11:31:41 -05:00
tworrall
03acf023ea
Merge branch 'maint-rel-1.6' into develop
2013-11-19 10:21:24 -05:00
tworrall
2bac1e5dab
changed the background color of the panel
2013-11-19 10:20:58 -05:00
j2blake
797fae60a7
Merge branch 'maint-rel-1.6' into develop
2013-11-18 18:13:49 -05:00
j2blake
09dacc8e5a
VIVO-541 Tweaks to the .ftl and .js
2013-11-18 18:13:09 -05:00
j2blake
177b443501
Merge branch 'maint-rel-1.6' into develop
2013-11-18 17:14:03 -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
56fb7843f3
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-18 14:31:56 -05:00
