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
brianjlowe
5038451685
VIVO-542 fixes bug with restriction deletion and various small improvements
2013-11-18 14:31:51 -05:00
tworrall
3a65233f1e
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-11-18 10:29:07 -05:00
tworrall
59a2cc4fe6
Merge branch 'maint-rel-1.6' into develop
2013-11-18 10:28:48 -05:00
tworrall
67cc2c81f2
VIVO-543 fix template exception
2013-11-18 10:11:12 -05:00
j2blake
018cbc1142
Merge branch 'maint-rel-1.6' into develop
...
Conflicts:
webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
2013-11-17 15:33:41 -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
0d1197b276
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:34:56 -05:00
j2blake
9fc4841bff
Merge branch 'maint-rel-1.6' into develop
2013-11-17 13:21:06 -05:00
j2blake
2064bbd7e0
VIVO-453 language filtering defaults to “false”
2013-11-17 13:20:18 -05:00
j2blake
2da989809f
Merge branch 'maint-rel-1.6' into develop
2013-11-17 12:58:09 -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
j2blake
4d33dd4287
VIVO-541 First cut at the developer panel.
2013-11-17 11:50:06 -05:00
hudajkhan
ef33013abb
Merge branch 'maint-rel-1.6' into develop
2013-11-15 12:33:57 -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
c8b3238e71
Merge branch 'maint-rel-1.6' into develop
2013-11-14 17:06:09 -05:00
