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

5721 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jim Blake
a65a9056bd Revert "getting rid of problematic file" 
This reverts commit 0e6bbcd5b7.
 2014-04-07 09:34:44 -04:00
Jim Blake
cfce2f5a5c Merge branch 'maint-rel-1.6' into develop 
Conflicts:
	utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/CommandRunnerException.java
	utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/FatalException.java
	utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/SeleniumRunnerParameters.java
	utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/datamodel/DataModel.java
	utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/output/OutputSummaryFormatter.java
 2014-04-04 16:23:57 -04:00
Jim Blake
80a23bb848 Remove this failed experiment that is causing so much problem with the repository! 2014-04-04 16:22:16 -04:00
brianjlowe
00b4260dfa Merge branch 'maint-rel-1.6' into develop 2014-04-04 16:06:54 -04:00
brianjlowe
824848323c avoiding NPEs in DataPropertyStatementDaoJena stemming from list view problems 2014-04-04 16:01:21 -04:00
hudajkhan
0e6bbcd5b7 getting rid of problematic file 2014-04-04 15:22:13 -04:00
hudajkhan
e1ad4bc21b Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2014-04-04 14:45:33 -04:00
hudajkhan
657d6f01c7 dynamic fields for Datastar 2014-04-04 14:45:15 -04:00
Jim Blake
c6bf5b6e2d Merge branch 'maint-rel-1.6' into develop 2014-04-04 12:51:36 -04:00
Jim Blake
21cc827e4e VIVO-732 Add test for DESCRIBE query 2014-04-04 12:51:09 -04:00
Jim Blake
b038902ee7 Merge branch 'maint-rel-1.6' into feature/orcid 2014-04-01 16:37:26 -04:00
brianjlowe
df5af9a7b5 Merge branch 'maint-rel-1.6' into develop 2014-03-28 15:48:10 -04:00
brianjlowe
78e8d9d276 VIVO-711 trapping for invalid URIs generated in the migration 2014-03-28 15:41:51 -04:00
j2blake
09dd8da784 Merge branch 'maint-rel-1.6' into develop 2014-03-25 15:44:59 -04:00
j2blake
0bc3f211bb VIVO-682 Modify some auth code to work better with faux properties. 2014-03-25 15:44:10 -04:00
j2blake
b1d379d03a VIVO-716 VitroHttpRequest was not properly handling the MultipartRequestWrapper 2014-03-19 16:13:38 -04:00
j2blake
912c9e964a Merge branch 'maint-rel-1.6' into develop 2014-03-13 12:17:30 -04:00
j2blake
c08ac9eda0 VIVO-682 BETTER Fix display of self-editor level properties 
Need to test for the property itself as well, because the property statement tests don't allow for faux properties.
Of course this means that a self-editing faux property will not be shown if its parent property is hidden.
 2014-03-13 12:16:09 -04:00
j2blake
6543bdb4a8 Merge branch 'maint-rel-1.6' into develop 2014-03-12 13:18:54 -04:00
j2blake
4f29ab6f5f VIVO-706 add a ObjectProperty declaration for "conceptAssociatedWith" 2014-03-12 13:16:25 -04:00
j2blake
83dd4a57e7 VIVO-705 Trim ontology URI before using. Check for URISyntaxException before using. 2014-03-12 12:46:54 -04:00
j2blake
2536b86972 Merge branch 'maint-rel-1.6' into develop 2014-03-11 16:07:39 -04:00
j2blake
63140fa91b VIVO-682 Fix display of self-editor level properties 
Can't test for authorization of a DataProperty or an ObjectProperty, because the self-editor policies need to know who the subject is.
Need to create a DataPropertyStatement or ObjectPropertyStatement with the subjectUri and test that instead.
 2014-03-11 16:02:35 -04:00
j2blake
3e15baee6e Merge branch 'maint-rel-1.6' into develop 2014-03-11 14:46:18 -04:00
j2blake
7b0ad5ec12 VIVO-689 better selection of Locales 
If there are selectable Locales, and one has been selected, then only that Locale is preferred. The browser preferences are discarded.
If there are selectable Locales, and none has been selected, then act as if the first one has been selected.
 2014-03-11 14:42:45 -04:00
j2blake
b6ad8d456c VIVO-648 Repair oversight: when rdf files were moved to the home directory, the "distribute" target didn't keep up. 2014-03-11 12:06:31 -04:00
j2blake
50e55b62ef Merge branch 'maint-rel-1.6' into develop 2014-03-10 18:15:16 -04:00
j2blake
fdeee35bb4 VIVO-692 Restrict LOD by Publish level, not by Display level 
Create a new annotation for properties and classes, HiddenFromPublishBelowRoleLevelAnnot.
Provide the means to initialize these annotations, edit them, and display them in the verbose property display.
Create a Permission and some requested actions so the policies can decide which statements must be filtered out, based on the user's role.
Add unit tests and improve acceptance tests
 2014-03-10 18:14:02 -04:00
j2blake
d932f851e9 Convert from HttpClient 3.1 to HttpClient 4.3 2014-03-05 18:32:36 -05:00
j2blake
48c679babc Make PermissionRegistry mutable, so other startup modules may add permissions. 2014-02-27 12:15:28 -05:00
j2blake
1d7812ed28 First cut of Orcid Integration is working 2014-02-26 14:58:18 -05:00
j2blake
fb63559aa6 Merge branch 'maint-rel-1.6' into develop 2014-01-15 16:43:59 -05:00
j2blake
95538e4c8a VIVO-230 Make the log messages more explicit, so we have a chance of diagnosing this. 2014-01-15 16:43:40 -05:00
j2blake
69ad4907e7 Merge branch 'maint-rel-1.6' into develop 2014-01-15 15:29:27 -05:00
j2blake
73f7604920 VIVO-673 Log throwables and re-throw them. 
If a startup module throws an error, StartupManager will catch it only long enough to write it to the log, and then re-throw it.
 2014-01-15 15:29:08 -05:00
j2blake
07de4c6163 Merge branch 'maint-rel-1.6' into develop 2014-01-15 15:17:23 -05:00
j2blake
2f68ddb8ee VIVO-672 Preserve the lazy initialization of the VClassJena. 
Instead of a copy constructor on VClass, use a copy() method, which can be overridden.
 2014-01-15 15:16:17 -05:00
j2blake
416f142526 Merge branch 'maint-rel-1.6' into develop 2014-01-09 18:25:32 -05:00
j2blake
0280cda8e3 VIVO-662 Remove duplicate rows from the SPARQL query results. 
Two rows are considered to be duplicates if they have the same authorshipURI or the same authorURI.
 2014-01-09 17:33:25 -05:00
tworrall
d95bd9019e Merge branch 'maint-rel-1.6' into develop 2014-01-07 16:22:37 -05:00
tworrall
88fbafc98b VIVO-653: implemented suggested fix 2014-01-07 16:15:27 -05:00
j2blake
54509b1aee VIVO-660 Add an Authorization tabs to the developer panel 2014-01-07 15:08:30 -05:00
j2blake
0f0cac5d35 Use JQuery to simplify some of the behavior code in the developer panel 2014-01-05 17:19:23 -05:00
j2blake
23c30a8957 Add tab structure to the developer panel 2014-01-05 17:18:37 -05:00
j2blake
245763e9e7 Make DeveloperSettings a singleton, and other improvements. 
By making it a singleton, we do need an explicit Setup operation. However, it means that we can refer to the settings in client code that doesn’t have access to a request or to the ServletContext.

Other refactorings to simplify the logic or make it more scalable.
 2014-01-04 14:22:29 -05:00
j2blake
f6bd5804d5 VIVO-224 Change USE_MISCELLANEOUS_EDITOR_PAGES to USE_INDIVIDUAL_CONTROL_PANEL 
It’s hardly miscellaneous if there’s only one page.
 2014-01-03 15:40:52 -05:00
j2blake
03dfbfc2c5 VIVO-224 Get rid of REBUILD_VCLASS_GROUP_CACHE. 
Since we build the cache from Solr, we no longer provide the option to rebuild it.
 2014-01-03 15:26:33 -05:00
j2blake
3c59098525 VIVO-224 Get rid of MANAGE_TABS permission 
It was not used, probably since we no longer have tabs.
 2014-01-03 12:44:54 -05:00
j2blake
004427855b VIVO-224 Get rid of MANAGE_PORTALS permission 
It was only used in editing the application bean, and was equivalent to EDIT_SITE_INFORMATION.
 2014-01-03 12:41:37 -05:00
j2blake
b701201c7f Merge branch 'feature/parseMultipartRequest' into develop 2013-12-20 17:13:35 -05:00