Commit graph

11 commits

Author SHA1 Message Date
j2blake
5dfe858a25 Fix typos in n3 files 2013-10-07 15:34:05 -04:00
hudajkhan
16ea16b9e7 updates for page management and property deletion and seeing individual page when model is switched 2013-10-04 15:40:55 -04:00
hudajkhan
3e5c770506 updates for page management security, labels 2013-10-02 14:58:01 -04:00
Brian Caruso
e375dc33f6 Fixing type in previous commit. VIVO-63 2013-09-30 16:39:47 -04:00
Brian Caruso
dd2c9b8a7b Moving files to deal with vivo overrides. Adding permissions to pageList. VIVO-63 2013-09-30 16:30:41 -04:00
brianjlowe
90512bdc1c Merge remote-tracking branch 'origin/develop' into dev-isf
Conflicts:
	webapp/rdf/displayDisplay/everytime/displayDisplay.n3
	webapp/web/i18n/all.properties
	webapp/web/templates/freemarker/lib/lib-properties.ftl
2013-09-23 16:19:05 -04:00
j2blake
d98ddd3328 Fix problems with commit 4c42128 2013-09-10 17:44:12 -04:00
brianjlowe
6570e3dcc6 merging develop into dev-isf 2013-09-10 09:08:55 -04:00
Brian Caruso
4c42128993 Merging with issue-vivo-101-sparqlupdate. Using develop licenser files that were in conflict. VIVO-255 VIVO-101 2013-08-28 11:37:50 -04:00
j2blake
d69bb824ac VIVO-274 move permission_config.n3 to rdf/auth/everytime
Get rid of the PermissionSetsLoader, keep the smoke tests.
2013-08-27 17:26:24 -04:00
j2blake
b0e0c773c9 VIVO-248 Use /rdf instead of /rdffiles 2013-08-21 15:55:19 -04:00