84705 Commits

Author SHA1 Message Date
Jake Dallimore
63aa8c27be Merge branch 'MDL-58136-master' of git://github.com/damyon/moodle 2017-06-14 12:31:56 +01:00
Jake Dallimore
235df202c4 Merge branch 'MDL-51691-master' of https://github.com/jebarviabb/moodle 2017-06-14 12:30:43 +01:00
Jun Pataleta
abb8b5e147 Merge branch 'MDL-58248-theme_boost-label-for-expand-button' of https://github.com/marcusgreen/moodle 2017-06-14 12:30:43 +01:00
Eloy Lafuente (stronk7)
1e34274846 Merge branch 'MDL-59032-master' of git://github.com/damyon/moodle 2017-06-14 12:30:42 +01:00
Eloy Lafuente (stronk7)
29a063a13f Merge branch 'MDL-59133-master' of git://github.com/jleyva/moodle 2017-06-14 12:30:42 +01:00
Eloy Lafuente (stronk7)
e0f8686f39 Merge branch 'MDL-40015-master' of git://github.com/jleyva/moodle 2017-06-14 12:30:41 +01:00
Eloy Lafuente (stronk7)
8a55a41f88 Merge branch 'mdl58161-master' of https://github.com/tlock/moodle 2017-06-14 12:30:41 +01:00
Eloy Lafuente (stronk7)
4009603025 Merge branch 'MDL-59056-admin-allowstealth-select-checkbox' of https://github.com/lucaboesch/moodle 2017-06-14 12:30:41 +01:00
Eloy Lafuente (stronk7)
bf3b9e57b8 Merge branch 'MDL-58907_master' of git://github.com/markn86/moodle 2017-06-14 12:30:40 +01:00
Eloy Lafuente (stronk7)
0c272e07e2 Merge branch 'MDL-59132-master' of git://github.com/jleyva/moodle 2017-06-14 12:30:40 +01:00
Eloy Lafuente (stronk7)
f30af085a9 Merge branch 'MDL-58318-master' of git://github.com/damyon/moodle 2017-06-14 12:30:39 +01:00
Dan Poltawski
fd5772e691 Merge branch 'wip_MDL-36501_master' of https://github.com/mtpmcdermott/moodle 2017-06-14 12:30:39 +01:00
Dan Poltawski
ff3c693b58 Merge branch 'MDL-50011-master' of https://github.com/nwp90/moodle 2017-06-14 12:30:38 +01:00
Eloy Lafuente (stronk7)
03b0cb584c Merge branch 'MDL-59112-master' of git://github.com/jleyva/moodle 2017-06-14 12:30:38 +01:00
Dan Poltawski
dd4208e6ec Merge branch 'mdl46322-master' of https://github.com/AndresMelo/moodle 2017-06-14 12:30:37 +01:00
Damyon Wiese
4c735661ad MDL-58136 course: Remove lines from unit test
Remove unused vars and logic from the unit test for classifying a course.
2017-06-13 15:06:20 +08:00
Damyon Wiese
c561297d26 MDL-58136 navigation: Ensure we have all course fields
To properly classify courses we need the start/end dates etc.
2017-06-13 10:07:54 +08:00
Damyon Wiese
ddce4f4ba9 MDL-58136 cache: Add a course completion cache
The last change added 1 db read per course per page which is not OK. Add a cache to compensate.
2017-06-13 10:03:00 +08:00
Damyon Wiese
d07373f289 MDL-58136 boost: Limit courses in flatnav
Only show "in-progress" courses in the boost flat navigation (as per the myoverview block).
2017-06-13 10:02:14 +08:00
Josh Ebarvia
9916cef9c4 MDL-51691 assignsubmission_feedback: Fix delete comments 2017-06-13 08:39:53 +09:30
Tim Lock
d621396fee MDL-58161 user: tests: user_can_view_profile fails under certain cases 2017-06-13 08:12:08 +09:30
Dan Poltawski
fc4e3b3cf0 MDL-55548 course: update test to use waitForSecond() 2017-06-12 10:04:01 +01:00
Dan Poltawski
a52d3abbb6 Merge branch 'MDL-55548_master' of git://github.com/markn86/moodle 2017-06-12 10:00:24 +01:00
Mark Nelson
b75ff47441 MDL-55548 backup: changes after review
1) There is no need to store the 'timemodified' value of
the section when backing up a course module, they do
not refer to the same time.
2) When creating a new course section during restore use
the current time.
3) Added timemodified value to more places when updating
the 'course_sections' table.
2017-06-12 15:52:54 +08:00
Devang Gaur
4ddf7c6025 MDL-55548 course: added timemodified field to course_sections table 2017-06-12 15:52:53 +08:00
Jun Pataleta
8b6dfe10ee Merge branch 'MDL-59042-master-upgradefix' of github.com:snake/moodle 2017-06-12 15:29:59 +08:00
Jake Dallimore
8430250a2f MDL-59042 upgrade: fix for non existent table in core upgrade.
Moved upgrade step to the assign mod where table is known to exist.
2017-06-12 15:03:31 +08:00
Jake Dallimore
3b3460bc73 Merge branch 'MDL-57103-master' of https://github.com/xow/moodle 2017-06-12 13:58:14 +08:00
Jun Pataleta
46f2ea5dba Merge branch 'MDL-59154-master' of git://github.com/andrewnicols/moodle 2017-06-12 13:44:57 +08:00
Jun Pataleta
8363ec8637 Merge branch 'MDL-59042-master' of git://github.com/snake/moodle 2017-06-12 13:29:03 +08:00
Jake Dallimore
4cd1d4c70f MDL-59042 upgrade: datafix assign group overrides with null priority
Find any events records for assign group overrides having null priority
and sets their priority to the sortorder value from the corresponding
assign_overrides table entry.
2017-06-12 13:18:40 +08:00
John Okely
c9a4d37c3d MDL-57103 lib: Force ajax renderer for all ajax fatal errors 2017-06-12 10:36:42 +08:00
Mark Nelson
0ecb3d7786 MDL-58907 block_myoverview: change URL when tab is selected
We then check if this paramter exists in the URL and if it
does we display the specified tab.
2017-06-12 10:34:38 +08:00
Mark Nelson
4dfb8cf060 MDL-58907 block_myoverview: display last tab user was on 2017-06-12 10:34:38 +08:00
Mark Nelson
ff6cd55d79 MDL-58907 block_myoverview: added setting to select default tab 2017-06-12 10:34:38 +08:00
Juan Leyva
63130e328d MDL-59133 mod_lesson: Return page record in get_user_attempt WS 2017-06-09 12:07:16 +01:00
Jake Dallimore
67ed6d415e MDL-59042 assign: Group override edit no longer resets event priority
Fixed a bug in which $fromform->sortorder wasn't set before passing
$formdata to assign_update_events, resulting in the existing event
priority being incorrectly nulled and breaking the effective override.
2017-06-09 15:23:46 +08:00
Luca Bösch
ad2cba8ec5 MDL-59056 admin: allowstealth yes/no checkbox instead of on/off 2017-06-08 19:13:05 +02:00
Marcus Green
78af4ba053 MDL-58248 theme_boost: label/span for sidepanel expand button
Add string "Side panel" to make the purpose of
trigram/hamburger icon at top left clearer, particularly
when using screen readers e.g. Jaws/NVDA.
Currently it reads out only "expand"
2017-06-08 18:06:01 +01:00
Dan Poltawski
4c6063bff9 weekly release 3.4dev 2017-06-08 12:16:18 +01:00
Dan Poltawski
97559da88d Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-06-08 12:16:16 +01:00
Juan Leyva
7c3c0fa323 MDL-59132 mod_feedback: Fix anonymous responses numbering
This was done correctly by the web scrip but not by the WS.
2017-06-08 11:14:45 +01:00
Juan Leyva
67adb4d8c1 MDL-40015 core_course: Fix description of duplicate_course WS
It said that the duplication didn’t include user data, but that’s not
true since there is a parameter to include it.
2017-06-08 10:19:47 +01:00
Juan Leyva
15248799ff MDL-59112 theme_clean: Always return expected moodle_url
The function was returned some times a moodle_url object and another
times just a string with a relative URL.
2017-06-08 09:39:44 +01:00
Andrew Nicols
d0f6660b98 MDL-59154 theme: Lock for all caching builds
The previous behaviour was to only lock when in theme designer mode.
As a result, when generating the theme for after a reset, each new
client was starting the generation afresh and no locking was taking
place at all.
2017-06-08 11:49:50 +08:00
Dan Poltawski
60d04b28e7 Merge branch 'MDL-59101-master' of git://github.com/junpataleta/moodle 2017-06-07 16:25:58 +01:00
Jun Pataleta
51807cf5c4 MDL-59101 calendar: Properly calculate expected until date 2017-06-07 23:09:17 +08:00
Dan Poltawski
1cf7106717 Merge branch 'MDL-58567-master-fix' of git://github.com/junpataleta/moodle 2017-06-07 15:14:30 +01:00
Jun Pataleta
83740b9fc1 MDL-58567 upgradelib: Do not show upgrade times on install 2017-06-07 16:15:40 +08:00
Jun Pataleta
953df36964 Merge branch 'MDL-57139-master' of git://github.com/danpoltawski/moodle 2017-06-07 14:36:13 +08:00