moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 03:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72601 commits 37 branches 544 tags 1.3 GiB
Commit graph

16552 commits

Author SHA1 Message Date
Dan Poltawski
4501ee4b16 Merge branch 'MDL-48965' of git://github.com/jmvedrine/moodle 2015-03-16 21:05:56 +00:00
Dan Poltawski
f5526fdf8f Merge branch 'wip-MDL-49267-master' of git://github.com/marinaglancy/moodle 2015-03-16 15:52:36 +00:00
Dan Poltawski
448a80c6e9 Merge branch 'MDL-48717-master' of git://github.com/jleyva/moodle 2015-03-16 15:28:50 +00:00
Juan Leyva
e6d6393478 MDL-48717 book: book_exports_contents unit tests 2015-03-16 15:59:20 +01:00
Dan Poltawski
f3b35cffc3 Merge branch 'MDL-49187' of https://github.com/spvickers/moodle 2015-03-16 14:45:53 +00:00
Dan Poltawski
6a24f0a796 Merge branch 'MDL-45725-master' of https://github.com/lucisgit/moodle 2015-03-16 10:52:02 +00:00
Tony Butler
f5ba1b93a2 MDL-45725 core_lib: Save user preferences for flexible tables 2015-03-16 10:41:11 +00:00
David Monllao
fd822c0bc5 Merge branch 'MDL-19670-master' of git://github.com/gurgus/moodle 2015-03-16 13:45:31 +08:00
Dan Marsden
9e733da743 MDL-44548 mod_scorm: force an external sync to check for updated files. 2015-03-16 09:02:26 +13:00
Juan Leyva
752901faf3 MDL-48717 book: book_exports_contents function implementation 2015-03-13 11:14:59 +01:00
Dave Cooper
2587313a9a MDL-19670 mod_forum: Allow user to post a copy to all accessible groups 2015-03-12 17:02:49 +08:00
Dave Cooper
f267b8b2f4 MDL-19670 mod_forum: Add tests for posting to multiple discussions 2015-03-12 17:02:43 +08:00
David Monllao
ac28aad351 Merge branch 'MDL-49069' of git://github.com/rlorenzo/moodle 2015-03-11 08:17:29 +08:00
Eloy Lafuente (stronk7)
0cb0cd30f5 Merge branch 'MDL-49159' of https://github.com/spvickers/moodle 2015-03-11 00:17:37 +01:00
Rex Lorenzo
c9f2d347f3 MDL-49069 mod_forum: Ability to specify default values for Forum RSS 2015-03-10 14:57:03 -07:00
Dan Poltawski
449f3db147 Merge branch 'wip-mdl-49402' of https://github.com/rajeshtaneja/moodle 2015-03-10 08:33:37 +00:00
Dan Poltawski
1151c0cd8b Merge branch 'MDL-48682_master' of git://github.com/dmonllao/moodle 2015-03-10 08:25:30 +00: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
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
Jean-Michel Vedrine
5b0af6e4b1 MDL-39262 mod_lesson: disable shortforms in lesson question display 2015-03-08 11:06:53 +01:00
Jean-Michel Vedrine
400fa4a1b5 MDL-48965 mod_lesson: avoid short answer question without any answers 2015-03-07 22:04:27 +01:00
Marina Glancy
2f7b38cfb3 MDL-49267 mod_wiki: always apply filters to the wiki name 2015-03-06 13:57:55 +08:00
Rajesh Taneja
d7fec593f3 MDL-49402 behat: Fixed feature file with same scenario name 
1. We should not have same scanrio name in 1 feature file
   As it doesn't explain what is being tested. So modified.
2. Removed empty line, to keep it consistnet with other features
 2015-03-06 11:47:17 +08:00
David Monllao
e967111644 MDL-48682 behat: Changing window size on specific tests 2015-03-06 11:02:45 +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
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
spvickers
64ca282207 MDL-49187 mod_lti: Fix tool config lookup 
Changed code to look for a tool ID before then matching on the URL.
 2015-03-03 18:49:58 -07:00
Andrew Nicols
8506c95c9f Merge branch 'MDL-49364' of git://github.com/timhunt/moodle 2015-03-04 08:51:21 +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)
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
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
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
Andrew Nicols
aa0de891d1 Merge branch 'MDL-49285-master' of git://github.com/merrill-oakland/moodle 2015-03-03 16:22:01 +08:00
Andrew Nicols
596b86d6b2 Merge branch 'MDL-49075-master' of https://github.com/lucisgit/moodle 2015-03-03 15:32:13 +08:00
Jean-Michel Vedrine
a1300e98bb MDL-48984 mod_lesson: some lesson_answers answers should be plain text 
Branch tables jump descriptions, short answer question answers
and numerical question answers should be plain text, and no editor
should be available here.
 2015-03-03 08:24:24 +01:00
Eloy Lafuente (stronk7)
900aa6e5fe Merge branch 'MDL-49328-master' of https://github.com/lucisgit/moodle 2015-03-02 18:12:28 +01:00