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

1277 commits

Author SHA1 Message Date
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
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
c8658eb17f VIVO-532: temporary clean up; will explore other options post-1.6 2013-11-19 11:31:41 -05:00
tworrall
2bac1e5dab changed the background color of the panel 2013-11-19 10:20:58 -05:00
j2blake
09dacc8e5a VIVO-541 Tweaks to the .ftl and .js 2013-11-18 18:13:09 -05:00
tworrall
67cc2c81f2 VIVO-543 fix template exception 2013-11-18 10:11:12 -05:00
j2blake
0fce9f6a7b VIVO-541 First cut at the developer panel. 2013-11-17 11:52:18 -05:00
hudajkhan
35251e89f4 enable check for creating new individual to get faux property information correctly 2013-11-15 12:33:47 -05:00
tworrall
41664dbce0 convert display name checks to a rangeUri check 2013-11-13 12:26:25 -05:00
hudajkhan
89354b4520 in case domain uri, range uri, and customDeleteObjectUri do not exist, the template should not throw an error 2013-11-12 08:56:15 -05:00
hudajkhan
815215fbd7 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-11-11 18:28:30 -05:00
hudajkhan
769b53e919 Updates to enable deletion of object individuals for vcard editing 2013-11-11 18:28:11 -05:00
tworrall
bf8e2b4778 editLink macro was referencing displayNames rather than rangeURIs 2013-11-11 15:29:40 -05:00
tworrall
68d1129114 VIVO-514 2013-11-08 17:13:07 -05:00
brianjlowe
5b6e86ab01 VIVO-500 property deletion updates for faux props 2013-11-06 17:29:19 -05:00
hudajkhan
cbd65f8639 breaking search portion of page out to include in jsp pages 2013-11-04 11:58:58 -05:00
tworrall
01872dfde3 VIVO-435 2013-11-03 17:13:46 -05:00
tworrall
8e61b7d874 VIVO-463 2013-11-01 11:41:00 -04:00
j2blake
5a8f09352d VIVO-443 Use language-specific templates to create email 
For some reason, the password-reset template was too long to do proper substitution on the last line. Removing some of the intermediate content fixed the problem, but without appropriate content. I had been unhappy with the @@file approach anyway, so I went back to language-specific templates for each type of message.
 2013-10-29 17:19:51 -04:00
tworrall
4ce41fb6ed VIVO-397 2013-10-23 13:11:46 -04:00
hudajkhan
271c1e9063 updates for cancel link to accept parameter vivo-393 2013-10-22 14:11:11 -04:00
brianjlowe
bdaa8393ae Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-16 16:16:39 -04:00
brianjlowe
a2451984c2 VIVO-376 picklist sorting 2013-10-16 16:16:34 -04:00
tworrall
4e851d0c35 VIVO-372: check the domainUri to correctly display the manage icon 2013-10-16 15:53:44 -04:00
tworrall
e33070b3a8 VIVO-359 and VIVO-345 2013-10-14 16:29:01 -04:00
hudajkhan
29f41f61c7 adding solr data getter and some other changes 2013-10-14 15:46:47 -04:00
tworrall
da1ea283ba VIVO-313: vcards for organizations 2013-10-11 14:35:50 -04:00
tworrall
75603a25a1 VIVO-337: css change to prevent cutoff 2013-10-10 16:29:24 -04:00
tworrall
30b0844a1d VIVO-341: new custom form et all for preferred title 2013-10-10 14:53:01 -04:00
tworrall
aa72757cb8 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-10 14:51:45 -04:00
hudajkhan
51cdc922a2 adding ability to specify page permissions through page management 2013-10-10 14:24:54 -04:00
tworrall
bcdacf916c fixed i18n string error 2013-10-10 10:17:06 -04:00
j2blake
c9248b1f81 VIVO-333 External-auth login button should be language-sensitive. 
Don't specify the text in the runtime.properties. Instead, get it from all.properties. Show the button if externalAuth.netIdHeaderName is specified.
 2013-10-09 16:38:14 -04:00
brianjlowe
e2c48e65f9 VIVO-303 picklist sorting 2013-10-08 14:33:38 -04:00
hudajkhan
7c3c8f6c4e bugs in n3 files and manage labels logic when there are no labels (e.g. on individual page profile) 2013-10-07 17:26:34 -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
4b0961b074 removing second license line 2013-10-02 15:20:35 -04:00
hudajkhan
61b0f5d9ea Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-02 14:58:15 -04:00
hudajkhan
3e5c770506 updates for page management security, labels 2013-10-02 14:58:01 -04:00
tworrall
d92adb7d71 VIVO-112: and the beat goes on... 2013-10-01 16:46:59 -04:00
hudajkhan
8d520895ac Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-01 11:24:30 -04:00
hudajkhan
9fae5d7c3e updates for label management 2013-10-01 11:24:15 -04:00
tworrall
4d5a567e36 VIVO-285: visualization updates for ISF 2013-09-30 09:29:19 -04:00
tworrall
4179900ea4 VIVO-112: and the slog continues... 2013-09-25 17:09:41 -04:00
tworrall
e364911795 VIVO-289: fixed capitalization issues 2013-09-24 14:58:20 -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
tworrall
f76ee886d5 VIVO-112 2013-09-23 08:58:24 -04:00
tworrall
9cff04ce95 VIVO-296 autocomplete on concepts will no longer include subclasses such as Award 2013-09-18 17:03:09 -04:00
tworrall
e739a94222 VIVO-112: ISF changes relating to vcard classes 2013-09-18 11:34:32 -04:00
j2blake
d52b939743 Fix typo error from fc9ac52 2013-09-11 10:01:30 -04:00