7a2300fd82
Merge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle
2017-11-08 14:43:15 +13:00
8d64443452
MDL-60717 lang: Merge English strings from the en_fix language pack
...
Significant string changes:
- needbcmath,auth_ldap - 'grace logins' changed to 'expired password
checking'
2017-11-07 21:30:14 +01:00
5243e93661
Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle
2017-11-07 16:03:43 +08:00
aa30dc8860
MDL-59256 analytics: Respect activities specific access conditions
2017-11-07 08:14:53 +01:00
7783fd0ec1
Merge branch 'MDL-57772-master' of git://github.com/damyon/moodle
2017-11-07 15:01:31 +08:00
03561ea899
Merge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle
2017-11-07 13:49:47 +08:00
6688ae2ba2
MDL-60062 calendar: prevent drag and drop of override events
2017-11-07 05:47:18 +00:00
efe2681894
MDL-57772 chat: BEEP is back baby!
2017-11-07 11:25:02 +08:00
478b1d194f
MDL-60062 calendar: remove validate_event_timestart callback
2017-11-07 01:25:33 +00:00
9aac9f7074
MDL-60062 quiz: add support for drag drop of calendar events
2017-11-07 01:25:32 +00:00
a56833d49d
Merge branch 'MDL-60611' of git://github.com/stronk7/moodle
2017-11-07 10:14:24 +13:00
796e48a58b
MDL-60611 phpunit: remove deprecated stuff and other minor fixes
...
Thanks @scara for MDL-60611 phpunit: improved redis skipping reasons
2017-11-05 01:45:04 +01:00
79ea89fea2
MDL-58047 assign: submission sorting
...
Only exclude new submission records from the sorting, draft and reopened submission are valid.
2017-11-03 15:55:10 +08:00
801a372dad
MDL-60611 phpunit: switch to namespaced phunit classes
2017-11-02 23:45:34 +01:00
bb2071ca17
Merge branch 'MDL-58047-34-sortbysubmission' of https://github.com/roperto/moodle
2017-11-02 16:57:03 +01:00
f816ea9a67
Merge branch 'MDL-60659-master' of git://github.com/junpataleta/moodle
2017-11-02 12:45:22 +01:00
5dbd051502
Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle
2017-11-02 14:39:32 +08:00
c39a22f600
MDL-60659 mod_forum: Use PHP EOL for line breaks in expected values
2017-11-02 19:11:00 +13:00
216bb33940
Merge branch 'master_MDL-60007' of https://github.com/CengageEng/moodle
2017-11-02 08:50:42 +08:00
b8243e4164
MDL-58047 gradebook: fix sort by submission order.
2017-11-01 15:12:48 +11:00
76f11421a4
MDL-60007 mod lti: allow delete without content-type
2017-10-31 09:57:38 -04:00
1b0978abf3
MDL-60433 mod_data: Fix strict check for groupid
2017-10-31 13:24:07 +01:00
9daa5874a0
Merge branch 'MDL-60607' of git://github.com/timhunt/moodle
2017-10-31 12:57:36 +08:00
ade8dd5d08
MDL-60607 quiz reports: catch separate groups & user has no group case
2017-10-30 17:57:30 +00:00
860d33c90a
Merge branch 'MDL-60348-master' of git://github.com/jleyva/moodle
2017-10-30 15:53:53 +01:00
eefa2c88e0
MDL-60607 quiz reports: move duplicate code to superclass method
2017-10-30 13:43:36 +00:00
7336f854e6
MDL-60348 mod_workshop: Add parameters checks in evaluate_assessment WS
2017-10-30 13:50:57 +01:00
6065875eac
Merge branch 'MDL-60433-master' of git://github.com/jleyva/moodle
2017-10-30 13:23:35 +01:00
3fdecc2841
Merge branch 'MDL-60377-master' of git://github.com/jleyva/moodle
2017-10-30 11:42:11 +01:00
51af04ab2f
Merge branch 'MDL-59606' of git://github.com/timhunt/moodle
2017-10-30 11:23:18 +08:00
9e6d1a3884
Merge branch 'MDL-60605_filetree-spacing' of https://github.com/dvdcastro/moodle
2017-10-30 10:50:26 +08:00
4e52eb8eb0
MDL-60605 assignment: Added some styles to fix spacing in YUI file tree
2017-10-27 11:06:25 -05:00
dae0ccfc45
MDL-59606 quiz responses: fix edge cases in the report
...
This patch conbines valuable contributions from Kashmira Nagwekar and
Luca Bösch. Many thanks to them. However, the final form of the fix,
and hence the blame, falls to me -- Tim.
There were several issues here:
* The load_questions_usages_by_activity method in
question/engine/datalib.php was incorrectly treating the case
when no data was returned. (Looks like a historic copy-pase from
other methods that fetch one item by unique id, which therefore
must exist.)
* The report was not correctly handling the display when the 'Which
tries' was set to 'with, and without, attempts'.
* It was possible to select the 'All tries' option when also saying
'Users without attempts'. This combination makes not sense, so
a disabledIf rule was added to the form.
2017-10-27 16:57:01 +01:00
ef9f60a635
MDL-59950 analytics: Use cognitive depth and social breadth constants
2017-10-27 10:48:42 +02:00
ff340a0afa
Merge branch 'wip-MDL-57055-master' of git://github.com/abgreeve/moodle
2017-10-26 19:17:28 +02:00
7ec04e0e09
Merge branch 'MDL-60430-master' of https://github.com/mihailges/moodle
2017-10-26 10:27:34 +02:00
7f91fb036b
Merge branch 'MDL-60366_feedback_upgrade' of git://github.com/davosmith/moodle
2017-10-26 16:02:13 +08:00
4cc469b2cc
Merge branch 'MDL-60162' of git://github.com/timhunt/moodle
2017-10-26 14:04:45 +08:00
4d4b8ae6bf
Merge branch 'MDL-60535-questionbank-button-styled' of https://github.com/lucaboesch/moodle
2017-10-26 13:17:56 +08:00
e6ccfad242
MDL-57055 mod_label: Add label administration for boost.
...
This patch adds the label adminstration settings to the
label edit page.
2017-10-26 08:41:33 +08:00
2a1f7a4442
Merge branch 'MDL-60571-manualgrading-savegotonextpage-styled' of https://github.com/lucaboesch/moodle
2017-10-26 10:02:27 +13:00
507335e2de
Merge branch 'MDL-60538-master' of https://github.com/mihailges/moodle
2017-10-25 15:08:49 +02:00
6a633d36c2
MDL-60430 assignment: Assignment save and show next for 1 user
2017-10-25 14:18:16 +08:00
8ef00034f5
Merge branch 'MDL-36580' of https://github.com/stronk7/moodle
2017-10-25 12:45:55 +08:00
6ee00de11b
Merge branch 'MDL-36580' of https://github.com/stronk7/moodle
2017-10-25 12:45:51 +08:00
994ccb7845
MDL-60538 lesson: check if max attempts exceeded, use new lang string
2017-10-25 09:00:20 +08:00
984470d8a1
MDL-36580 backup: Avoid PHP notice restoring old backups
...
Before this implementation, both resourcekey and password
were not being included in the backups, so old backups are
missing them. To keep upwards compatibility and avoid a PHP
Notice (undefined property), existence is checked via isset(),
that is the usual way all over the restore process.
2017-10-24 22:49:10 +02:00
c282157fc3
MDL-60162 quiz reports: refactor duplicated code into the base class
...
This is needed to fix the unit test in the last commit.
2017-10-24 18:06:46 +01:00
ff456b59ea
MDL-60162 quiz reports: too many rows fetched on download
...
This happened if one user had multiple enrolments in a course, and was
quite inefficient.
2017-10-24 18:06:44 +01:00
57f4e9608d
MDL-60535 quiz: question bank button styled
2017-10-24 16:08:17 +01:00
Jun Pataleta