GitLab

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

The antispam feature was developed long before being merged, so it's db
upgrade had a lower version than the current HEAD of master. This
rearranges things so that people who have been using master get all the
upgrades.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Default option is still to redirect to the view index, but if the returnto
parameter is set to group, redirect to the group the view was submitted to;
and if the parameter is set to view, then redirect to the view that was
submitted.
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

This gives users a list of all views they haven't yet submitted to any
group if they're in the group/view.php page for a group which is of a
submittableto group type, and to which they haven't already submitted a
view to.
I've added a duplicate language string for 'Submit' as I suspect the submit
button text won't work for translations in this context.
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Feedback we've had from some of our users suggests that having the ability
to submit a view to a course group in other locations (e.g. within a view,
and within the relevant group) would make a lot of sense as it reduces
context switches for users.
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

This means that it should be much easier to use in other locations without
duplicating code.
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Moved the SQL from view/index.php to lib/group.php so it can be used
elsewhere.
I considered testing the results of get_group_user_groups on type ===
'course', but this doesn't allow for future group types which also allow
submissions.
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

This is a pluggable anti-spam infrastructure for protecting forms in
Mahara again spam.

The contact and register forms have been modified to include the
following anti-spam features:
    - hashed field names
    - honey pot (invisible) fields
    - submission time monitoring

Additionally, content checking is provided by the following spam traps:
    - NoneSpamTrap: the base class for other spam traps, does no
      checking on its own
    - SimpleSpamTrap: provides basic checks that don't require an
      internet connection
    - AdvancedSpamTrap: provides better checks that require an internet
      connection, including checking for the existence of mailservers
      and the presence of blacklisted URLs

New spam traps can easily be created by adding a file to lib/antispam
with the name MyTrapNameSpamTrap.php. Added spam traps will be
automatically detected and available for selection in the site options
page.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

The Leap2A specification has rebranded and thus we should reflect that
change in the next Mahara release.

I also updated a few URLs.
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Move the copyright statement next to the permission statement (as per
http://www.fsf.org/licensing/education/licenses/gpl-howto.html

).

Rename the "I agree" button since technically users/admins don't have
to agree to the GPL before they install Mahara or use it.
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

This stems from an issue where a user's profile view somehow ended up
with numcolumns set to 6 in the database. The root cause of the problem
is unknown, but this should prevent views from entering a broken state.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

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: Evan Goldenberg <evang@catalyst.net.nz>
(cherry picked from commit fb3c0d27a53a5ef258ad127d8e9c500a70a55714)

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

The last commit fixed postgres but broke mysql. Woops.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Penny Leach <penny@mjollnir.org>

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

Signed-off-by: Penny Leach <penny@mjollnir.org>

leap2a: made the blog plugin look for attachments when importing a catchall entry as well as a full blog
Signed-off-by: Penny Leach <penny@mjollnir.org>

I'd made a call to $user->get when $user is a StdClass object.
Corrected to use $user->email and $user->id

* gg now goes to mygroups.php
* go removed (formerly group/owned.php)
* gv goes to views page
* g/ correctly goes to the search box (incorrect search field id)

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

This appears to have been broken in
2eeaf6de

 but it seems very strange to me
(a year ago)
Signed-off-by: Penny Leach <penny@mjollnir.org>

Add empty default my goals strings to language pack, so they can be overridden by local customisations
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>

Ignore exceptions thrown by smarty() calls in the middle of exception handling. Avoids some 'exception thrown without a stack frame' errors.
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
(cherry picked from commit 193240b77e295b83caf933be16d9f3518ebdf65e)

Conflicts:

	htdocs/theme/raw/static/style/style.css
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>