Aaron Wells authored Nov 23, 2015 and Robert Lyon committed Nov 25, 2015

Bug 1510421

Defines a new static PluginBlocktype method, get_css_icon(), which
fetches the name of the CSS icon to use for this blocktype. It returns
false by default, which tells the theme to "fall back" to the old
thumbnail.png instead. 3rd-party plugins can override this to
specify a particular icon to use.

All the core blocktypes have been refactored to extend
MaharaCoreBlocktype, which uses the blocktype name as the name
of the CSS icon to use. I also deprecated the "SystemBlocktype"
class while I was at it.

PluginBlocktype::get_blocktypes_for_category() now returns both
the results of get_css_icon() and the thumbnail.png path, so that
themes can decide which they want to use. (And of course
thumbnail.png is served via thumbnail.php, so 3rd party themes
can provide their own custom image files if they wish.)

behatnotneeded: Requires installing third-party plugins to test

Change-Id: Idb1ecfc7b21175913708e695788906c11133b0c0
(cherry picked from commit...

When adding resume composite options

behatnotneeded - this is more a UI thing

Change-Id: I33d5fab50767b1adc753dee9a0124a04f0c087b3
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 1c7c1a3b)

SarahJCotton authored Nov 18, 2015 and Aaron Wells committed Nov 23, 2015

In both Admin -> Institutions and Admin -> Groups

behatnotneeded

Change-Id: I014d49d1c6c0fb6f6ac7e7236142615077ff835d
(cherry picked from commit 073da085)

Robert Lyon authored Nov 17, 2015 and Aaron Wells committed Nov 23, 2015

And getting them to display in the export html files

behatnotneeded

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

Robert Lyon authored Nov 18, 2015 and Aaron Wells committed Nov 23, 2015

Because some systems may not have all the available data we should
check if the data exists before trying to display it.

To test:
Before patch change the line in lib/mahara.php
 if (function_exists('posix_times')) {
to
 if (!function_exists('posix_times')) {

and make sure the 'perf_to_log' config option is set to true

This will cause the errors we are trying to deal with to show up

behatnotneeded

Change-Id: If9610fa0eaf4c8bb036b21c1c75e10d828de7934
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit e9584a54)

The help icons clickable area was being hidden. Removing the position
relative seems to fix the problem and not cause any other issues.

behatnotneeded

Change-Id: Ib0ae7368c52ebdb952ba147f03e25ec3e4301d02
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 32d56680)

Aaron Wells authored Nov 03, 2015 and Robert Lyon committed Nov 23, 2015

behatnotneeded: Can't test mobileupload API in Behat

Change-Id: Ied63c973fc125d4f2d403dcdd75be28c0314aeec
(cherry picked from commit 31256ffb)

Liam Sharpe authored Nov 13, 2015 and Robert Lyon committed Nov 20, 2015

behatnotneeded

Change-Id: Ibc067c8f06fcd87a9aa38d129fc3acc0bbe68bb1
(cherry picked from commit ba88a673)

Aaron Wells authored Nov 19, 2015 and Robert Lyon committed Nov 20, 2015

Bug 1517658

Change-Id: I531a1c95b94910e564e71e1f2dc26754eefa45d5
behatnotneeded: platform-specific bug
(cherry picked from commit 7a0fef3e)

Robert Lyon authored Nov 18, 2015 and Aaron Wells committed Nov 19, 2015

To let users know they cannot customise themes with gulp/sass if they
have the zip version of Mahara from launchpad  as important files
are not present.

It lets them know they need to get the zip from http://git.mahara.org


which will have all the extra stuff.

behatnotneeded: change to readme file

Change-Id: I7ae3e05340b54bc037f4b6856ecb237f9611b7e4
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 8c223036)

Bug 1517244

Change-Id: I7d499fce7ecd858f1799a9757960814cac17d4bb

Jinelle Foley-Barnes authored Nov 09, 2015 and Aaron Wells committed Nov 16, 2015

There were 2 Behat dir, blog and journal. I deleted Journal and placed all the
tests in blog to match the code base.

Change-Id: Ic283d6342286da1b9a385d2e6d193894972a8370
(cherry picked from commit 34fdcfb9)

The problem is due to the scope of the blockinstanceId variable being
outside of the click handler function, which inadvertently makes it
into a sort of static variable shared by all of the delete buttons.

So the solution is to use a locally-scoped blockinstanceId button
inside the click handler method.

Change-Id: I3e8ffac31cc869c545e85c5f53c3e710e2e71243
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
(cherry picked from commit 52770f8b)

I thought it was only for the combination 'exact search' + 'search email'
that was broken before but it turns out it was just for 'email' option
regardless of 'exact search' or not.

behatnotneeded

Change-Id: I44a2fcd032a3a00deffd2959a01e727c3e396c8a
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 7d687f9a)

Ghada El-Zoghbi authored Nov 11, 2015 and Aaron Wells committed Nov 12, 2015

behatnotneeded: Requires an upgrade to generate the warning

Change-Id: Ic412e92a7d1ed35765ed41f3ee8772e63f1bb3e5
(cherry picked from commit 1dacaab9)

Change-Id: Ic8cb9115654106f669b544f5f8b060d443a0a9f0
behatnotneeded: Can't yet test MNet methods in Behat.
(cherry picked from commit 905ea6f1)

Liam Sharpe authored Nov 12, 2015 and Aaron Wells committed Nov 12, 2015

behatnotneeded

Change-Id: I70e95b188cdb61de01db6d1b8c5ee852647ebcd7
(cherry picked from commit 1e6c4a76)

behatnotneeded: styling only

Change-Id: I5169ce5cd8e8ab70064d4008e7580e03beda7ce0

Pat Kira authored Nov 10, 2015 and Robert Lyon committed Nov 11, 2015

behatnotneeded - Styling only

Change-Id: I2baac867faac11194d06c4cdb534e96d6bb30672
(cherry picked from commit f72c2f6f)

Change-Id: Ide8a261a43ebce8abb953fe966c18ecb45e3029e
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 1d607058)

Robert Lyon authored Nov 09, 2015 and Aaron Wells committed Nov 10, 2015

behatnotneeded: it deals with whether an image shows or not

Change-Id: I3625f9d9948fd3c67f60657fbd3bc67644ae76e7
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 26deb57d)

So it can be passed to 'edit access' page from the 'edit page' page
on the 'Share page' link

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

Need to pass the correct number of prepare statement values for the
sql string.

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

behatnotneeded: can't test a select2 that loads data via ajax yet

Change-Id: Iae07e3d19b376acbbe4ca531bd8aebb555f6b377
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 88ffbab9)

I can't replicate but believe it's due to the .tpl file compiling
to a call to empty() with an expression as the parameter (which
is not supported by PHP prior to 5.5)

behatnotneeded: covered by existing tests

Change-Id: Ic44b89070de169790dbc5ab6d32a12484925c7e3
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 6353a366)

On find friends page when doing search or pagination

Change-Id: I116ff4c07f44ebd08449e245d79ebc57c172cf22
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 3dd50e03)

Normally it should load more options if they exist when one scrolls to
the bottom of the list, but was not working as the 'more' bits of code
were left out.

behatnotneeded: can't test a select2 that loads data via ajax yet

Change-Id: Ica89fa229e1c9c2a1e58aa7e2d73882ffb19b65e
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 58d68327)

Aaron Wells authored Nov 05, 2015 and Robert Lyon committed Nov 07, 2015

These got dropped during the Bootstrap rework

Change-Id: I4a58aff25ebc9907ba4a635419557281fe4cc2b5
(cherry picked from commit 84c6d1a7)

Robert Lyon authored Oct 30, 2015 and Aaron Wells committed Nov 05, 2015

Now that pages and collections are displayed we want to show 'X results'

behatnotneeded: showing 'pages' vs 'results' doesn't break functionality

Change-Id: Ib658a5d7e0586dd371b08b980808a0accd59db52
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit d0834d60)

Liam Sharpe authored Nov 05, 2015 and Aaron Wells committed Nov 05, 2015

behatnotneeded

Change-Id: I6f899441829fc62458b05e978e5f5e3ac23b4c8b
(cherry picked from commit 505003c0)

Robert Lyon authored Nov 03, 2015 and Aaron Wells committed Nov 05, 2015

So I'm giving it some invisible content, eg a non-breaking space, so
that the floats position correctly.

Behatnotneeded: It is a visual issue

Change-Id: If9bd1f67868f612087c683b57a6527fca3122a3f
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit ba6d2cba)