GitLab

Which is only the user's name

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

behatnotneeded

Change-Id: I6f0c82a74e0d60614230aac1d4fc3884eae387a5
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit c367be4d)
(cherry picked from commit 465b7df2)

behatnotneeded

Change-Id: Ibea0816e9823c0a790564a39fd5b12455aa28339
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 836e37d9)
(cherry picked from commit 2d601f66)
(cherry picked from commit 54f05eae)

In webservices / csv upload we deal with the variable 'submitpages' in
relation to if one can submit pages to group. But the group
create/update functions and db table expect 'submittableto'.

The csv upload function converts this as expected but the webservices
didn't.

Have made adjustemets to webservices to suit

behatnotneeded

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

Administrator is spelled adminstrator

behatnotneeded

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

behatnotneeded

Change-Id: If1e267fb551faff3be2537b14a6b8917b263dddd

Added permissions to use json in public views
that include myviews blocktype, so the pagination
won't break when the block has more than 10 views

behatnotneeded

Change-Id: I8b96020729cc5cd0f3a34be7013155e2965c3ec2
(cherry picked from commit 35f3d2dc)

behatnotneeded

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

Rather than in core lang file to allow thirdparty lang strings to work

behatnotneeded

Change-Id: I5b23c471d246f6901695d7fdf102525e9ef8a666
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 457d11d1)
(cherry picked from commit c544f506)

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

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

To avoid potential hacking vectors for the site

behatnotneeded

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

* changes:
  Bug 1715260: Keep tinymce fields on block config form error
  Bug 1694875: Annotation field validated via JS

behatnotneeded - will be covered by annotation_block.feature

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

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

Change-Id: Ib5adf627f3391fb53805b0566a7c405313a3066b

behatnotneeded

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

Due to the json file not using the correct call to site templates

It was updated for the initial page load but not for the json load of
pagination results

behatnotneeded

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

behatnotneeded

Change-Id: Ic511e25066ebd84b80118e71f70c6f867a3564b4

behatnotneeded

Change-Id: I469f8136e287bb86eb17a32dbed48dec05b87969

And searched on for elasticsearch.

behatnotneeded

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

We need to avoid the sprintf() error if lang string expects extra args.

We can do this by supplying function check_string rather than
format_string

behatnotneeded

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

So that the Webservice -> Logs page will display things

Also fixed broken lang string

behatnotneeded

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

In the screen that displays groups we can join
the functions associated with the 'join me' button
are given the correct group number (not the ones from
the first page of the pagination)

behatnotneeded

Change-Id: I1737947acd67258dd49f8c24bb69aacb5402aafc
(cherry picked from commit aa9ab0ca)

Done for raw theme.

Sponsored by Australian National University

behatnotneeded

Change-Id: Id492639efed8a8562d2d6accfbacae1ed793f7f1
(cherry picked from commit 9635660f)

behatnotneeded

Change-Id: Ib39b2c3f570d1a7ea5777d19200683682697d7e8

An oversight from Bug 1631808 where we missed the files to allow
memcached, we only added the settings to allow it.

behatnotneeded

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

Added code to lib from TinyMCE bug fix TINY-929
Only for 16.10, this fix is included in TinyMCE
lib upgrade from 17.04 on

behatnotneeded

Change-Id: Ia5abad9f5fdd93eb0aed7841eac684f4c41d467d

updating view order on collection when deleting page
in the system and this one belongs to a collection
(not removing view when editing the collection) so that
collection is displayed again under "Shared with me"
for example.

behatnotneeded

Change-Id: I177d85629a46615307841b90d6e91da5e75de5ca

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

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

This patch only deals with:
1) removing passwords from existing event_log table data
2) stopping the recording of passwords into the event_log table
3) sets the reset password on next login for those users

It doesn't deal with removing the unnecessary cruft information
that will be handled by the bug 1692385

behatnotneeded

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

Actually the modal is opening and closing in the same instant.

This is caused by some code dealing with collapsible blocks making
sure modals are closed if outside certain rules.

This change checks what modal we are wanting and closing all but the
one are targeting when clicking the 'comments' link

behatnotneeded

Sponsored by SWITCH

Change-Id: Idb5165bdc8349f77286aa776ff75d152968aefda
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 5ce66781)
(cherry picked from commit b2858fcf)