GitLab

Robert Lyon authored Jul 16, 2018 and Cecilia Vela Gurovic committed Oct 01, 2018

To allow us to restrict things being shown for block when in older
version.

behatnotneeded

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

behatnotneeded
Change-Id: I4341264ec1b2d301b9ca9dd5d777fe90ce91a9e6

behatnotneeded

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

Kevin Dibble authored Apr 16, 2018 and Robert Lyon committed May 03, 2018

behatnotneeded

Change-Id: I402d90f2e89466aa266b28451b7511ba35a2305a

Cecilia Vela Gurovic authored Mar 15, 2018 and Robert Lyon committed Mar 19, 2018

behatnotneeded

Change-Id: I17b0520d692e418d48629af790f11bb5f6682cf1

We currently escape post content before submission
But we also need to do cleaning on php side incase hacker posts directly

Also needing to clean up annotations with bad html in their
descriptions and resume composite fields with bad html in their
descriptions

behatnotneeded

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

When in cleanurls mode.

It tries to traverse the relative path rather than use the
config.wwwroot as base of path

Also we don't need the check if limit/offset is false as they are fetched
by function that returns null rather than false now

behatnotneeded

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

Added a field in the 'link' plugin to add a
URL to a selected personal page or collection. This is
only available in a personal portfolio area, but not a
group, site, or institution area.

Removed from annotation.js duplicated function
already defined in mahara.js

behatnotneeded
Change-Id: Iccf4c4ca08e142bfd77ab824217cbee5dc35a7bd

Kristina Hoeppner authored Sep 27, 2017 and Robert Lyon committed Sep 29, 2017

Go through new lang strings and fix them where needed.

behatnotneeded

Change-Id: If3efc3bd4ca990960d5209ddb80fc9dec4699b5f

Pramith Dayananda authored Jun 23, 2017 and Robert Lyon committed Sep 04, 2017

Validation on portfolio collections
Validation on smartevidence grid
Behat tests added
A new feature file added

Change-Id: Ib5adf627f3391fb53805b0566a7c405313a3066b

Same issue available in annotations and comments

behatnotneeded

Change-Id: I7d394882833508e905777e01beb37f60bd4a06ce

Also do not show the annotation feedback comment form if not logged in
Also goto the matrix page if exists and the token cookie doesn't
rather than frist page of collection

behatnotneeded

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

That turn the submit button into 'Processing...'

Instead we'll ignore the presubmit option altogether

behatnotneeded

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

When copying a page with an annotation artefact on it

behatnotneeded

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

* annotation, blog, plans

behatnotneeded: same functionality

Change-Id: I39880674ad56381f46921949edac8f2819dcc01a
Signed-off-by: alexeyomelchenko <alexeyomelchenko@catalyst.net.nz>

Functions in classes and their parents
should have matching paramenters.

behatnotneeded

Change-Id: Ib989f6c3ec5644507cccafb296cd5ae595f29d16

Son Nguyen authored Aug 29, 2016 and Robert Lyon committed Nov 03, 2016

Treat anonymous user like a probationary user

behatnotneeded

Change-Id: I54238e0b0f33b6617ad61a042f06901d5defd06a

Son Nguyen authored Oct 21, 2016 and Robert Lyon committed Oct 28, 2016

behatnotneeded

Change-Id: I63aa142c6c84ea6d71ebb80bb88d51a9e97e2e4b

behatnotneeded

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

When we do an annotation feedback either by page or matrix

behatnotneeded

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

Changing it to how we show artefact feedback

behatnotneeded

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

behatnotneeded

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

When adding an annotation feedback comment via a view

behatnotneeded

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

Because unlike image/note blocks where we want the blocks to reference
the same underlying artefact here we want to create a new artefact
otherwise updating the block on one page will update the artefact for
all the related blocks.

To do this we need to add a new copytype called 'fullinclself' that
means make a full copy of blockinstance including when doing a self copy

Also we need to allow for the self copying to ignore the
annotationfeedback artefact type as we dont' want to copt the feedback.

behatnotneeded

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

If the annotation has feedback and/or assessment set to something
other than 'begun'

behatnotneeded

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

with $smarty->assign()
behatnotneeded

Change-Id: I667463b7732bd3f1dd2619b2836cf4b8c560d264

When the old annotations have feedback on them

behatnotneeded

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

Made it have two options now:
1) 'annotation' - Counts the number of annotations a user has added
   to their pages.
2) 'annotationfeedback' - Counts the number of feedbacks left on
   annotations owned by other users

behatnotneeded

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

Things fixed here:

1) The floating in space button for first feedback entry
2) The poor alignment for the annotation edit + delete buttons combo
3) Allowing an admin to delete their own feedback on their own
annotation

behatnotneeded

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

Cecilia Vela Gurovic authored Aug 31, 2016 and Robert Lyon committed Sep 06, 2016

behatnotneeded

Change-Id: I11f216e845aea4e603bbb7b72aa586f498c600fc
Signed-off-by: Cecilia Vela Gurovic <cecilia@catalyst.net.nz>

Should be code changes only

behatnotneeded

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

So we can record the framework specific marking choices

Also made annotation block title field read only when in SE as it
get's overwritten anyway.

Changed the feedback list on the matrix annotation modal sort order be
latest first

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

1) Saving framework setting when copying collection

2) Removing the ability of site admins from setting an institution only
framework to a different institution

3) Made standard tooltip be like element tooltip

4) Added owner's name to the matrix.page

5) Added the framework name as a 'page' in the list for
collection/index.php

6) Updated the matrix completed count before page reload

7) Allowed basic html in .matrix descriptions

8) Replaced example.matrix with 2 new .matrix files

9) Fixed issue where framework evidence was not being restricted to a
collection

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

To those that should see the select dropdown
To those that can self-assess vs cannot self-assess

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

When you click on the hollow circle (rather than dot) on the matrix
screen you will get an annotation feedback form in the modal dock
rather than the create annotation form.

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

To allow it to have the select2 for choosing the smart evidence.

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

When creating a new user in admin -> create user screen

behatnotneeded

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

behatnotneeded

Change-Id: I4972d8c4c225a6dfa442744c2fb02782ecebdbc5

behatnotneeded

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

They need to  be consistent in PHP7 and include the parameter types.

behatnotneeded - existing tests are ok

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