mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 00:50:15 +01:00
Code Issues Projects Releases Wiki Activity
72,493 Commits 36 Branches 527 Tags
Commit Graph

72493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
ed1027765e Merge branch 'MDL-49332-master' of git://github.com/merrill-oakland/moodle 2015-03-10 10:42:42 +08:00
David Monllao
11db2e188f Merge branch 'MDL-48572' of git://github.com/rlorenzo/moodle 2015-03-10 10:26:58 +08:00
David Monllao
5091a63fc1 Merge branch 'MDL-46064_master' of git://github.com/markn86/moodle 2015-03-10 10:23:55 +08:00
David Monllao
660ca679f7 Merge branch 'MDL-39262' of git://github.com/jmvedrine/moodle 2015-03-10 10:12:44 +08:00
David Monllao
25ffb8d561 MDL-5583 mod_data: Unify mod_data version 2015-03-10 10:08:32 +08:00
David Monllao
039b74fd01 Merge branch 'MDL-5583-master' of git://github.com/xow/moodle 2015-03-10 10:02:23 +08:00
David Monllao
f966af0da3 Merge branch 'wip-MDL-48437_MASTER' of git://github.com/jason-platts/moodle 2015-03-10 09:56:21 +08:00
Eloy Lafuente (stronk7)
beaceef9ee weekly release 2.9dev 2015-03-09 16:47:28 +01:00
John Okely
1c3b2058c8 MDL-5583 mod_data: Improve required fields 
Fix accidental <tr> in some field modify screens
Update mod_data version
Change required asterisk to image
Improve required error message
Fix required icon positions
Remove required code from date field
Add name in labels for fields
Add required field option for multimenu
Remove old required field title text modifier
Add multimenu to behat
Add more comprehensive behat tests
Reload old input when an input error occurs
Behat grammar fixes
Allow location of 0, 0
Use html_writer
Fix existing mod_data behat tests
 2015-03-09 13:56:16 +08:00
Marina Glancy
51fef1de35 MDL-49418 core: partial revert of MDL-48804 
this is a quick fix for the issue 'Course module with two or more availability restrictions is not accessible'
MDL-49434 is created to deal with the renderer access inside availability check
 2015-03-09 11:26:50 +08:00
Jean-Michel Vedrine
5b0af6e4b1 MDL-39262 mod_lesson: disable shortforms in lesson question display 2015-03-08 11:06:53 +01:00
Mark Nelson
71611510a0 MDL-46064 install: prevent install/upgrade with MyISAM 2015-03-05 22:29:34 -08:00
Damyon Wiese
b89cca197e MDL-5583 mod_data: Add required fields 
This is implemented for most fields but not all. The reason is that there are
some fields for which this does not make sense because no entry is a valid entry.

The supported fields are:
    checkbox
    file
    latlong
    menu
    number
    picture
    radio
    text
    textarea
    url

The unsupported fields are:
    date
    multimenu
 2015-03-06 09:55:49 +08:00
John Okely
9776f3dcdb MDL-5583 behat: Add multiline version of 'And I set the field to' 2015-03-06 09:55:49 +08:00
Rex Lorenzo
c288300c3c MDL-48572 gradereport_grader: Average wrong with suspended users 2015-03-05 11:02:58 -08:00
Eric Merrill
17e56698ec MDL-49332 gradebook: Raise time limit if we get into regrade 
Because all regrading should (and does) start from this point, it
is safe and best to call it just once, from this point.
 2015-03-05 10:09:40 -05:00
Eloy Lafuente (stronk7)
b90f98dade weekly release 2.9dev 2015-03-05 11:26:30 +01:00
Rajesh Taneja
4ba58b4540 MDL-48962 mod_lesson: New lesson should not be timed 2015-03-05 14:55:18 +08:00
Rajesh Taneja
8b88ba475e MDL-48962 mod_lesson: Fixed behat with new timeout setting and string 2015-03-05 14:55:18 +08:00
Eloy Lafuente (stronk7)
d687c29f26 Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle 2015-03-05 00:24:49 +01:00
Jean-Michel Vedrine
5df7f12398 MDL-48912 mod_lesson: fix problems found during testing 2015-03-04 21:50:33 +01:00
Jetha Chan
d10ac16a2f MDL-48060 messaging: contact list paging bar style fixup 2015-03-04 17:37:04 +01:00
Eloy Lafuente (stronk7)
de2f05d50d Merge branch 'MDL-49379_master' of git://github.com/markn86/moodle 2015-03-04 10:46:18 +01:00
Mark Nelson
05536ad165 MDL-49379 core_webservice: fixed ability to edit services 2015-03-04 01:36:45 -08:00
David Monllao
553319be03 MDL-49204 core_message: Checking current user 2015-03-04 10:05:26 +08:00
Andrew Nicols
4b38a19aec Merge branch 'MDL-49164_old_rego' of https://github.com/andyjdavis/moodle 2015-03-04 08:57:00 +08:00
Andrew Nicols
8506c95c9f Merge branch 'MDL-49364' of git://github.com/timhunt/moodle 2015-03-04 08:51:21 +08:00
Andrew Davis
858e92fefe MDL-49164 admin: removed unused registration config setting 2015-03-04 08:50:39 +08:00
Andrew Nicols
a1955c1784 Merge branch 'master_MDL-46390' of https://github.com/danmarsden/moodle 2015-03-04 07:52:55 +08:00
Eloy Lafuente (stronk7)
0967a20d02 Merge branch 'MDL-48962' of git://github.com/jmvedrine/moodle 2015-03-04 00:00:16 +01:00
Dan Marsden
f47a8a6f81 MDL-46390 mod_scorm: Find correct sco to launch when org based sco is selected 
Also tidies up some redundant code in scorm_format_toc_for_droplist()
 2015-03-04 09:27:45 +13:00
Eloy Lafuente (stronk7)
9c3df39d63 Merge branch 'MDL-49214_master' of git://github.com/lazydaisy/moodle 2015-03-03 19:34:49 +01:00
Eloy Lafuente (stronk7)
3d944d37dd Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle 2015-03-03 19:30:00 +01:00
Dan Poltawski
e2d8685247 Merge branch 'MDL-49335' of git://github.com/timhunt/moodle 2015-03-03 14:46:34 +00:00
Dan Poltawski
2076324e7d Merge branch 'MDL-49334' of git://github.com/timhunt/moodle 2015-03-03 13:25:33 +00:00
Dan Poltawski
f7681b5181 Merge branch 'MDL-47000-master' of git://github.com/merrill-oakland/moodle 2015-03-03 13:21:30 +00:00
Dan Poltawski
7cbdb75699 Merge branch 'MDL-49246-master' of git://github.com/lameze/moodle 2015-03-03 13:19:36 +00:00
Tim Hunt
8b6fcfa958 MDL-49364 quiz statistics: escape output in the response analysis 2015-03-03 13:04:18 +00:00
Eloy Lafuente (stronk7)
6442803f76 MDL-48984 mod_lesson: explicitly close some recordsets 2015-03-03 12:52:40 +01:00
Eloy Lafuente (stronk7)
6230f717bf Merge branch 'MDL-48984' of git://github.com/jmvedrine/moodle 2015-03-03 12:52:20 +01:00
Dan Poltawski
6a4caa0128 Merge branch 'MDL-34006_m29v6' of https://github.com/sbourget/moodle 
Conflicts:
	mod/lesson/version.php
	mod/lesson/db/upgrade.php
	mod/lesson/db/install.xml
 2015-03-03 11:40:17 +00:00
Tim Hunt
867b0430b0 MDL-49335 quiz behat: new test of attempting a quiz 
This separates out attempting the quiz into a separate .feature, away
from the monolithic add_quiz.feature. At some point we should clean that
up, but for now I am just adding this.

Really, the main reason for this test is to verify the two Behat
enhancememnts I just did.
 2015-03-03 11:19:48 +00:00
Tim Hunt
eeb7552589 MDL-49335 quiz behat: improved step for adding questions to a quiz 
Explicit headings make the script more readable, and pave the way for
new options that are due to be added.
 2015-03-03 11:19:48 +00:00
Tim Hunt
92caa214ef MDL-49335 Behat: new question selector 
So you can say things like
    And I click on "True" "radio" in the "First question" "question"
 2015-03-03 11:19:48 +00:00
Tim Hunt
f70fbc05e1 MDL-49334 behat: sort selector lists 2015-03-03 11:13:31 +00:00
Eloy Lafuente (stronk7)
6d46e3a4f7 Merge branch 'MDL-45621_m29v3' of git://github.com/sbourget/moodle 2015-03-03 10:54:30 +01:00
Dan Poltawski
74293eef0c Merge branch 'MDL-48975_rego_strings2' of https://github.com/andyjdavis/moodle 2015-03-03 09:12:35 +00:00
Dan Poltawski
8eed9a9f42 Merge branch 'MDL-49160-master' of git://github.com/merrill-oakland/moodle 2015-03-03 08:34:31 +00:00
Dan Poltawski
3d25edb5d9 Merge branch 'MDL-35995-master' of git://github.com/xow/moodle 2015-03-03 08:33:02 +00:00
Andrew Nicols
ebb18182a6 MDL-49285 mod_quiz: Remove unnecessary linebreak 2015-03-03 16:23:13 +08:00