Check originals directory before iterator in upgrade (Bug #1080498)

If no "original" files had been created via uploads yet, the base
directory was absent, causing the directoryiterator to fail.

Change-Id: I77741f5f8c154a4afdb7b26846dd1aac4356ac72
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Additional processing fixes for rss to avoid fatal errors (Bug #1081431)

Checking for the datatypes returned, and catching exception caused
by a previous exception object getting passed to the database,
which adodb doesn't know what to do with, surprisingly enough.
Making use of try to better handle failing record updates.

Change-Id: I884021aca8d3cb416acab575151ed97d7d64d3ed
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Bug#1069664 Corrected custom theme changes

I added a line in the file 'customcss.tpl' so that when
the 'Text on Background' colour is changed, the top right
navigation changes colour as well.

Change-Id: Ib778c57fa363f8c20efb6e3d336196d2c8fbf358
Signed-off-by: bonnie <kurousagiwasugoi@gmail.com>
Merge "Bug#1069664 Corrected custom theme changes"
Bug#1100024 Relocated Shared pages & edited string

I created a new string to replace "Share" in "Portfolio" to
"Shared by me"
I also moved "Shared pages" from "Groups" to "Portfolio" and
renamed it "Shared with me". This is located between "Shared by me"
and "Export"

Change-Id: I5bb0a002ff1f41305334a7cf1f27940837d4d03b
Signed-off-by: Janice <starboltangel@gmail.com>
Bug#920263 Changed "Institution Expiry Date" text

On /admin/users/institutions.php I changed "Institution expiry date"
from italics to normal text.

Change-Id: Ic1e557aa44fe25568693f56948e4cc6a8e1f3aba
Signed-off-by: Janice <starboltangel@gmail.com>
Merge "Bug#920263 Changed "Institution Expiry Date" text"
Merge "Bug#1100024 Relocated Shared pages & edited string"
Bug#1100187 Capitalised the word 'Institutions'

I have capitalised the word 'Institutions' under
'Manage Institutions' on the /admin/ page.

Change-Id: I63bef8ee9da2e43fb960c2599d2f7ca890b01888
Signed-off-by: bonnie <kurousagiwasugoi@gmail.com>
Bug#939299 Increased list limit of collections

I increased the limit of the list of collections on the
'Collections' page under the 'Porfolio' tab, from a limit
of 5 to a limit of 10.

Change-Id: I59310968200137b20c73bf1074fca232fa5415ca
Signed-off-by: bonnie <kurousagiwasugoi@gmail.com>
Merge "Bug#1100187 Capitalised the word 'Institutions'"
Merge "Bug#939299 Increased list limit of collections"
Bug#1057259 Added year to the post date of forum

I added the year that the post was posted onto the forum
so that people won't be confused with just the month
and day.

Change-Id: I8d15fa522770c842268fb66788b5b1fdc969ffab
Signed-off-by: bonnie <kurousagiwasugoi@gmail.com>
Bug #952625 Pending registration expiry time

Added 'Default registration expiry lifetime' and
relevant dropdown box to 'Account settings', plus
adding how long the administrator has to approve
registration to the email alert.

Change-Id: Ic2df962730b10e6df4ccccaa539e415640f024b8
Signed-off-by: Ali Kaye <alexandrakaye.student@wegc.school.nz>
Merge "Bug #952625 Pending registration expiry time"
Merge "Bug#1057259 Added year to the post date of forum"
Bug#1100187 Capitalised the word 'Institutions'

Capitalised the 'I' in 'Institutions' on the title.

Change-Id: I5337e311d73adf38e99c5392693c6c6784d2b230
Signed-off-by: bonnie <kurousagiwasugoi@gmail.com>
Bug #892959 Change language strings

Completed the fractured description sentences
on the 'Portfolio' >> 'Export'  page.

Change-Id: I530e2ec7ad64bc041f47b6e5e185eff5103c631b
Signed-off-by: Ali Kaye <alexandrakaye.student@wegc.school.nz>
Bug#1050655 Changed forum notification subject

The forum post notification subject showed the "topic" subject.
This has been changed to the "post" subject.
Also the get_ancestorpostsubject section has been moved from topic.php
to fix this bug.

Change-Id: I740a0f416bc60401d2a4a5d5be59b7bd9feb85b9
Signed-off-by: Janice <starboltangel@gmail.com>
Merge "Additional processing fixes for rss to avoid fatal errors (Bug #1081431)"