69159 Commits

Author SHA1 Message Date
Dan Poltawski
4709708d48 Merge branch 'MDL-46459' of git://github.com/jleyva/moodle 2014-07-28 11:59:02 +01:00
Dan Poltawski
dde5ae7cf7 Merge branch 'MDL-46463_rss_style' of https://github.com/andyjdavis/moodle 2014-07-28 11:52:09 +01:00
Dan Poltawski
733d20a0e8 Merge branch 'MDL-46433-master' of git://github.com/lameze/moodle 2014-07-28 11:49:37 +01:00
Dan Poltawski
aba225fd3a Merge branch 'MDL-46504_master' of git://github.com/dmonllao/moodle 2014-07-28 10:45:17 +01:00
Dan Poltawski
d8d240ee63 Merge branch 'MDL-46397' of git://github.com/nobelium/moodle 2014-07-28 10:41:05 +01:00
Marina Glancy
68373c7821 Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle 2014-07-28 16:00:48 +08:00
Jetha Chan
a9e05f49db MDL-46523 navigation: add body class when logged in as other role 2014-07-28 15:47:46 +08:00
Nobelium
bf4f65fbb6 MDL-46397 mod_scorm : binding cmi values with scoid 2014-07-28 05:37:21 +00:00
Sam Hemelryk
62d61619e8 Merge branch 'wip_MDL-46449_m28_loginblock' of https://github.com/skodak/moodle 2014-07-28 13:25:13 +12:00
Sam Hemelryk
9834bce700 Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle 2014-07-28 13:07:27 +12:00
Sam Hemelryk
8d4da7c010 Merge branch 'MDL-43390_master' of git://github.com/dmonllao/moodle 2014-07-28 12:22:40 +12:00
Sam Hemelryk
9894b272c5 Merge branch 'wip-MDL-46525-master' of git://github.com/marinaglancy/moodle 2014-07-28 12:13:44 +12:00
Sam Hemelryk
cb2ca9b9cc Merge branch 'MDL-8501-master' of git://github.com/FMCorz/moodle 2014-07-28 12:10:03 +12:00
Sam Hemelryk
db28260c29 Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle 2014-07-28 08:46:03 +12:00
Sam Hemelryk
896506e4df Merge branch 'MDL-46207-master' of git://github.com/damyon/moodle 2014-07-28 08:37:42 +12:00
Juan Leyva
253c3f36bb MDL-46459 Web Services: Incorrect return parameters get_grades external function 2014-07-25 09:27:45 +02:00
Damyon Wiese
cbec30d4de MDL-46485 Assign: Fix when submitting to a group assignment from the default group 2014-07-25 15:18:40 +08:00
Damyon Wiese
e2d2d8a175 MDL-46485 Assign: New unit test to show error with group submission 2014-07-25 15:18:34 +08:00
Marina Glancy
bd56200e09 MDL-46525 enrol_cohort: fix JS error 2014-07-25 14:40:52 +08:00
Frederic Massart
d9c767c76b MDL-8501 mod_forum: Behat test for neighbour discussions 2014-07-25 10:26:56 +08:00
Frederic Massart
d78628783b MDL-8501 mod_forum: Adding links to navigate between discussions 2014-07-25 10:26:56 +08:00
Frederic Massart
826cb6f6a1 MDL-8501 mod_forum: Test coverage of neighbour discussions 2014-07-25 09:55:29 +08:00
Frederic Massart
8d3a5ba176 MDL-8501 mod_forum: New function to retrieve discussion neighbours 2014-07-25 09:55:29 +08:00
Petr Skoda
1f5be49d65 MDL-46449 fix username prompt in login block when authloginviaemail enabled 2014-07-25 10:10:29 +12:00
Dan Poltawski
40f0ad21a3 weekly release 2.8dev 2014-07-24 09:50:52 +01:00
Dan Poltawski
25f0ec805c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-07-24 09:50:49 +01:00
Damyon Wiese
9f65f9c332 MDL-46506 Assign: fix php warning on grant extension page
This code was missed when the extensionduedate was moved to the userflags table.
2014-07-24 11:25:22 +08:00
David Monllao
03bdb0a7c2 MDL-46504 libraries: Fixing typo 2014-07-24 11:15:36 +08:00
Damyon Wiese
3169bb36aa MDL-46017 Assign: Restore can't rely allocated marker fields existing in backup 2014-07-24 10:50:20 +08:00
David Monllao
10ccdfb8cd MDL-43390 files: Only lock when locking is not prevented 2014-07-24 10:22:55 +08:00
AMOS bot
8db9324914 Automatically generated installer lang files 2014-07-23 22:46:06 +00:00
Simey Lameze
153b3ad002 MDL-46433 blog: fix error message when creating an external blog 2014-07-23 16:11:20 +08:00
Dan Poltawski
a3fa656019 Revert "Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle"
This reverts commit fe43ab9b75a6f78f86525be8b309e66c162b2957, reversing
changes made to 3e2af223273fcd008a136c15a587475f5b04081b.
2014-07-23 09:00:54 +01:00
Dan Poltawski
1911cf3c99 Merge branch 'MDL-46017-master' of git://github.com/damyon/moodle 2014-07-23 08:24:24 +01:00
Damyon Wiese
6b78b55c15 MDL-35864 Enrol plugins: Add missing capability strings 2014-07-23 13:53:55 +08:00
Sam Hemelryk
ed2de2ecc7 MDL-45724 cache: fixed warning structure bug 2014-07-23 15:24:59 +12:00
Andrew Davis
1502bf7734 MDL-46463 core_rss: coding style cleanup in /rss 2014-07-23 10:22:53 +08:00
AMOS bot
aec0035b11 Automatically generated installer lang files 2014-07-22 22:49:02 +00:00
Dan Poltawski
919dc292b9 MDL-45965 assign: bump version 2014-07-22 17:23:45 +01:00
Dan Poltawski
406e47123d Merge branch 'MDL-45965_master' of https://github.com/Syxton/moodle 2014-07-22 17:09:48 +01:00
Dan Poltawski
fce6c70d41 MDL-44925 fixup default settings in TeX filter 2014-07-22 17:06:02 +01:00
Dan Poltawski
82f88cabe9 MDL-35864 enrol: misc fixups
* Removed get_config_instance_capabilities() which was from
  older reviewed vrsions of the patch
* Added note to upgrade.txt
* Fixed deprecation note
* Bump versions
2014-07-22 17:02:21 +01:00
Dan Poltawski
12bdea2eb5 Merge branch 'MDL-35864' of https://github.com/danielneis/moodle 2014-07-22 16:32:26 +01:00
Dan Poltawski
02213adfd0 Merge branch 'MDL-37509-master' of git://github.com/damyon/moodle 2014-07-22 15:56:55 +01:00
Dan Poltawski
afffcb9472 Merge branch 'MDL-44925-master' of https://github.com/dthies/moodle 2014-07-22 14:33:33 +01:00
Dan Poltawski
6442e5c7ed Merge branch 'MDL-34248_master' of https://github.com/markn86/moodle 2014-07-22 12:01:04 +01:00
Dan Poltawski
5f7ab6e949 Merge branch '45828-28' of git://github.com/samhemelryk/moodle 2014-07-22 09:33:01 +01:00
Dan Poltawski
d28d270bca Merge branch '45724-28' of git://github.com/samhemelryk/moodle 2014-07-22 09:07:16 +01:00
Sam Hemelryk
fe43ab9b75 Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle 2014-07-22 11:12:09 +12:00
Sam Hemelryk
3e2af22327 Merge branch 'MDL-43063-master' of git://github.com/lameze/moodle 2014-07-22 09:49:03 +12:00