Commit Graph

24767 Commits

Author SHA1 Message Date
John Okely aa7055290e MDL-46576: Update reports so that they display natural weights properly (MDL-47009) 2014-10-03 13:51:29 +08:00
Andrew Davis 64b03e5bd7 MDL-47011 core_grade: added ability to un-override grade_item weight 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 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 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
Tim Hunt a75fa4c068 MDL-47476 qformat_learnwise: rest in peace.
Learnwise was an old LMS that no longer exists. (Last reference found on
Google from 2009.) So we are removing the ability to import questions in
that format.
2014-10-02 17:16:16 +01:00
Dan Poltawski 9438c6412e NOBUG: Fixed file access permissions 2014-10-02 15:18:51 +01:00
Dan Poltawski 2e8101f6e6 Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle 2014-10-02 09:35:30 +01:00
Sam Hemelryk 454034351b Revert "MDL-47395 added cli_error() visual cue"
This reverts commit eb60c78c77.
2014-10-02 17:39:49 +13: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
Frederic Massart 776f66d8e0 MDL-47298 libraries: Update password_compat to latest version 2014-10-01 17:03:29 +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 dc4bff329d.
This reverts commit a535004e5c.
This reverts commit c8398fb95a.
This reverts commit d24b8e52d3.

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
Adam Olley 8180281b73 MDL-47484 atto_indent: Prevent loss of rangy markers in some cases 2014-10-01 13:53:23 +09:30
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
Petr Skoda 366372c74e MDL-47477 libraries: use smoothness theme for jquery ui 2014-10-01 09:06:01 +13:00
Petr Skoda 5a53b77f71 MDL-47303 libraries: import latest jQuery library and friends 2014-10-01 09:04:20 +13: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 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
Frederic Massart edb6a040cf MDL-47301 libraries: Patch Typo3 for Moodle's use 2014-09-30 17:32:35 +08:00
Frederic Massart 9e7cdcdd69 MDL-47301 libraries: Update Typo3 to v4.7.19 2014-09-30 17:19:23 +08:00
Dan Poltawski 216b6aa7ee Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2014-09-30 08:35:19 +01:00
Andrew Nicols 6c0bfb1449 MDL-46282 core: Add VERP API
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-09-30 14:22:30 +08:00
Sam Hemelryk c8398fb95a MDL-45893 user: fixed user menu for guest 2014-09-30 10:25:23 +13:00
Sam Hemelryk 2957fdddd5 Merge branch 'm28_MDL-47170' of https://github.com/totara/moodle 2014-09-30 10:03:06 +13:00
Sam Hemelryk 14aa5a408a MDL-46652 output: more thorough custom menu multilang tests 2014-09-30 09:54:08 +13:00
Sam Hemelryk 3cfbdd9e5a Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle 2014-09-30 09:52:54 +13:00
Sam Hemelryk fc2856aab1 Merge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies' of https://github.com/mhughes2k/moodle 2014-09-30 08:48:20 +13:00
Daniel Neis Araujo bad2c9b14f MDL-46978 gradebook: Edit grade item changes visibility of category 2014-09-29 16:46:22 -03:00
Juan Leyva 10c5fd10d7 MDL-46054 web_services: Fixed invalid parameter definitions 2014-09-29 16:03:23 +02:00
Dan Poltawski 17382ec952 Merge branch 'MDL-47307-master' of git://github.com/FMCorz/moodle 2014-09-29 12:04:01 +01:00
Dan Poltawski 156cd01e7b Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle 2014-09-29 10:42:50 +01:00
Dan Poltawski f03b612191 Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-09-29 10:30:42 +01:00
Sam Hemelryk fcf0cc04b3 Merge branch 'MDL-47295-master' of git://github.com/FMCorz/moodle 2014-09-29 15:17:24 +13:00
Sam Hemelryk 55f0eb8328 Merge branch 'wip_MDL-47300_m28_tcpdf' of https://github.com/skodak/moodle 2014-09-29 15:15:47 +13:00
Sam Hemelryk a9a09787e4 Merge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle 2014-09-29 14:35:06 +13:00
Sam Hemelryk ddd0d4a56b Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle 2014-09-29 14:23:18 +13:00
Sam Hemelryk 503324d241 Merge branch 'MDL-39190' of https://github.com/pauln/moodle 2014-09-29 14:19:52 +13:00