Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

We will remove it in each template once we've added |escape or |safe to every variable.
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

    - disable editing of title and description for special view types,
      but give them good fixed values
    - include the description when installing profile and dashboard views,
      since they aren't included when copying a template
    - don't show view submission form for profile and dashboard views
    - move access control for the profile view to the "my portfolio" page
    - exclude dashboard views from search results
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

A global admin option allows site administrators to disable the
information entirely, though it is enabled by default for all new and
existing sites.

Users can opt not to show the information, and an account setting is
present if they wish to have it shown again. The information is shown
between the home page text set by the admin, and the user's dashboard
view.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Also included is an inbox blocktype for dashboard views which shows the
user's most recent notifications. Multiple instances of this block can
be present in a dashboard view, and the message types displayed in each
can be configured.

A default dashboard view is installed for each user the next time they
log in. Additionally, since the profile view is now shown in the view
list, it is installed on login, rather than when the profile is first
requested.

Conflicts:

	htdocs/lib/version.php
	htdocs/view/blocks.php

Edit styling on message thread page; add from column to notifications and show the correct message authors
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

When replying to a message from another user, the full message history
is now shown, if it is available (recorded in the database).
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

The profile view is just a special view, and really has no obvious
connection to the user's profile information. Linking the two blurs the
central distinction between content and views in Mahara.

This patch loosens that connection by:
    - Removing links from the edit profile page to the profile view
    - Removing links from the profile view to the edit profile page
    - Showing the profile view in the My Views list

While the profile view is now treated like other views, it cannot be
deleted, and its access cannot be changed. Links to these features do
not appear for the profile view in the My Views list.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

- Allow for multiple views by one user submitted to a single group
- Don't show already-submitted views in the submit form drop-down
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Additional data on 'controlled' and 'invite only' groups is fetched
and passed to templates for group control pop-up boxes.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

For those groups which require people to "Request membership", allow
admins to decline the membership.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

/js/groupmembersearch.js is no longer needed and has been deleted
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

The pages affected are "My Groups", "Find Groups" and "View Group".
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>