moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83364 commits 37 branches 540 tags 1.3 GiB
Commit graph

1490 commits

Author SHA1 Message Date
Jean-Michel Vedrine
716dfb630d MDL-49642 mod_lesson: fix restore of overrides 2015-04-09 15:26:40 +08:00
Dan Poltawski
f5d9f19013 Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle 2015-04-08 08:57:15 +01:00
Jean-Michel Vedrine
31cb1b0eca MDL-49642 mod_lesson: fix backup of user overrides 2015-04-08 09:21:44 +02:00
Eloy Lafuente (stronk7)
615812040a Merge branch 'MDL-49065_m29v6' of https://github.com/sbourget/moodle 2015-04-07 14:15:33 +02:00
Damyon Wiese
75ece778c5 Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2015-04-07 17:27:17 +08:00
Andrew Hancox
6398ff5387 MDL-49101 core: Add a global admin setting config->requiremodintro 
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
 2015-04-07 10:11:53 +01:00
Jean-Michel Vedrine
247980b0e8 MDL-49642 mod_lesson: Fix issues found during integration review 2015-04-05 15:05:31 +02:00
Stephen Bourget
446db9fe33 MDL-49065 Lesson: Add Behat tests for my home 2015-04-02 13:18:17 -04:00
Stephen Bourget
673e0d5a14 MDL-49065 Lesson: Fix attempt info displayed by course overview block 2015-04-02 13:17:33 -04:00
Stephen Bourget
4ce40083e2 MDL-49642 mod_lesson: Behat tests for overrides 2015-04-02 13:56:53 +02:00
Jean-Michel Vedrine
e0e1a83e2c MDL-49642 mod_lesson: Group/user overrides 2015-04-02 13:56:52 +02:00
Rajesh Taneja
345c6a1ac0 MDL-49513 behat: Updated step name to match new step 2015-04-02 11:08:21 +02:00
Andrew Nicols
df15759724 Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle 2015-04-02 11:06:27 +02:00
Rajesh Taneja
bed97c39eb MDL-49513 behat: Set admin config using php api 
Added a new set to set config using set_config() api
to make steps faster and more efficient
 2015-04-01 14:25:23 +08:00
Dan Poltawski
deadda2f86 Merge branch 'MDL-48880' of git://github.com/jmvedrine/moodle 
Conflicts:
	mod/lesson/db/upgrade.php
	mod/lesson/version.php
 2015-03-31 11:21:11 +01:00
Dan Poltawski
4e664d1689 Merge branch 'MDL-26689' of git://github.com/jmvedrine/moodle 2015-03-31 10:46:30 +01:00
David Monllao
bdece5fc27 Merge branch 'MDL-49474' of git://github.com/jmvedrine/moodle 2015-03-31 10:14:45 +08:00
Jean-Michel Vedrine
c7d1a37bdb MDL-18966 mod_lesson: Save attempts of practice lessons 2015-03-30 12:58:17 +02:00
Jean-Michel Vedrine
7e0551fc45 MDL-48880 mod_lesson: clean lesson_branch when a page is deleted 2015-03-29 21:46:05 +02:00
Jean-Michel Vedrine
4948b68ffe MDL-49474 mod_lesson: intro and introformat missing from backup/restore 2015-03-29 21:33:18 +02:00
Jean-Michel Vedrine
e8a434b373 MDL-26689 mod_lesson: deprecate lesson dependency 2015-03-27 20:38:03 +01:00
David Monllao
b7bfbfee2c MDL-49470 mod_lesson: Triggering just 1 event 2015-03-25 15:33:07 +08:00
David Monllao
a2be9de182 Merge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle 
Conflicts:
	mod/lesson/version.php
 2015-03-24 13:25:26 +08:00
David Monllao
bedf3a0a39 MDL-49470 mod_lesson: Adding text space + unit test refinement 2015-03-24 11:59:05 +08:00
Stephen Bourget
14cdeb7ba9 MDL-49470 Lesson: Add page moved event 
Conflicts:
	mod/lesson/version.php
 2015-03-24 11:05:56 +08:00
Mohamed Alsharaf
324954141e MDL-35482 lesson: return to previous page after edit and page save 2015-03-20 12:01:24 +13:00
Jean-Michel Vedrine
4b570f7144 MDL-48715 mod_lesson: completion rules must not be dependent 2015-03-19 12:24:55 +01:00
Dan Poltawski
2e796a1615 Revert "Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github.com/SWiT/moodle" 
This reverts commit 94d0be7840, reversing
changes made to f51ef4d102.
 2015-03-19 12:24:54 +01:00
Dan Poltawski
7eb98397dc Revert "MDL-49121 mod_lesson: Fixed typo in link creation" 
This reverts commit feb8ca8c72dcf429d3c06df6587b57221ae615f4.
 2015-03-19 12:24:52 +01:00
Rajesh Taneja
909064a1ce MDL-49121 mod_lesson: Fixed typo in link creation 2015-03-19 12:24:50 +01:00
Stephen Bourget
e0f7b96347 MDL-49430 Lesson: Add restarted and resumed events 2015-03-18 13:30:29 -04:00
David Monllao
7794f80126 Merge branch 'MDL-48715' of git://github.com/jmvedrine/moodle 2015-03-18 08:31:03 +08:00
Jean-Michel Vedrine
10e2355f8c MDL-48715 mod_lesson: use only one field for time spent rule 2015-03-17 20:47:01 +01:00
Dan Poltawski
94d0be7840 Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github.com/SWiT/moodle 2015-03-17 11:14:21 +00:00
Eloy Lafuente (stronk7)
f51ef4d102 Merge branch 'MDL-49296_m29v3' of https://github.com/sbourget/moodle 2015-03-17 12:03:50 +01:00
Stephen Bourget
d27e9a2cdb MDL-49296 Lesson: Add titles to action links 2015-03-16 20:33:22 -04:00
Dan Poltawski
4501ee4b16 Merge branch 'MDL-48965' of git://github.com/jmvedrine/moodle 2015-03-16 21:05:56 +00:00
Jean-Michel Vedrine
b7a2633d7d MDL-48715 mod_lesson: behat test for time spent completion condition 2015-03-15 15:25:30 +01:00
Jean-Michel Vedrine
d0445cf70d MDL-48715 mod_lesson: add a time spent custom completion rule 2015-03-15 15:24:55 +01:00
Matt Switlik
4ac4a9cc52 MDL-49121 mod/lesson: master optimize lesson report and fixed for coding guidelines 2015-03-13 09:04:03 -04: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
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
Eloy Lafuente (stronk7)
0967a20d02 Merge branch 'MDL-48962' of git://github.com/jmvedrine/moodle 2015-03-04 00:00:16 +01:00
Eloy Lafuente (stronk7)
3d944d37dd Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle 2015-03-03 19:30:00 +01: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