GitLab

In Chrome - when editing a block when there is a nearby embedded media video
block can cause the video part of the block to display over the config
form making it hard to do editing.

From what the interweb says this is a problem with wmode needing to be
set.

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

the ajax off message was being displayed when js enabled causing
confusion about arrows message

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

Have added a basic check to see if artefact record exists with
the id given.

Don't need to check if they have access to the artefact as that is
handled later - just need to see if it exists or not.

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

the db call was complaining about ERROR: invalid input syntax for
integer: "2,3"

so I adjusted the db call to be similar to other WHERE id IN ( )
calls used elsewhere.

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

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

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

Change-Id: I74133d3ee5e6718699f58316dc66b31141fbbc7a

- Add tags test adds in some tags

- Verify tages test checks that they exist and are
correct types

Note: this will need to added to for tags like collection tags
etc and more verification tests will need to be added

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

Tests:
 - to make sure that drop zone is present.
 - that a folder can be made
 - that a folder can be edited and tag created
 - that a folder can be deleted

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

This way the parent style can be utilised

Have made it so that undefined colours are displayed as ''
eg color: ; as css ignores these lines. (tested in FF and Chrome)

Needed to alter the way body background and view background are
displayed to allow for the inheritance of existing theme css.

I had to split the 'background' css attribute into components eg
background-color, background-image etc because FF was giving colour as
rgb(0, 0 ,0) if misisng from 'background' line.

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

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>