- 11 Dec, 2017 1 commit
-
-
Robert Lyon authored
Due to not using an alias for the view table The code is correct for MySql though behatnotneeded Change-Id: I5622bde057c70cf7d140044ac213bf3f299abefc Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 10 Dec, 2017 1 commit
-
-
Robert Lyon authored
Currently we have a mahara_log function that logs page visits So I decided we also need a mahara_touch_record($table, $id) function that updates the 'atime' for a record when called behatnotneeded Change-Id: I2f645c8357426112f9edcdd24f1b8b85513cb7cb Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit b335fdb7)
-
- 07 Dec, 2017 2 commits
-
-
Ghada El-Zoghbi authored
Forgot to wrap the table name event_log with curly brackets. Sponsored by Australian National University behatnotneeded Change-Id: Ia598632b1f0ae177fe646312ea5c2b38a9e83d51
-
Ghada El-Zoghbi authored
Several issues resolved: 1. The event_log.time column has been removed and replaced by ctime. The handl_event() call is using the new column even though the new column has not been created yet in the upgrade script. Therefore, include both columns in the event handling. 2. The 'deleteartefacts' event stores multiple artefact IDs in the one event_log record. Therefore, there is not a one-to-one relationship when converting the record to the new format. Ignore the record when setting the resourceid and resourcetype. 3. In the 'saveartefact' and 'deleteartefact' events, not all of the event_log records have 'id' and 'artefact'. Ignore setting the resourceid and resourcetype fields when the data is not available. 4. For newer versions of Postgres and MySql, utilise the json dattype to convert the data held in the event_log.data column. This will speed up the processing of the table for sites with large data in the event_log table. Sponsored by Australian National University behatnotneeded Change-Id: If068dac825b9cef6301cd970f0a368124a67b3f1 (cherry picked from commit a7acb6a5)
-
- 04 Dec, 2017 1 commit
-
-
Robert Lyon authored
In the elasticsearch results page when using the search box on that page behatnotneeded Change-Id: I1b6fa028c5456623dd656b99b0263ed9a28748dd Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 71d1c2df)
-
- 30 Nov, 2017 1 commit
-
-
Cecilia Vela Gurovic authored
See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isInteger behatnotneeded Change-Id: I2c1b77676e603394ce1a12a88f5d763e40ad5826 (cherry picked from commit 1737f979)
-
- 29 Nov, 2017 1 commit
-
-
Robert Lyon authored
The USER object will have id = 0 when a user is logged out It should never end up in the usr_session table. This patch stops that from happening and also ignores usr = 0 insession table with setting up auth as well. behatnotneeded Change-Id: I0ba7afe0d21ae822daf8895af943f41048ba82b7 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit e7191aad)
-
- 26 Nov, 2017 1 commit
-
-
Cecilia Vela Gurovic authored
Added new html custom filter to allow voki embed code with javascript tags. issue with the creation/edition of blocks: Voki embed code its a javascript code that loads js functions from a remote file and makes a call to a AC_Voki_Embed() function parameters: function AC_Voki_Embed (width, height, chsm, sc, transparent, bgcolor, returnFlag, playerType) The number of parameter makes the difference between old and new voki code. The old one will have only 7, the new one will have one more. The new embed code will have playerType = 1 The function uses an XMLHttpRequest to obtain the new embed code. When we are loading the page, there is no problem. But when we are editing or creating the block, the the connection with the object gets lost and the embed code is never loaded. Solution found: reload the page after editing or adding a block with new voki code. The old voki code can have returnFlag = 1 will return a string with the code returnFlag = 0 will load the embed code in the page (by default) In this last case, after the function creates the embed code, it will call document.write('embed code') if we are loading a page with the embed code, we have no problem but if we have the page already loaded and we are editing the block or creating it, the document.write will replace all the html with the embed code. Solution found: change parameter of the function so it returns the code instead, then manually add it in the correct place of the html. behatnotneeded Change-Id: Ieed00b6c6887715b707b8123082a1312f3db1d9c
-
- 20 Nov, 2017 3 commits
-
-
Robert Lyon authored
It errors out when 'body' length is longer than 32766 chars behatnotneeded Change-Id: I34a96fb0bd23b409edc1766854ee797b7d3ba58e Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 143c85c2)
-
Robert Lyon authored
As it causes problems on upgrade behatnotneeded Change-Id: Id330f8c31c763dffce6f559557c9c78ac27ac58f Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 35d46f1d)
-
Pramith Dayananda authored
fixed following: jQuery get user type from dropdown usertype_type the list does not work if no pagination needed behatnotneeded Change-Id: I2da46141bd3c12969ab5523b5c822cd85978b8e9 (cherry picked from commit b8d6797c)
-
- 17 Nov, 2017 2 commits
-
-
Robert Lyon authored
In notifications outbox behatnotneeded Change-Id: Ia524a86bc645d052c27ec881811781ea065c292e Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 0a9c1962)
-
Cecilia Vela Gurovic authored
behatnotneeded Change-Id: I12f79b49900f3a509de1ccf3e7776160ac7a8b00 (cherry picked from commit f8d819d7)
-
- 14 Nov, 2017 1 commit
-
-
Robert Lyon authored
When one follows link from email and sees the change password screen behatnotneeded Change-Id: If7e8834354aa99ed66a819bff3c1856678e04298 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 13 Nov, 2017 1 commit
-
-
Cecilia Vela Gurovic authored
behatnotneeded Change-Id: I4b466290c468ed4122b5b850ceb1f1aa2ec223b2 (cherry picked from commit dcf1f848)
-
- 12 Nov, 2017 1 commit
-
-
Robert Lyon authored
behatnotneeded Change-Id: If68427764654a1f92df89453515ee2c3f710bb61 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit a65e3cd9)
-
- 09 Nov, 2017 1 commit
-
-
Cecilia Vela Gurovic authored
similar to bug 1486763 behatnotneeded Change-Id: Iaa6e337434996303208a0445099825797e65ae3e (cherry picked from commit 9f98b2d7)
-
- 06 Nov, 2017 1 commit
-
-
Cecilia Vela Gurovic authored
behatnotneeded Change-Id: Ic9093c721ee92b3815f3deee02b1dfde9d274916 (cherry picked from commit e785dd1b)
-
- 30 Oct, 2017 4 commits
-
-
Cecilia Vela Gurovic authored
fix text when sending email to user after adding a new email address behatnotneeded Change-Id: Ibd20de0c7a97df4845e55e944559d0b5f43a81e2 (cherry picked from commit 4b7752ac)
-
Robert Lyon authored
Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
behatnotneeded Change-Id: Idae47b1571d2bcfc4cc91174d363a43e6d3c95fd Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 99263861)
-
- 29 Oct, 2017 18 commits
-
-
Robert Lyon authored
Change-Id: I663f6ffde03b6b3504d49a767ac0ff55d0ab8437 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 056d42fc)
-
Robert Lyon authored
Also make the minimum PHP version be 5.5.9 behatnotneeded Change-Id: I784566d0a75ec7020ac61d3b6a56237fe4e2c670 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
Which is only the user's name Change-Id: I01d3dab89c0f48b6b734b31690f1b4036c7cf7a6 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
to avoid having problems when the user emails another user Change-Id: If694e969ea8a9d77badfffa095dc5fac3b6da417 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit dbbbb91c)
-
Cecilia Vela Gurovic authored
1. when a user logs in it clears any obsolete usr_session cookies for the user 2. recording the user-agent of the session and if it changes to prompt the user to login again 3. when self adding / editing email address(es) send 2 emails - one to the new email address asking user to confirm address - and one to the primary email address to alert user that a new email is being added to their account and if this is bad how to contact their admin about the problem. behatnotneeded Change-Id: Ia44b66cf831abd553b72aa8b1d58d2a2634863b8
-
Robert Lyon authored
behatnotneeded Change-Id: I6f0c82a74e0d60614230aac1d4fc3884eae387a5 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit c367be4d)
-
Robert Lyon authored
Before displaying it to screen Change-Id: I0bfc727ca6e0feee649392fcd85a89b16f55201f Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 648b191e)
-
Robert Lyon authored
an oversight from commit dde8e52b Change-Id: Iba1c23b7b88cfb9526627f1b9c934bb94ecc4e5c Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 873eeed0)
-
Robert Lyon authored
behatnotneeded Change-Id: I4b342a0d3f00015e8f2e0ff7d93d2b5198fbc32d Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 86711cb8)
-
Robert Lyon authored
-
Robert Lyon authored
-
Robert Lyon authored
For the 3 columns that use elasticsearch - group page comments - shared pages - shared page comments behatnotneeded Change-Id: Ib7ee64f958a0d9ddd7382e067f23fe2e62c7d207 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit a8f8a82d)
-
Robert Lyon authored
in reports for masquerading / user activity as 'mahara' institution may not be the first institution to do these activities. behatnotneeded Change-Id: Id3bf240346636ba729a91637629db7194c5ff04c Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 23ec8f0d)
-
Robert Lyon authored
Only show the secret url info once for each portfolio Also fix the sort by owner so pagination works correctly behatnotneeded Change-Id: I3ea9ef06b45ea785eeda154beb37a8da6ec27407 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit dbfa06ba)
-
Robert Lyon authored
behatnotneeded Change-Id: Id175f6e8cbd1bb378e0d806264aa858e5b2dba00 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit bc57fcb8)
-
Robert Lyon authored
Includes: - Getting the masquerading 'data available message' to be correct - Ignoring the deleted users for portfolio access report - Fixing the 'typesubtype' error when switching from 'All institutions' to an institution when report type is one not allowed for institution. behatnotneeded Change-Id: Ie9a569e2e837ab337be23c6e2a5381a24150e50d Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit 1e5de9cc)
-
Kristina Hoeppner authored
And change some other language strings behatnotneeded Change-Id: I0cd6d8f8bdba56a7cddc5ece0fec25f9aa1678df (cherry picked from commit 20c905f9)
-
Robert Lyon authored
This patch includes - Allow the overview report to be the default report - Fixed sorting of modified/visited columns for page activity report - Fixed sorting for username in useractivity report - Fixed total rows count for user activity - Fixed collaboration report for institutions - Fixed issues with the new columns in the groups report Change-Id: I2269bb5610d238bc9786d04d4c2a9122c0a4ccfc Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz> (cherry picked from commit a5c930d8)
-