70111 Commits

Author SHA1 Message Date
Andrew Davis
f8259c2fbf MDL-46966 core_grade: altered the default value of grade_aggregations_visible so only natural is on by default 2014-10-03 13:49:41 +08:00
Andrew Davis
45da536113 MDL-47011 core_grade: added the ability to override grade_item weight 2014-10-03 13:49:41 +08:00
Andrew Davis
a2f1f65db4 MDL-47011 core_grade: added naive natural weight calculation to gradebook 2014-10-03 13:49:22 +08:00
John Okely
677bc07377 MDL-46576 core_grades: Add weights to natural (MDL-47006) 2014-10-03 13:49:22 +08:00
John Okely
b5e00814b3 MDL-46576 code_grade: Rename "Sum of grades" aggregation to "Natural" 2014-10-03 13:48:55 +08:00
Damyon Wiese
7eb0b9c44b MDL-46139 Grades: Add behat tests for the new columns in the user report 2014-10-03 13:48:55 +08:00
Damyon Wiese
8836ef8aa2 MDL-46139 Grades: Add new grade_grades aggregation columns to backup/restore. 2014-10-03 13:48:55 +08:00
Damyon Wiese
a1740d7b48 MDL-46139 Grades: Change usedinaggregation column to 2 columns for status and weight. 2014-10-03 13:48:55 +08:00
Damyon Wiese
dadc9d991d MDL-46139 Grades: Add contibution to course total column to user report 2014-10-03 13:47:42 +08:00
Damyon Wiese
65c2ac9334 MDL-46139 Grades: Show the aggregation details in the user report. 2014-10-03 13:47:42 +08:00
Damyon Wiese
9dd8088255 MDL-46139 Grades: Show the aggregation method in the alt text for the icon. 2014-10-03 13:47:42 +08:00
Damyon Wiese
bfe969e8b3 MDL-46139 Grades: Add a column to grade_grades to record how a grade is aggregated 2014-10-03 13:47:42 +08:00
Damyon Wiese
2e19f5e8e7 MDL-46139 Grades: Language change "weight -> calculated weight" 2014-10-03 13:47:41 +08:00
Andrew Nicols
c87b87e62f MDL-36460 mod_forum: Restrict forum subsription list based on availability info 2014-10-03 08:20:24 +08:00
Rex Lorenzo
7cd004e285 MDL-47518 report_log: Logfiles of single users no longer accessible
* Removing join on courseid if it is the SITEID.
2014-10-02 16:33:52 -07:00
Sam Hemelryk
bae30ef320 MDL-46481 backup: behat tests for the quick backup button 2014-10-03 09:43:08 +13:00
Sam Hemelryk
f3973676e8 MDL-46481 backup: implemented quick backup process (one click) 2014-10-03 09:43:08 +13:00
Colin Chambers
e1a2d0d92d MDL-43089 quiz: improved interface for building quizzes
This commit is actually the joint work of Mahmoud Kassaei, Colin
Chambers and Tim Hunt from The Open University. We could only use one
persons name for the commit, and this time Colin gets the credit/blame.

The goal of this work was to increase usability, and also clean up
the page enough that it will be possible to add new features in future.

Display of mod/quiz/edit.php is now entirely generated by
mod_quiz\output\edit_renderer. This uses a helper class
mod_quiz\structure to provide details of the structure of the quiz, and
mod_quiz\repaginate to alter that structure. (Acutally, there are still
some modification methods on mod_quiz\structure. Expect that to be
cleaned up in future.)

The new code uses much more ajax, and there are new scripts
mod/quiz/edit_rest.php and mod/quiz/repaginate.php to handle this.
(Again, don't be surprised if those two scripts get merged in future.)
Also questionbank.ajax.php (which may, in future, be made more generic,
and moved into the core question bank code.)

Most of the new JavaScript code has intentionally copied the way things
are done when editing activities on the course page.

As a result of this, mod/quiz/editlib.php is now much shorter than it
was. (In future, expect the remaining code in here to move into
mod/quiz/classes.)
2014-10-02 17:22:23 +01:00
Tim Hunt
482ca72089 MDL-47426 assign local roles: rewrite query for better performance.
This is an extremely dangerous query, because it includes the user
table twice, along-side two other potentially large tables,
role_assignments and user_enrolments.

The solution is to rewrite the query so that:

1. The subquery is JOINed, not WHERE ... INed. Typically query
   optimisers handle the JOIN case better.

2. Before the join was role-assignments <-> users <-> subquery.
   That is, everything was linked to u.id.

   Now the linking is role-assignments <-> subquery <-> users,
   so the SELECT DISTINT eu1_u.id FROM {enrolled users} is central.
   That seems to send a strong hint to the query optimiser about
   a good order to execute the query.
2014-10-02 17:10:40 +01:00
Dan Poltawski
6597413d41 weekly release 2.8dev 2014-10-02 15:18:52 +01:00
Dan Poltawski
9438c6412e NOBUG: Fixed file access permissions 2014-10-02 15:18:51 +01:00
Dan Poltawski
356e857bbb Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-10-02 15:18:48 +01:00
Dan Poltawski
7e704313d2 Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle 2014-10-02 09:48:25 +01:00
Dan Poltawski
2e8101f6e6 Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle 2014-10-02 09:35:30 +01:00
Dan Poltawski
be6779d0c4 Revert "MDL-32870 mod_lesson: added support for files to question answers and responses"
This reverts commit d92f768baab86e95cafdfdbee1b54e5d2dbd055b.
2014-10-02 09:09:16 +01:00
Sam Hemelryk
454034351b Revert "MDL-47395 added cli_error() visual cue"
This reverts commit eb60c78c771ee4acbfe3667a3cc44c2df61e1def.
2014-10-02 17:39:49 +13:00
Sam Hemelryk
251089fe44 Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle 2014-10-02 17:30:47 +13:00
Dmitry Nefedov
66b864c797 MDL-47408 user: Add checking before adding blog's link.
Checking enableblogs  and bloglevel, userid, constant  BLOG_USER_LEVEL.
2014-10-02 12:17:14 +08:00
Andrew Nicols
390485058e MDL-46282 core: Correct deletion of message datakeys
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-02 11:50:34 +08:00
Willy Lee
cc6b20fbc8 MDL-46295 course: add search box to all course listings, manage button when appropriate 2014-10-01 22:31:24 +08:00
Dan Poltawski
76e348d46d Revert "MDL-45893 user_menu: revised based on action_menu"
Was not yet ready for the prime time.

This reverts commit dc4bff329dc2faf56445effebaa6790e0bc76713.
This reverts commit a535004e5c54689dc664d780b15900e1e6e19f83.
This reverts commit c8398fb95af3533a1945e0b4f45ac939f3044d8d.
This reverts commit d24b8e52d38526bf62612c3569db1d3174613c77.

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
2014-10-01 08:58:22 +01:00
Dan Poltawski
f2a8ecfae9 Merge branch 'MDL-47214-master' of github.com:andrewnicols/moodle 2014-10-01 08:37:43 +01:00
Andrew Nicols
84b02e6efd MDL-47214 core: IPs should be cleaned 2014-10-01 15:27:53 +08:00
Frederic Massart
6849d15df5 MDL-37707 mod_assign: Prevent user from changing grouping in team submissions 2014-10-01 11:27:44 +08:00
Sam Hemelryk
db89450d85 Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle 2014-10-01 15:37:56 +13:00
Dan Marsden
9528f643d1 MDL-47404 filelib: Prevent flash from treating files as uploads
added to send_stored_file as well.
2014-10-01 15:05:56 +13:00
Eloy Lafuente (stronk7)
ed3e85755c Merge branch '47428-28' of git://github.com/samhemelryk/moodle 2014-09-30 23:42:58 +02:00
Sam Hemelryk
db34f8cbdb Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle
Conflicts:
	version.php
2014-10-01 08:57:37 +13:00
zbdd
77218e4a52 MDL-42993 auth: spaces removed from usernames by default only
Functionality by default does not change with this patch.
However spaces are no longer stripped when cleaning usernames IF
$CFG->extendedusernamechars has been set.

Also included 2 trim statements where small issues were found with reading
external usernames in that  were not filtered for trailing whitespaces.
2014-10-01 08:24:54 +13:00
Dan Poltawski
a96e90e1c0 Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle 2014-09-30 17:30:20 +01:00
Damyon Wiese
0cc1ee1f30 MDL-46171 dml: DML unit test for tricky SQL in assign upgrade
This tests a workaround for set_field_select where the set table and from table are the same.
2014-09-30 23:35:37 +08:00
Dan Poltawski
6315aa24f9 Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle 2014-09-30 16:02:09 +01:00
Dan Poltawski
5990febb0c Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle 2014-09-30 14:35:29 +01:00
Jetha Chan
dc4bff329d MDL-45893 user_menu: fix to hide user_pictures from screen readers 2014-09-30 21:18:17 +08:00
Damyon Wiese
93c51a1d0a MDL-46171 assign: Fix for the update script on MySQL. 2014-09-30 21:16:24 +08:00
Dan Poltawski
f736c1b394 Merge branch '3034-28' of https://github.com/samhemelryk/moodle 2014-09-30 14:04:24 +01:00
Dan Poltawski
a535004e5c MDL-45893 behat: quick fix for usermenu logout button
(This needs revisiting properly - I am not an xpath expert)
2014-09-30 13:54:07 +01:00
Dan Poltawski
8f97a5c66a Merge branch 'MDL-47385-master' of https://github.com/DmitryNefedov/moodle 2014-09-30 11:41:37 +01:00
Dan Poltawski
ac24e87b74 MDL-47195 force an upgrade for classloader changes 2014-09-30 11:40:18 +01:00
Dan Poltawski
7cef39b534 Merge branch 'MDL-47195-master' of git://github.com/andrewnicols/moodle 2014-09-30 11:07:23 +01:00