litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4829 commits 9 branches 0 tags 258 MiB
Commit graph

4829 commits

This branch
This branch
All branches
Author SHA1 Message Date
j2blake
6901a67670 VIVO-10 Add the ability to associate a DataGetter with a Freemarker template. 2013-01-15 12:59:58 -05:00
j2blake
caf16c392b NIHVIVO-4011 Create the I18n framework for multi-language support. 2013-01-09 18:16:37 -05:00
j2blake
885bbabdae Use developer.defeatFreemarkerCache=true 
Previously was Environment.build=development
 2013-01-09 12:59:31 -05:00
Jim Blake
21e9698df2 Merge pull request #1 from drspeedo/develop 
upgrade apache solr from 3.1 to 3.6.2
 2013-01-09 08:05:50 -08:00
Stephen V. Williams
28be94dd16 upgrade apache solr from 3.1 to 3.6.2 2013-01-08 14:02:42 -07:00
hudajkhan
28ce7ce277 For JIRA issue NIHVIVO-4026, checking query model resource is not null before accessing it 2013-01-07 17:35:00 -05:00
hudajkhan
4c4334d6f4 updating edit request dispatch controller to utilize edit configuration generator from session if it exists 2012-12-03 17:10:25 -05:00
hudajkhan
1d880ea29d enable default object property form to calculate range options based on all vclasses for subject 2012-11-29 15:27:48 -05:00
brianjlowe
cd7fe20cac Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 
um, just mergin' in the remote changes before a push?
 2012-11-27 12:59:16 -05:00
brianjlowe
6f2bda9178 added GRAPH-less pattern to type query in IndividualSDB to support triple stores that supply inferences in the unnamed graph 2012-11-27 12:57:13 -05:00
hudajkhan
1f8a534819 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2012-11-16 17:10:09 -05:00
hudajkhan
eea4681c60 Updates to DateTimeValueGenerator to allow it to be extended into subclasses for other predicates 2012-11-16 17:09:21 -05:00
j2blake
1e5d954de4 Add the amplify JavaScript file to known_exceptions 2012-11-16 16:28:54 -05:00
tworrall
11a83c4c1c Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 
I haven't a clue what git is trying to do. I kind of miss svn at this point.
 2012-11-16 16:02:47 -05:00
tworrall
870db77408 Changes to support collapsible/expandable property groups on the profile pages. 2012-11-16 16:00:16 -05:00
tworrall
c9a27d7f11 Changes to support collapsible/expandable property groups on the profile pages. 2012-11-16 15:56:18 -05:00
j2blake
81b0b2c145 NIHVIVO-3940 remove the implementation of /individual/prefix/localname 
This has been broken since before release 1.3 and nobody has missed it.
 2012-11-15 14:28:22 -05:00
j2blake
4422fd07b9 NIHVIVO-4017 Get the Application Bean from the context WebappDaoFactory 
Since this was caught by a filter, the request is not likely to have
a WebappDaoFactory in it.
 2012-11-15 12:01:47 -05:00
j2blake
24a5784110 NIHVIVO-4017 Always get the ApplicationBean from the DAO. 
Don't store the ApplicationBean in the request or in the context, and
don't look for it there.
 2012-11-15 11:43:19 -05:00
j2blake
6b743f8b36 Remove intentional error - Jenkins has responded correctly. 2012-11-14 16:33:34 -05:00
j2blake
ccdd37b023 An intention compile-error to break the build 2012-11-14 16:10:54 -05:00
j2blake
e10274aaf7 NIHVIVO-4010 Log requests for invalid file-based URLs as INFO, not WARN. 
When a request comes in like /file/n1645/Ashdown_Susan_1.jpg, and either
there is no such entity, or it is not a FileBytestream, or its name is
different from requested, continue to serve the Missing Link image, but
log the error with an INFO message, not a WARN message.
 2012-11-14 11:25:17 -05:00
j2blake
d93068bdfa validateUpload.js is no longer used in Vitro, VIVO or vivoCornell 2012-11-13 17:19:45 -05:00
j2blake
b0a5961f4d Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 2012-11-09 13:24:46 -05:00
hudajkhan
f26d353b1c Adding EditRequestAJAXController to web.xml 
Also updating .gitignore so .build items don't show up
 2012-11-09 09:49:09 -05:00
hudajkhan
36fc649b7a Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2012-11-08 17:03:27 -05:00
hudajkhan
60d9c23118 Updates to enable extensions of DateTimeInterval for Datastar temporal coverage support and adding ajax mechanism for modifying edit configuration 2012-11-08 16:54:31 -05:00
j2blake
fd3111dba1 Delete unused LoginTemplateHelper classes 
LoginTemplateHelper and LoginTemplateHelperBase have been succeeded by
LoginWidget, etc.
 2012-11-02 12:25:35 -04:00
j2blake
8266b7b5c1 Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 2012-11-02 11:33:18 -04:00
j2blake
bfa37bf201 Add to the .gitignore file 2012-11-02 11:32:49 -04:00
hudajkhan
214e8ab8af Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2012-10-31 15:53:58 -04:00
hudajkhan
d192419f1c Update to enable multiple VClasses to be searched 
When searching for individuals beloging to institutional internal class,
the code was only retrieving the first Vclass Id when it needed to
retrieve both the internal class VClassId and the regular classId to
search for individuals that had both types.
 2012-10-31 15:46:15 -04:00
j2blake
89eea4deae Ignore Eclipse artifact files like .project and .classpath and /bin 2012-10-30 16:22:50 -04:00
j2blake
ac85ebf8c8 Added the README file. 2012-10-29 20:41:47 -04:00
hjkhjk54
47f37d4213 Including additional generator and field options that enable sorting individuals for an object property form by display rank annotations. 2012-10-26 20:25:43 +00:00
tworrall
aac07a1db9 added new selector for the manage lables link 2012-10-25 14:27:56 +00:00
hjkhjk54
5973e7ec4d updates to vitro that enable field options to have custom comparators - this change is being implemented for Datastar but the code will be in Vitro to enable Vitro/VIVO to take advantage of these classes. New generator and field options classes have been added. 2012-10-24 21:19:40 +00:00
stellamit
945243377b update for NIHVIVO-3998 2012-10-19 22:23:25 +00:00
j2blake
876ffeba8f 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:16 +00:00
j2blake
6bbbe69f3c NIHVIVO-3996 If a database other than MySQL fails this test, inform them but don't call it a fatal error. 2012-10-18 16:10:20 +00:00
j2blake
4d33ac93c1 NIHVIVO-3996 Add a test to see whether the database is configured to use UTF-8. 2012-10-18 15:07:07 +00:00
j2blake
7d11a24191 NIHVIVO-3995 It is important that the default namespace end in "/individual/". Important enough that it becomes part of the startup smoke tests. 2012-10-17 19:09:38 +00:00
hjkhjk54
52314c4640 Updates for adding a data getter that executes a solr query to retrieve individuals for a specific vclass and returns the results - the default template is a copy of the individual list controller template - some code refactoring also breaks out some of the individual controller methods into solr query utils for potential further reuse. 2012-10-16 20:40:02 +00:00
j2blake
8c12deacec NIHVIVO-1054 Convert the Thread instances to VitroBackgroundThread instances, so we can track when the system becomes idle. 2012-10-15 19:26:43 +00:00
j2blake
b4796c649a 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:05 +00:00
j2blake
e3db0778cb NIHVIVO-3940 If no NamespaceMapper is found in the ServletContext, log a warning message and return an empty string, instead of throwing an exception. 2012-10-08 20:20:20 +00:00
j2blake
f491a7c95c NIHVIVO-3988 Change the handling of multiple root user accounts, and remove the back-door login mechanism. 2012-10-08 16:46:31 +00:00
j2blake
2ecb46adb9 Require ant 1.8 2012-10-08 16:45:32 +00:00
tworrall
a0f18c3318 merging 10102 to the trunk 2012-10-08 14:03:14 +00:00
j2blake
6bbe466812 NIHVIVO-3982 Remove duplicate line about case-sensitivity. 2012-10-05 19:22:05 +00:00