Commit graph

3484 commits

Author SHA1 Message Date
brianjlowe
a05c7be2d6 removed obsolete GRAPH reference in doc/list_view_configuration_guidelines.txt 2013-02-12 16:39:03 -05:00
tworrall
1c56f8cd47 minor js change for multi view support 2013-02-12 11:00:39 -05:00
tworrall
c1a6637d87 removed unnecessary variable reference to individualLocalName 2013-02-12 09:52:45 -05:00
tworrall
3b50b82f2e Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
Changes for multi view support. See commit message.
2013-02-11 16:18:58 -05:00
tworrall
867370adb9 more refactoring for multiple profile view support 2013-02-08 16:18:01 -05:00
j2blake
47875673a2 Clean up web.xml and create a unit test to keep it clean.
VIVO-19
2013-02-04 17:23:22 -05:00
tworrall
0faa3630c2 minor selector changes based on new optional profile views 2013-02-04 12:56:30 -05:00
tworrall
892e6cd49c minor update to sparkline template 2013-01-31 15:32:22 -05:00
tworrall
9cde935cc7 multiple updates and new files to support multiple foaf person profile pages 2013-01-31 11:15:48 -05:00
j2blake
3b051ecffd VIVO-11 Add delimiters to Freemarker templates
If enabled by an option in runtime.properties
2013-01-25 16:29:30 -05:00
j2blake
a3bd67097b VIVO-12 NIHVIVO-4011 Provide config and GUI for selecting Locale 2013-01-24 16:14:45 -05:00
j2blake
89f759fcbc VIVO-2 Modify the build so installers can create a container-neutral VIVO.
Split deploy.properties into build.properties and runtime.properties, with runtime.properties going into the Vitro home directory. Modify ConfigurationProperties to locate the Vitro home directory, either by System property or JNDI Environment variable, or from build.properties, and to read from both build.properties and runtime.properties. Revise the install and upgrade documents for VIVO and Vitro. Change comments and error messages that referred to deploy.properties by name.
2013-01-16 14:52:35 -05:00
j2blake
aab76220c7 NIHVIVO-4011 Create a utility scanner that will look for I18n problems in templates and properties files. 2013-01-15 15:37:53 -05:00
tworrall
912a063a4b removed call to IndividualsViaVClassOptions for autocomplete fields. 2012-12-10 13:37:49 -05:00
tworrall
df86089cdd added javascript file 2012-11-27 12:57:00 -05:00
tworrall
0d8124bcbb added property group css file for this template. 2012-11-19 16:35:08 -05:00
tworrall
f0657b42ea Changes to support collapsible/expandable property groups on the profile pages. 2012-11-16 16:00:56 -05:00
j2blake
aec2299faf Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	.gitignore
2012-11-09 14:54:29 -05:00
hudajkhan
3b26fcc95f Adding .build,deploy.properties to .gitignore 2012-11-09 09:51:05 -05:00
hudajkhan
4086611ac9 Adding edit request ajax controller to web.xml 2012-11-09 09:38:13 -05:00
j2blake
f5eca974a3 Add to the .gitignore file 2012-11-02 11:29:32 -04:00
j2blake
dbfdfe742c Ignore Eclipse artifacts like /bin, .classpath and .project 2012-10-30 16:25:20 -04:00
j2blake
b7983374c7 Add README file 2012-10-29 19:44:01 -04:00
hjkhjk54
1255d4ad19 updates making method(s) public so they can be called by other generators 2012-10-29 20:57:54 +00:00
hjkhjk54
09e5504a2a making method public to allow access from different generator 2012-10-29 19:38:04 +00:00
tworrall
7a8d5d9d17 merging 4307 from the 1.5 maintenance branch 2012-10-29 16:21:28 +00:00
hjkhjk54
876bf71a74 Refactoring code for webpage management/editing generators to enabling addition of new webpage generators for data and metadata links in Datastar code. 2012-10-24 21:20:52 +00:00
hjkhjk54
fbcbaa75cb updating these two generators to include methods to return queries/etc. that can then be overridden in Datastar. The code for VIVO should still function exactly the same. 2012-10-22 21:58:10 +00:00
stellamit
117f634829 inactivating 1.5 data migration in trunk 2012-10-19 19:38:38 +00:00
j2blake
bbf7d49dae NIHVIVO-3991 Remove the files that are used to customize the Selenium IDE. Remove the saved copy of the plug-in. Modify the existing tests so they will run without the customizations to the IDE. 2012-10-18 19:57:52 +00:00
j2blake
251d7fff7a Remove the older utilities that I used to use for load testing. Replaced some time ago by those in utilities/LoadTesting 2012-10-16 19:16:29 +00:00
j2blake
1d3dc28c32 NIHVIVO-3209 Create two controllers: one will show the status of all living instances of VitroBackgroundThread (for system monitoring); the other will wait until they are idle (for Selenium tests). 2012-10-15 19:23:09 +00:00
j2blake
5293faf80b NIHVIVO-3988 Change the handling of multiple root user accounts, and remove the back-door login mechanism. 2012-10-08 16:46:44 +00:00
tworrall
1b9c1d9925 merging 4296 to the trunk 2012-10-05 17:40:45 +00:00
hlm7
09c40c4505 Holly forgot to upload one last tc1 fix... 2012-10-03 19:03:17 +00:00
tworrall
7cb608818a merging 4292 to the trunk 2012-10-03 14:41:14 +00:00
hlm7
a5ac7c1cf9 Final changes from Holly resulting from tc1... 2012-10-01 20:28:55 +00:00
hlm7
3c25074dff Holly made some more minor changes while testing tc1... 2012-10-01 19:53:05 +00:00
hlm7
7b41cd2e5b Holly made minor changes due to 1.5.1 testing... 2012-10-01 16:58:11 +00:00
j2blake
8204b8091f Merge from 1.5 branch: NIHVIVO-3977 Incorporate improvements in OpenSocial for 1.5.1. Also, make shinding_orng_tables.sql re-runnable. 2012-10-01 16:55:40 +00:00
j2blake
9920aee7c6 Merge from 1.5 branch: NIHVIVO-3977 Incorporate improvements in OpenSocial for 1.5.1. Also, make shinding_orng_tables.sql re-runnable. 2012-10-01 16:53:46 +00:00
hlm7
c40ec1f1d8 Holly made some minor corrections to test cases while testing 1.5.1 tc1... 2012-09-30 22:51:24 +00:00
hlm7
7da0cad2d1 Holly changed two test cases while testing 1.5.1. tc1. 2012-09-28 23:22:30 +00:00
brianjlowe
1b8bcb37f0 NIHVIVO03967 retraction of inferences by SimpleBridgingRule in batch mode 2012-09-21 16:37:05 +00:00
stellamit
ddeaf7d7d2 merging NIHVIVO-3937 from the 1.5 branch to the trunk 2012-09-08 17:11:55 +00:00
stellamit
6022c27ae1 merging NIHVIVO-2136 from 1.5 branch 2012-09-08 17:09:03 +00:00
j2blake
aabf529210 Merge from 1.5 branch: NIHVIVO-3954 Add OpenSocial bug fixes from Eric Meeks: make compound key in app_registry table, show sandbox login, ensure that randomly assigned Gadget ID is not negative, modify JS to find out whose page we are on. 2012-09-07 15:42:30 +00:00
tworrall
fdbd559edb merging r4268 to the trunk 2012-09-06 19:41:57 +00:00
tworrall
2a79606196 merging r4264 to the trunk 2012-08-30 20:29:24 +00:00
tworrall
c60e9f9c5e merging r4262 to the trunk 2012-08-30 19:50:42 +00:00