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
brianjlowe
6570e3dcc6
merging develop into dev-isf
2013-09-10 09:08:55 -04:00
j2blake
f129f727a7
VIVO-262 Add languages to VIVO at build time.
...
Move the language-specific files out of the default build area. Add a build property that will cause the selected language(s) to be copied into the build area.
2013-09-09 12:23:54 -04:00
hudajkhan
8e0bf8c229
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-09-05 15:46:45 -04:00
hudajkhan
fc9ac52786
updates for multiple language labels and concept semantic types
2013-09-05 15:44:54 -04:00
tworrall
c478748abf
fixed an i18n typo
2013-09-04 14:53:37 -04:00
hudajkhan
b8e114c4e8
url encoding the subject uri to allow for correct redirects later
2013-09-04 13:26:01 -04:00
hudajkhan
9ec7d11cab
label management and concept semantic type
2013-09-04 12:22:46 -04:00
hudajkhan
3314e5a4b0
updates for label management
2013-09-03 15:34:02 -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
9d1fef76ea
VIVO-258 Add a "selected" flag to each Freemarker locale variable.
2013-08-22 10:56:49 -04:00
Brian Caruso
e6a7ad34d3
merging develop to issue-vivo-101-sparqlupdate
2013-08-19 16:21:16 -04:00
tworrall
37142c0231
VIVO-208: all fields now displayed when custom forms are rendered; customized 2-stage forms will still work as before
2013-08-05 15:12:24 -04:00
Brian Caruso
6a3e6f4f5b
Merge branch 'develop' into issue-vivo-101-sparqlupdate
2013-07-31 13:53:39 -04:00
Brian Caruso
463453111d
Adding proof of concept SPARQL update VIVO-101
2013-07-19 13:49:02 -04:00
tworrall
46ae630e95
VIVO-215: fix layout of search results page - the first search result was appearing up in the header as were the facets; standardize look of the download popup. Also ensure that longer headings that include types from the facet wrap to new line rather than overrun the search help link.
2013-07-18 16:56:56 -04:00
