Robert Lyon authored Sep 30, 2013 and Aaron Wells committed Oct 14, 2013

- have added this as a separate patch in case it is not needed

Change-Id: I87378a0d831727c405cc6135ba6f6e5e4a722813
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Evonne Cheung authored Oct 14, 2013 and Robert Lyon committed Oct 14, 2013

Change-Id: I3139b6f7067bffc2ff1fcf61c19d9252af8d784e
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

- have updated copyright for the pages that had existing copyright
notices (except for the lib/pieforms/ section as i'm not too sure if
that needs changing as it is a different Catalyst IT product)

Change-Id: I11c65ad26cb9cd856cf16b1dccbd4223ba086645
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>

Bug1236661

Change-Id: I0a9141df124a47c635b37e97cade15eff50f187d

Bug1237791

Also adding a new bit of API: If an $entrydata being passed in to PluginImport
includes a 'defaultdecision' field, we use that instead of the normal logic
to decide which non-ignore decision to use.

ArtefactTypeResumeComposite artefacts are now allowed only the "Append" option,
which adds new composite rows via the "ensure_composite_value()" function.

ArtefactTypePersonalInformation artefacts continue to use much the same logic
as we were previously (erroneously) using for ArtefactTypeResumeComposite artefacts.
Note that in non-interactive import, they'd be populated using the import_author_data()
function, but that doesn't work in interactive import because it would overwrite everything.

Change-Id: I39304d53150cc6e8a880b2c2b68cfff1afb45349
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>

Bug1237799

Change-Id: Icc9819ede58dac7a1421dca531b3fab30a0b385f

* changes:
  Flexible layout upgrade compatibility for pre-1.2 Mahara sites
  Make the adodb/mysqli MetaIndexes() function escape table names

Problem seems to stem from the browse=1 being hardcoded in the urls when
switching folders. changed it to use the value submitted.

Change-Id: Idb078d5b7479af25f075bf76eeaeefaa56079fab
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

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

Bug1238392

Change-Id: I20efd1277b55fe700e1a8a0a0c555edc1a2cf430

Bug1238363

Change-Id: Ib99b684a5d23aa943a37b28706ba1ba7ac8c3f48

Bug 1238424
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
Change-Id: Id87addb9cbd42a7b56757d49788331a578ca4e4c

- made a style change mistake on merge, this should have
been part of patch 2533

Change-Id: I72c1708952072b015c16d87ae57dd157ab48dda6
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Robert Lyon authored Oct 07, 2013 and Aaron Wells committed Oct 10, 2013

Bug 1235071,
Bug 1234943

Files in a folder block instance can lack block instances themselves
so fail to display correctly

Have made it so the fetching of block instance title only happens
when we have all the needed info (artefact id, view id, block id)

Change-Id: Ib0a072f46afa9235efa3026789c37489538e9b92
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Problem with the draggable block's height causing it not to 'see'
droppable areas.

Set the height on the dragged item to be approx the height of a row
so that every row can be reachable.

Change-Id: Ifb1e77879b0b7420364c953644eb1f1309aa9c2c
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Bug1237721

Change-Id: I219334cff3082cab7c28e66f7518c77860897fc0

Bug1237721: Was erroneously comparing the number of rows to the allowed
max with >=, so it errored out if you had the max number of legal rows.

Change-Id: I8d8c39c05ef216615234c45f305aad84d3b7e177

Evonne Cheung authored Oct 10, 2013 and Robert Lyon committed Oct 10, 2013

Change-Id: I14efe87e5adc4501a568343e751808351d7d5420
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

also a change to how skins display titles on microheaders

Change-Id: I8bf6fcb37188f968022e081409d8aa39a276c65a
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Bug1237183 : This typo caused a warning to be thrown when changing the search plugin

Change-Id: Ia8b6cc9eb8fd878a90437a2212f915e0450cd063

Bug1237187

Change-Id: Ic6caf6179807d3a8bca4a40ea8069886de673c35

Bug 1223063: ArtefactTypeCachedProfileField was only updating
the session cache when you updated a value, not when you deleted it.
Of course, the only one that can get deleted and that is shown
anywhere is the PreferredName (aka display name) so only this
one shows the problem.

Change-Id: I55f9c96b59c91ced5cba3cf6443ba2e222201ef7
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>

Bug 123530 and Bug 1236122

When js slideshow was chosen on a page without a slideshow block
(eg a new page) the js code returned by the selection was not loaded
fast enough

- I've altered it so the js is loaded on opening of config block

- Also folder was not staying selected when re-editing the block
due to it being not ArtefactTypeFile - have adjusted the check to
include ArtefactTypeFolder as well

- The switching between My files and Site files was breaking due to
folder artefact chooser not having certain elements on the page that the
js was trying to access. Have made it so js checks for elements before
trying to update them.

Change-Id: I9b8cbe786b0d35109f05a664f04665e9a9967d92
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Needed to alter the db call to get resume composites as the way things
work has changed a bit in 1.8. All lines now get their own artefact id.

Change-Id: Ibfc2fc9ce06eed43675c6680df21886f8d732557
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Bug1233171

Change-Id: I655eb2f035497a52960765852fa8095ec7cd94e8

Have adjusted the skin page header mahara logo image options
to allow for default theme logo, light coloured logo, and dark
coloured logo options.

Change-Id: I40703578f546a071ea96363b32d39a3bd7c2b51a
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Lang strings did not require new IDs as the change
only affects English.

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