Commits · 7801498cb109be0681fdea7de304c66ecb53966c · mahara / mahara

19 Aug, 2015 3 commits
- Version bump for 1.9.9testing · 7801498c
  Aaron Wells authored Aug 19, 2015
```
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
```
  7801498c
- Version bump for 1.9.8 · c7cdff31
  Aaron Wells authored Aug 19, 2015
```
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
```
  c7cdff31
- Merge "Perform basic form validation on file browser actions (Bug 1480329)" into 1.9_STABLE · 622669bf
  Robert Lyon authored Aug 19, 2015
  
  622669bf
18 Aug, 2015 3 commits
- Merge "Prompt to register site again after upgrading to 1.9.8. Bug 1450334" into 1.9_STABLE · 863747e3
  Robert Lyon authored Aug 19, 2015
  
  863747e3
- Merge "Adding PHP & system info to stats collection" into 1.9_STABLE · 1e29e696
  Robert Lyon authored Aug 19, 2015
  
  1e29e696
- Prompt to register site again after upgrading to 1.9.8. Bug 1450334 · 649c5801
  Son Nguyen authored Aug 14, 2015
```
- Display the registration site page after upgrading
- Show the register box in the admin index page for reminding
- Show data sent after successful registeration

Change-Id: I0b950957a8d451593fd29de5088aac56c6cf5b60
```
  649c5801
17 Aug, 2015 3 commits
- Perform basic form validation on file browser actions (Bug 1480329) · 6338c39b
  Aaron Wells authored Aug 05, 2015 and Robert Lyon committed Aug 18, 2015
```
behatnotneeded: Requires doctoring requests, which Behat can't currently do

Change-Id: I619ab2cf768a4621a77026ed172c01b1c484a99e
```
  6338c39b
- Adding PHP & system info to stats collection · c7139c0c
  Aaron Wells authored Apr 24, 2015 and Robert Lyon committed Aug 17, 2015
```
Bug 1447865

Change-Id: Ia4b09ff1bf379421f1fc1b77de07d86353569452
(cherry picked from commit 5fa788c0)
```
  c7139c0c
- Set elasticsearch cronlimit to 50000 by default. · 174e5363
  Aaron Wells authored Jun 11, 2015 and Robert Lyon committed Aug 17, 2015
```
Bug 1464052: Giving it a default of 50000 instead of unlimited.

Change-Id: I30210d3416d70d96bec40ebb578c5302e07ff63f
(cherry picked from commit 0b1d3d68)
```
  174e5363
11 Aug, 2015 1 commit

Bug 1483077: escaping names when showing table / index · e10fe1c1

Robert Lyon authored Aug 10, 2015



behatnotneeded

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

e10fe1c1

07 Aug, 2015 1 commit

Import collection pages in the right order (Bug 1482010) · edc608b6

Aaron Wells authored Aug 06, 2015

Also, displaying the pages in name order during import.

behatnotneeded: Can't test export & re-import of Leap2a files in Behat yet.

Change-Id: Ib387e574356d9d894b9a6f284b09921a5b26d5fc
(cherry picked from commit c10418a1)

edc608b6

05 Aug, 2015 1 commit

Bug 1479434: $SESSION undefined for validation step · 10c100dd

Robert Lyon authored Jul 31, 2015



Need to have $SESSION available to be able to send error to it

behatnotneeded

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

10c100dd

02 Aug, 2015 1 commit

Delete button on User's Settings page for 'no institution' · 78d54291

Robert Lyon authored Jul 31, 2015



Bug 1480038 - When the registerallowed is turned off - this is wrong

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

78d54291

29 Jul, 2015 1 commit

Fix quota update on group file upload (Bug #1479178) · 68b62299

Robert Lyon authored Jul 29, 2015



There was a problem with group update where the group quota data was not
getting updated when uploading a file due to caching.

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

68b62299

27 Jul, 2015 1 commit
- Bug 1474136: Altering the admin message about cron when site closed · c160ff3a
  Robert Lyon authored Jul 14, 2015
```
Change-Id: I24d34159e337d7ece6d003b1c42cda01a0fe4e80
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
```
  c160ff3a
17 Jul, 2015 1 commit
- Rewrite the navigation block's collection pointer, after leap2a import · 0544da18
  Aaron Wells authored Jul 15, 2015 and Robert Lyon committed Jul 17, 2015
```
Bug 1333424

Change-Id: I6ab58a154513fbe3185be91f251c5c1aa213a7a1
(cherry picked from commit 3658fa88)
```
  0544da18
16 Jul, 2015 1 commit
- Don't skip on setting up pages in leap2a, just because there no artefacts · ca583b9f
  Aaron Wells authored Jul 15, 2015
```
Bug 1464477

Change-Id: I016d35f35406f4b1c7bcb298ae2966f1d37fed05
(cherry picked from commit e7779d20)
```
  ca583b9f
15 Jul, 2015 1 commit

Checking incorrect names for leap2a interactive import options (Bug 1361005) · 5cadaa45

Son Nguyen authored Aug 25, 2014 and

Robert Lyon committed Jul 16, 2015



While the IDs for the radio buttons are of the form "decision_X_X", we're
looking at their names here, not IDs. And the names are just "decision_X".

Change-Id: Id7e0ec1df62cca6cae261b9b7eda9fbe3dbf9431
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>
(cherry picked from commit a61c66ed)

5cadaa45

10 Jul, 2015 4 commits

Version bump for 1.9.8testing · 42a417fe
Aaron Wells authored Jul 10, 2015
```
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
```
42a417fe
Version bump for 1.9.7 · bde50168
Aaron Wells authored Jul 10, 2015
```
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
```
bde50168
Merge "Use nosniff header to prevent potential XSS via untrusted files in IE" into 1.9_STABLE · 60fc38f8
Aaron Wells authored Jul 10, 2015

60fc38f8

Use nosniff header to prevent potential XSS via untrusted files in IE · 7b9b434b

Yuliya Bozhko authored Jun 04, 2015 and

Aaron Wells committed Jul 10, 2015

Bug 1470281

See
  https://msdn.microsoft.com/en-us/library/gg622941(v=vs.85).aspx
  https://www.owasp.org/index.php/List_of_useful_HTTP_headers



Solution is to add it to file serving code in places where we do forced
download of files.

Change-Id: Ic46d02f65d9ed1cb57fb50e8fab2cbc9f62428a1
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
(cherry picked from commit 96b117e5)

7b9b434b

09 Jul, 2015 1 commit

Bug 1471604: Terms & Conditions not displaying on register page · 120c9379

Robert Lyon authored Jul 06, 2015 and

Aaron Wells committed Jul 10, 2015



If there are more than one institution to choose from as the div
container 'termscontainer' is not present on page.

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

120c9379

08 Jul, 2015 1 commit
- HTML-escape page title in watchlist JSON response (Bug 1472439) · 539d323f
  Aaron Wells authored Jul 08, 2015
```
Change-Id: I445c763b09928ce03ae8561605e593bc23bba122
```
  539d323f
07 Jul, 2015 1 commit
- Prevent HTTP iframes on an HTTPS site · 7a7f066d
  Aaron Wells authored Jun 10, 2015 and Robert Lyon committed Jul 07, 2015
```
Bug 1463629

Change-Id: I99f4df8b5ce51a58db5f122f44717ae6d12a6d72
```
  7a7f066d
01 Jul, 2015 1 commit
- Bug 1460368: stopping anonymous comments on artefacts · 1be3956b
  Robert Lyon authored Jun 02, 2015 and Aaron Wells committed Jul 01, 2015
```
When anonymous comments is turned off

Change-Id: Id2ed84cb3b532da6ec8e117ef13c283bd64af302
(cherry picked from commit 3046c5c7)
```
  1be3956b
28 May, 2015 3 commits

Version bump for 1.9.7testing · 86335be6

Son Nguyen authored May 29, 2015 and

Aaron Wells committed May 29, 2015



Change-Id: I7e18e0b19d0f5ccdecd25f310f0493956e56e3fd
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

86335be6

Version bump for 1.9.6 · 45ad9175

Son Nguyen authored May 29, 2015 and

Aaron Wells committed May 29, 2015



Change-Id: I1ea800f468cb8177b6e78b0de9f129cd032bbae5
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

45ad9175

Escape institution_display_name correctly (Bug #1447377) · c2cb5932

Hugh Davenport authored Apr 28, 2015 and

Aaron Wells committed May 29, 2015



Institution names were not being escaped properly in the
accesslist.

This patch escapes them properly as well as clearing the
compiled cache for the templates where this problem occurs.

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

c2cb5932

27 May, 2015 2 commits
- Updating mahara-flashplayer README to indicate the new URL for its source code · faad51b5
  Aaron Wells authored May 28, 2015
```
Change-Id: I3ba68797512dd0d30087c62b17386b8417575ceb
```
  faad51b5
- Adding the ADDITIONALHTML* to the micro templates (Bug #1458703) · 02060a66
  Robert Lyon authored May 26, 2015
```
Change-Id: Ida23b4b8d58cad2455e0fcb32efe6cad59fa5ce5
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit e5b5ee67)
```
  02060a66
07 May, 2015 2 commits

Merge "Stop the dwoo loader error (Bug #1193177)" into 1.9_STABLE · d0e7a04f
Robert Lyon authored May 08, 2015

d0e7a04f

Group admin of no institution was unable to update group (Bug #1420590) · 6c123cea

Robert Lyon authored Mar 02, 2015



It was wanting to check if the user was in the correct institution to
edit the group - but was wailing if the user was in group 'mahara' or
no institution.

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

6c123cea

23 Apr, 2015 1 commit

Stop the dwoo loader error (Bug #1193177) · eaa54f90

Robert Lyon authored Apr 24, 2015



The fix for this exists in Dwoo 1.2 so backporting it to older branches

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

eaa54f90

21 Apr, 2015 1 commit

Updating .gitignore · 5453e437

Aaron Wells authored Apr 21, 2015

This should make it easier when switching between master
and older branches.

Change-Id: I5be0afc3338fc66a05750b334f4742f7d17f4225

5453e437

20 Apr, 2015 5 commits
- Version bump for 1.9.6testing · f1607234
  Aaron Wells authored Apr 20, 2015
```
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
```
  f1607234
- Version bump for 1.9.5 · c7cbe046
  Aaron Wells authored Apr 20, 2015
```
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
```
  c7cbe046
- Use different strptime params for BSD compatibility · ec31ef4e
  Brian King authored Feb 13, 2015 and Aaron Wells committed Apr 20, 2015
```
Bug 1414628: The "tm_yday" (day of the year) param is not supplied by
strptime by default on BSD systems such as Mac OS X.
It works just as well to use "tm_mday" (day of the month) param instead,
and it also makes more sense!

Change-Id: I1484dcde4dbd8199f578a4eb5a58a9f78de45635
```
  ec31ef4e
- Merge "Using the new format for plugin configs. Bug 1410953" into 1.9_STABLE · 27d1f4f8
  Aaron Wells authored Apr 20, 2015
  
  27d1f4f8
- IMAP language string for 'Port' is missing (Bug #1360050) · 8a705256
  Ghada El-Zoghbi authored Aug 22, 2014 and Aaron Wells committed Apr 20, 2015
```
Add missing language string for IMAP Port field.

Change-Id: I9fccdd890bc186971fa1b7e90f965a7b34a25615
Signed-off-by: Ghada El-Zoghbi <ghada@catalyst-au.net>
```
  8a705256