ca1e040bbf
Merge branch 'wip-MDL-58523-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE
2017-06-13 11:21:12 +02:00
1312c844a1
Merge branch 'MDL-59012-33-linkurl' of git://github.com/mudrd8mz/moodle into MOODLE_33_STABLE
2017-06-14 17:11:47 +08:00
a21c3208ea
Merge branch 'MDL-58991-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE
2017-06-14 16:56:23 +08:00
a1692f6362
Merge branch 'MDL-41426_33-block-completionstatus-spaces' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE
2017-06-13 09:53:59 +01:00
9bcb6e1bec
MDL-46322 database: alias sort fields to avoid ambiguous naming
2017-06-13 09:17:04 +01:00
192a355707
Merge branch 'MDL-58136-33' of git://github.com/damyon/moodle into MOODLE_33_STABLE
2017-06-13 15:54:42 +08:00
3709386ed5
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:07:50 +08:00
9bdff1611b
MDL-58523 mod_feedback: deleting response should reset completion
2017-06-13 14:36:24 +08:00
ca18b0c33d
Merge branch 'MDL-51691-moodle33' of https://github.com/jebarviabb/moodle into MOODLE_33_STABLE
2017-06-13 10:32:45 +08:00
0fb6f059a9
MDL-58136 navigation: Ensure we have all course fields
...
To properly classify courses we need the start/end dates etc.
2017-06-13 10:09:44 +08:00
7dc35ed9d2
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-13 09:50:01 +08:00
48b929667e
Merge branch 'MDL-59032-33' of git://github.com/damyon/moodle into MOODLE_33_STABLE
2017-06-13 01:28:22 +02:00
6dc00c8423
Merge branch 'MDL-40015-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
2017-06-13 01:23:43 +02:00
290ec233f5
Merge branch 'mdl58161-moodle33' of https://github.com/tlock/moodle into MOODLE_33_STABLE
2017-06-13 01:21:54 +02:00
56aa74ed3c
Merge branch 'MDL-59056_33-admin-allowstealth-select-checkbox' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE
2017-06-13 01:19:26 +02:00
fe3d722d69
MDL-51691 assignsubmission_feedback: Fix delete comments
2017-06-13 08:35:25 +09:30
792560a608
Merge branch 'MDL-58907_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE
2017-06-13 01:03:43 +02:00
7041dc6f8a
Merge branch 'MDL-59132-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
2017-06-13 00:45:09 +02:00
57fb48743f
MDL-58161 user: tests: user_can_view_profile fails under certain cases
2017-06-13 08:10:43 +09:30
a9712dacbe
Merge branch 'MDL-59112-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
2017-06-12 14:39:14 +02:00
c0f4b8b3c1
Merge branch 'mdl46322-moodle33' of https://github.com/AndresMelo/moodle into MOODLE_33_STABLE
2017-06-12 10:29:18 +01:00
9a9b9e53f0
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-12 16:08:57 +08:00
e1d15194bc
MDL-58136 boost: Limit courses in flatnav
...
Only show "in-progress" courses in the boost flat navigation (as per the myoverview block).
2017-06-12 16:08:18 +08:00
a53a439c08
Merge branch 'MDL-59042-33-upgradefix' of github.com:snake/moodle into MOODLE_33_STABLE
2017-06-12 15:30:54 +08:00
2c12e7f534
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:26:03 +08:00
b545e84294
Merge branch 'MDL-57103-33' of https://github.com/xow/moodle into MOODLE_33_STABLE
2017-06-12 14:00:25 +08:00
72ebc73897
Merge branch 'MDL-59154-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
2017-06-12 13:45:16 +08:00
856e1c24c2
Merge branch 'MDL-59042-33' of git://github.com/snake/moodle into MOODLE_33_STABLE
2017-06-12 13:29:21 +08:00
5b1dffd5b0
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:19:28 +08:00
6ebff58d8c
MDL-57103 lib: Force ajax renderer for all ajax fatal errors
2017-06-12 10:36:59 +08:00
54bee25c65
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:35:23 +08:00
355fefbe71
MDL-58907 block_myoverview: display last tab user was on
2017-06-12 10:35:23 +08:00
11a24a823b
MDL-58907 block_myoverview: added setting to select default tab
2017-06-12 10:35:23 +08:00
e2b8d30052
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:28:08 +08:00
571e862135
MDL-59056 admin: allowstealth yes/no checkbox instead of on/off
2017-06-08 21:09:54 +02:00
1e9ba1916b
MDL-41426 block: Whitespace lacking in completion status block
2017-06-08 19:10:41 +02:00
760ed1dfde
weekly release 3.3+
2017-06-08 12:16:24 +01:00
95a6fe8b05
Merge branch 'install_33_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_33_STABLE
2017-06-08 12:16:23 +01:00
0fca28e197
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:16:52 +01:00
cc5235bb77
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:20:39 +01:00
1099b7ce1d
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:40:39 +01:00
dc403b8386
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 12:05:27 +08:00
23bec87007
Merge branch 'MDL-59101-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE
2017-06-07 16:26:19 +01:00
924db1a0a6
MDL-59101 calendar: Properly calculate expected until date
2017-06-07 23:13:05 +08:00
f8326931a1
Merge branch 'MDL-59076_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE
2017-06-07 09:24:57 +08:00
0a98628841
MDL-58908 auth_oauth2: Don't kill gravatar
...
If gravatar is enabled, don't update profile pictures.
2017-06-06 17:29:56 +08:00
d72a096797
Merge branch 'MDL-58658' of https://github.com/sk-unikent/moodle into MOODLE_33_STABLE
2017-06-06 10:02:32 +01:00
a6379acaf3
MDL-59032 scorm: Don't show action events to teachers
2017-06-06 15:57:39 +08:00
e002d8c2db
Merge branch 'MDL-59086_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE
2017-06-06 08:44:49 +01:00
2b7268d645
MDL-58991 report_stats: use same date handling on chart rendering
...
This commmit fixes applies the same date handling used on stats
table render to the charts render.
2017-06-06 13:56:15 +08:00
Eloy Lafuente (stronk7)