Merge "Check if rss feed is not empty and an array first (Bug #1191605)"
Merge "Fix for bulk user change auth method problem (Bug #1180194)"
Merge "Show warn if nonexistant group is in group csv update bug #1187571"
Drop-down navigation overridden at institutional level (Bug #1194672)

Create the ability for Institutions to override the site default for
displaying drop-down navigation instead of tabs for main menu.

Can now: Set drop-down navigation option on Administer institutions
screen /admin/users/institutions.php

Users who are in more than one institution will have drop-down setting
of the institution whose theme they are using as their theme.

If $cfg->sitethemeprefs = true, where a user can pick any theme then
for those themes associated with an institution they will use the
institution's setting otherwise they will use the site's setting for
drop-down navigation.

Can not do: Have user make their own choice for whether they see drop
down or not for any particular theme

Change-Id: I580953c62b35cbc8169d47781c8bf88cc94d9fe8
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Support for linking to electronic publications (Bug #547386)

Change-Id: I48866b92bd3a54fe41dd72781d193de7ccecad12
Signed-off-by: Gregor Anzelj <gregor.anzelj@gmail.com>
Add year to time stamp for posts in topics.php (Bug #1165300)

The time stamp now also shows the year instead of only date and time.

Change-Id: I8b630e932369c08e7e3dd5ecbe903641533f9cc0
Signed-off-by: Dirk Meyer <dirk.meyer@icampus21.com>
UI changes for Mahara 1.8 Bug #1199563

Here are all the UI changes that were made by Evonne

Change-Id: I08d98d759a701deaf0a332af9e9392b7270704a5
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
UI changes for Mahara 1.8 Default and Aqua theme Bug #1199563

Change-Id: Ic85c30bfdcedb4236c21986470ee68aa9acb29e7
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Fix for bypassing moderation when making comment public (Bug #1171310)

To get a private -> public comment moderated the system needs to check:
* if the view has approvecomments set to 1
* if the submitter has checked the make public checkbox
* if the submitter is not the owner of the view
* if the view is a group view
* if the approvecomments are set per view

And update the comment table accordingly and now sends off notify
message if needed.

Removed some unneeded variable declarations

Change-Id: I276c3d3fa67a99d9030d10a6172048c255e91b5b
Signed-off-by: robertl <robertl@catalyst.net.nz>
Make editchangepage.json.php less "page" specific (bug #1073625)

It can be used for any site content, not site pages only.

Change-Id: Ia901ce1444ab26c50b6327089cf2040a95fbe148
Signed-off-by: Ruslan Kabalin <r.kabalin@lancaster.ac.uk>
Add Additional HTML page to Configure Site menu (bug #1073625)

This allow admin to embed something without modifying the template, e.g.
Google Analytics snippet.

Change-Id: I030b4d1c682708fdf988e9a4a0dea836b4f285b9
Signed-off-by: Ruslan Kabalin <r.kabalin@lancaster.ac.uk>
Providing a more specific message for anonymous commenters of private comments

Bug1201052

Change-Id: I10dd1f28eb7b47d7608f9df29a4661300a99e4fb
Only show "comment updated" message when the comment description or title is updated

Bug1201055

Change-Id: Id767f48df9cbb04060cb35361eaf943fb7430b2d
Fixing regression from theme update, where pages couldn't be added to new collections

Bug 1199563

Change-Id: I1f57ed79f410b627b120c1f1b28d2b76d3323c8d
Better usage of the DML API

Bug1180194

Change-Id: Idfaad6ba9138eabc8e0efa4f72a5a3da224c7eab
Merge "Better usage of the DML API"
Merge "Fixing regression from theme update, where pages couldn't be added to new collections"
Show full filenames

Bug 1046750

Change-Id: I3baa2138d52f9ec415145d408dbe198ad302a777
Make the user's own profile icon a link to the Profile Icon content tab

Bug1183612

Change-Id: I458cfd08a0326f3e21aefe656e00bcdeb6c85bbc
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
Merge "Only show "comment updated" message when the comment description or title is updated"