GitLab

Aaron Wells authored Aug 01, 2016 and Robert Lyon committed Aug 25, 2016

behatnotneeded: Can't test in Behat

Change-Id: I3dac42a4e5a08155e131bc45494b78a13c1417cd

And avoiding storing full path to dataroot temp dir in db for imported
entries

behatnotneeded

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

Liam authored Aug 24, 2016 and Robert Lyon committed Aug 24, 2016

Also swapped round the 'copy page' and 'copy collection' buttons

behatnotneeded

Change-Id: Ic0c32364e51b56ffbcf7108877c6ea2820ebf45c

Bug 1525736: Also doing a general cleanup of this very old
and very messy function.

behatnotneeded: Covered by existing tests

Change-Id: I4b2feba22764fd290a69dc4b6ab1d734abd08a1c

If there are negative block_instance.order values in the database,
then we'll just drop and re-create the unique key on the column.

Change-Id: I3ef1507f82ae3dc24244e6236e173b6649a95d3b
behatnotneeded: Covered by existing tests

* changes:
  Bug 1613483: Hide "Open file" button in the toolbar
  Allow the pdf viewer to display menu items in user's lang (Bug 1423435)
  Embed pdf has horiz scrollbar on default 3 column layout (bug 1237137)
  Getting the bottom of the pdf viewer to display (bug 1240776)
  Adding ability to download embed pdf when js turned off (Bug# 1211070)
  Bug 1613483: Update mahara template for pdf block
  Bug 1613483: Update PDF.js to 1.4.20

This patch contains these three related changes:

1. Removes the "THIS IS BAD" message that was printed when 3rd-party
exception or an instance of MaharaException was thrown.

2. Removes the completely unnecessary "MaharaThrowable" interface.

3. Adds an comment explaining why MaharaException is not abstract

4. In the case of a smarty exception while printing an error, prints
the name and content of the smarty exception.

behatnotneeded: Covered by existing tests

Change-Id: I800a868bd187efb76ed37cca872ce262c2abbdb0

Bug 1614805. When a plugin is installed "out of sequence" by a
call to plugin_upgrade in the core lib/db/upgrade.php file, the
AJAX-based web upgrader handles it gracefully, because it does
check_upgrade() before upgrading each plugin, detects the change
in status, and doesn't run the upgrade for that plugin a second
time.

The CLI upgrader, on the other hand, uses the same cached data
from check_upgrades() all the way through, causing it to re-run
upgrades for such plugins.

This patch makes it behave the same as the AJAX plugin, running
check_upgrade() again immediately before each component gets
upgraded. This does cause some redundancy in code execution,
but it shouldn't be enough to cause a noticeable performance hit.

Change-Id: Id5c431fc9e636df2cab05d22e6cc424271ce9f3d
behatnotneeded: Covered by existing tests

Son Nguyen authored Mar 09, 2015 and Aaron Wells committed Aug 19, 2016

behatnotneeded

Change-Id: I3204369ec36bbfa01227f210e8fc79526679f660

* changes:
  Prevent HTTP iframes on an HTTPS site
  Add more legal color formats (Bug 1264098)
  Allow CSS comments in customised skins. Bug 1369830

Change-Id: I0b13222887d66d174f5e12d037dda4594acc0512

Seen as the 3 column layout is the default one the embed pdf view
should fit within it.

Currently if you have a browser windo open fully, a 3 column layout,
and a pdf embedded you get a horizontal scrollbar on the embed pdf.

A slight adjustment of the min-width and it goes away.

The scrollbar will be there for 4 or 5 column widths but that is ok as
they are quite thin columns.

Change-Id: Ib01118d9fffab14440308eaf04b5038fdfeca9c3

- change allows for a bit of the base of the display so it doesn't
look broken

Change-Id: Ie163f986a4c6abcf60cb26fc3b479122c119fc10

Change-Id: I829b996c5ce9bfa9e2b882b2209adc3731bec49a

* Remove sample pdf files
* Use absolute paths in viewer.js
* Open fileurl if defined

Change-Id: I99dc0f84e693c0ea1dc231814379a43297a57411

Change-Id: Ic14ef28aeb95ac19e2c790f7ab26932d6c12bb4c

In case the site was using the old contrib plugin

behatnotneeded - upgrade issue

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

Aaron Wells authored Jun 10, 2015 and Robert Lyon committed Aug 19, 2016

Bug 1463629

behatnotneeded

Change-Id: I1d9e95b58579ed3309b8ccefcb444563b23120c5

Son Nguyen authored Sep 02, 2014 and Aaron Wells committed Aug 18, 2016

- rgba()
- hsl()
- hsla()

Change-Id: I51742b629d10a8f7b0d07478d3c2c67affcea8ac

Son Nguyen authored Sep 24, 2014 and Aaron Wells committed Aug 18, 2016

As we add a new configuration option to HTML Purifier,
we have to update HTMLPurifier/ConfigSchema/schema.ser
 1. Download and unzip HTMLPurifier package
 2. Copy Filter.ExtractStyleBlocks.PreserveCSS.txt
from mahara to the unzip folder
 3. Run php maintenance/generate-schema-cache.php in
unzup folder
 4. Copy over lib/HTMLPurifier/ConfigSchema/schema.ser
from unzip folder to mahara

Change-Id: Id955dec7d2cf795a485ac220c3ea50052d4de47f

Son Nguyen authored Aug 17, 2016 and Aaron Wells committed Aug 18, 2016

behatnotneeded

Change-Id: Ib268a96da65cbb1e2717411a3dc72f1f6aa19d50

Liam authored Aug 18, 2016 and Aaron Wells committed Aug 18, 2016

behatnotneeded

Change-Id: I3f25b4f8266e70e50df3c4457be24f2089ce382d

behatnotneeded

Change-Id: I00da7d2a319dacabc802c09f1a668f0f37db7057

Following instructions in readme_moodle.txt

behatnotneeded

Change-Id: I079b683f28a75805b1fb4d85326f9d836130817d

* changes:
  elasticsearch: Add index name to _bulk command path
  Bug #1613478: Update Elastica library to 2.3.1

Bug 1457709: We only do this when the command comes
from an Index object itself, which means that all the
data in the bulk request will have the same index anyway.

You'll still need to set rest.action.multi.allow_explicit_index:false
in your config.yml, or else the data will be able to override the
index name in the URL.

See https://www.elastic.co/guide/en/elasticsearch/reference/current/url-access-control.html

Conflicts:
	htdocs/lib/elastica/README.Mahara
	htdocs/lib/elastica/lib/Elastica/Client.php

behatnotneeded: Can't be tested in behat

Change-Id: Ide22a0026aeb480a130e39c3ea2f327ef2de167f

behatnotneeded

Change-Id: Ieff16099da370e60c3b695c48e65c8282d5aa3c3