mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
84,729 Commits 36 Branches 519 Tags
Commit Graph

84729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Dallimore
af12c81d51 Merge branch 'MDL-59140_master-fix-v2' of https://github.com/markn86/moodle 2017-06-15 13:34:24 +08:00
Mark Nelson
3dabb083ad MDL-59140 core: apply limit only on courses to be shown in specific nav 
There can be a different number of courses displayed in the
'Navigation' block and in the 'Flat' navigation. This patch
decides what courses we want to display on each, then
applies the 'navcourselimit' setting individually.
 2017-06-15 13:10:14 +08:00
Jake Dallimore
bb931788cc Merge branch 'MDL-59142-master' of git://github.com/lameze/moodle 2017-06-14 12:38:11 +01:00
Dan Poltawski
7419853951 Merge branch 'MDL-59171-master' of git://github.com/junpataleta/moodle 2017-06-14 12:36:39 +01:00
Dan Poltawski
e66905375e Merge branch 'MDL-55548_master-fix' of https://github.com/markn86/moodle 2017-06-14 12:36:38 +01:00
Mark Nelson
f25e2b1dc7 MDL-55548 core: fixed misleading comment in upgrade code 2017-06-14 12:36:38 +01:00
Dan Poltawski
569907002f Merge branch 'MDL-59140_master' of git://github.com/markn86/moodle 2017-06-14 12:36:37 +01:00
Mark Nelson
c8f2e0e96b MDL-59140 core: upgrade 'navcourselimit' if set to old default value 2017-06-14 12:32:05 +01:00
Mark Nelson
fa238237a0 MDL-59140 core: limit the number of courses shown in the navigation 
If the user is enrolled in more courses than the limit then a 'More...'
link is displayed which takes the user to the course/index.php page.
 2017-06-14 12:32:04 +01:00
Mark Nelson
c0a9edbd18 MDL-59140 core: changes to the 'navcourselimit' setting 
Changed the default and description.
 2017-06-14 12:32:04 +01:00
Eloy Lafuente (stronk7)
736973d604 Merge branch 'wip-MDL-58523-master' of git://github.com/marinaglancy/moodle 2017-06-14 12:32:03 +01:00
Jun Pataleta
e037a6a126 Merge branch 'MDL-59012-master-linkurl' of git://github.com/mudrd8mz/moodle 2017-06-14 12:32:03 +01:00
Eloy Lafuente (stronk7)
6c79f56fe0 Merge branch 'MDL-58820-master' of https://github.com/nwp90/moodle 2017-06-14 12:32:03 +01:00
Jun Pataleta
ef9b236d8a Merge branch 'MDL-58991-master' of git://github.com/lameze/moodle 2017-06-14 12:32:02 +01:00
Dan Poltawski
5dbb6b74a9 Merge branch 'MDL-41426-block-completionstatus-spaces' of https://github.com/lucaboesch/moodle 2017-06-14 12:32:02 +01:00
Dan Poltawski
f1ec088e84 Merge branch 'MDL-46322' of https://github.com/stronk7/moodle 2017-06-14 12:32:01 +01:00
Eloy Lafuente (stronk7)
84e3c97bb0 MDL-46322 database: alias sort fields to avoid ambiguous naming 2017-06-14 12:32:01 +01:00
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
Marina Glancy
c3c97e2ee2 MDL-58523 mod_feedback: deleting response should reset completion 2017-06-13 14:35:08 +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
Simey Lameze
4cc2f33b08 MDL-59142 core_theme: cache post-processed css 
Thanks Cameron Ball for the base patch
 2017-06-13 09:35:35 +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