GitLab

no ID changes because not necessary to retranslate

Change-Id: I65855be719e00942738f5f688970951b49dcfdfb
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>

Change-Id: Ib2d1cd9068a48d7f199dd3d056ab52ef93a3d59b
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

As per Francois' comment in the bug
https://bugs.launchpad.net/mahara/+bug/829674/comments/1



Change-Id: I03d99dbc93ea57d16240d0904c6bd670534f82b5
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

Change-Id: Ia77c6a21f8dcde5bff5efe2b316dd0aa038b054b
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

bug #605747 and bug #806501

When a user uploads a new profile icon, it now gets added to the
"images" folder in their files area. Profile icons are emphasised and
descriptions aren't editable. Warning notifications, when deleting a
default profile icon or when deleting a folder containing profile
icons, are implemented.
Signed-off-by: Eugene Venter <eugene@catalyst.net.nz>
Change-Id: I3f8c93c4b65814aa183f0eaa8e1739e750c87905

Bug#799565
Changed Textbox Columns from 80 to 76.

Change-Id: I63b91f5ea0e3f12ebca0c62112a44d1e8885729a
Signed-off-by: Christopher Tombleson <christopher@catalyst.net.nz>

Adds support for the following external gallery hosters
- flickr
- panoramio
- photobucket
- picasa
- windows live

This patch does not do the following
- Support non-public albums on flickr or windows live
- Support guest-link albums on flikr
- Support albums with access keys on photobucket or picasa
- Support albums with custom URL's in photobucket

This patch also doesn't have very good error
handling for the above cases

Based on Gregor Anzelj's branch at
 https://gitorious.org/~anzeljg/mahara/anzeljg-mahara/commits/new_slideshow



Bug #794369

Change-Id: I3a961cd97d21d0a8d5ce2f1a32ef81d7c761facb
Author: Gregor Anzelj <gregor.anzelj@gmail.com>
[hugh@catalyst.net.nz prepared for review, expanded commit msg]
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

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

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

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

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

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

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

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

(Gallery-related patches collected from gallery-premerge on git://gitorious.org/~naveg/mahara/navegs-mahara.git, without flickr blocktype)