mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-31 22:12:56 +02:00
Code Issues Projects Releases Wiki Activity
71,195 Commits 36 Branches 527 Tags
Commit Graph

1135 Commits

Author SHA1 Message Date
Jean-Michel Vedrine
31f386732b MDL-47587 Lesson: Display progress bar on the end of lesson page 2014-11-18 08:49:22 +01:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Dan Poltawski
5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle 
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
 2014-11-05 12:11:16 +00:00
Damyon Wiese
8a9fd2d4cf MDL-27930 lesson: Remove custom styling from timer 2014-11-05 13:58:38 +08:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
Jean-Michel Vedrine
50d70c5caf MDL-27930 Lesson: the count-down timer does not work 2014-11-04 15:12:42 +01:00
Marina Glancy
2f28c71186 Merge branch 'MDL-29873' of git://github.com/jmvedrine/moodle 2014-10-30 14:17:32 +08:00
Adrian Greeve
780ff300a8 MDL-43245 mod_lesson: Add string for essay grading permission. 2014-10-24 11:48:04 +02:00
Jean-Michel Vedrine
5fc6a9e77b MDL-43245 Lesson: non editing teacher cannot grade lesson essay 2014-10-24 11:48:00 +02:00
Jean-Michel Vedrine
814e381a47 MDL-29873 Lesson: Essays not shown on grade page with SQL server 2014-10-18 19:40:20 +02:00
Jean-Michel Vedrine
28928667a0 MDL-38172 Lesson: Additional Info not displayed at end of lesson 2014-10-17 17:04:57 +02:00
Damyon Wiese
e5d5bfdc4f Merge branch 'MDL-38540' of git://github.com/jmvedrine/moodle 2014-10-08 16:46:12 +08:00
Jean-Michel Vedrine
ce3cfc8f92 MDL-38540 Lesson: import images in question answers 2014-10-08 06:07:02 +02:00
Dan Poltawski
c5d4fd7ddf MDL-38106 lesson: fix tests introduced in MDL-32870 2014-10-08 11:51:21 +08:00
Marina Glancy
850ac50a87 Merge branch 'MDL-32870' of git://github.com/jmvedrine/moodle 2014-10-07 17:16:56 +08:00
Dan Poltawski
106486c7ad MDL-38106 lesson: don't require intro when upgraded 2014-10-06 14:54:53 +01:00
Dan Poltawski
5b17d81dce MDL-38106 lesson: behat now sets introduction 2014-10-05 14:12:59 +01:00
Jean-Michel Vedrine
0abc18cf4d MDL-32870 Lesson: No HTML editor for questions answers and responses 2014-10-04 15:13:01 +02:00
Daniel Neis Araujo
d83891729a MDL-38106 mod_lesson: Add introduction field 2014-10-03 14:38:03 +01:00
Dan Poltawski
be6779d0c4 Revert "MDL-32870 mod_lesson: added support for files to question answers and responses" 
This reverts commit d92f768baab86e95cafdfdbee1b54e5d2dbd055b.
 2014-10-02 09:09:16 +01:00
Jean-Michel Vedrine
d92f768baa MDL-32870 mod_lesson: added support for files to question answers and responses 2014-09-29 11:00:28 +13:00
Marina Glancy
cf10649795 MDL-45336 lesson: copied used strings from quiz 
AMOS BEGIN
 CPY [false,mod_quiz],[false,mod_lesson]
 CPY [fractionsaddwrong,mod_quiz],[fractionsaddwrong,mod_lesson]
 CPY [fractionsnomax,mod_quiz],[fractionsnomax,mod_lesson]
 CPY [notenoughsubquestions,mod_quiz],[notenoughsubquestions,mod_lesson]
 CPY [true,mod_quiz],[true,mod_lesson]
AMOS END
 2014-09-24 01:22:59 +02:00
Tim Hunt
38cde336ca MDL-46195 Fix fractionsaddwrong string component in lesson & qformat_webct. 
I know. You should not refer to strings from other plugins, but

* qformat_webct is importing multichoice questions in that bit of code.
  I suppose a pedant would say that qformat_webct should declare dependencies
  on all the qtypes it relies on, but that would be silly.

* Lesson should be using the question engine, rather than doing its own thing.
 2014-09-06 20:20:58 +01:00
sam marshall
9c85baa8c5 MDL-44725 Availability: Replace groupmembersonly - FEATURE_xx (6) 
Remove old FEATURE_GROUPMEMBERSONLY as no longer required.
 2014-09-02 13:03:17 +01:00
Frederic Massart
5fbebc3c18 MDL-46852 mod_lesson: More accurate comparison of shortanswer answers 2014-09-01 14:24:23 +08:00
Eloy Lafuente (stronk7)
c45754d840 Merge branch 'MDL-45445_master' of https://github.com/markn86/moodle 2014-06-24 21:54:58 +02:00
Russell Smith
d2c58b95bb MDL-43835 phpunit: Correct unit tests. 
When different ID's are set for each sequence a number
of unit test failures appear.  They have been corrected
to allow unit tests to pass with the new generator in place.
 2014-06-17 19:08:01 +10:00
Mark Nelson
943c61051f MDL-45445 events: added missing 'relateduserid' validation 2014-06-12 20:46:58 -07:00
Dan Poltawski
ed3f8591ed Merge branch 'master_MDL-40371' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/lib.php
 2014-06-03 15:19:22 +01:00
Mark Nelson
1ea5f1e2d3 MDL-45630 events: removed unnecessary 'the' from event descriptions 2014-05-31 15:27:11 -07:00
Brian King
6a97697a2a MDL-40371 Upgrade-until-22: remove obsolete _upgrade_grades functions 2014-05-29 19:43:37 +12:00
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Damyon Wiese
50f0658804 Merge branch 'MDL-23566' of https://github.com/aolley/moodle 2014-05-19 12:45:21 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release 
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
 2014-05-09 02:12:28 +02:00
Adam Olley
c3af87ac64 MDL-23566 mod_lesson: Float answers so paragraphs line up correctly next to the inputs 2014-05-07 15:44:36 +09:30
Andrew Nicols
02915dfc23 MDL-45357 events: Remove unnecessary the before 'id' in event descriptions 2014-05-06 16:45:05 +08:00
Marina Glancy
16feb870d4 Merge branch 'MDL-45357_master' of git://github.com/markn86/moodle 2014-05-05 16:09:53 +08:00
Mark Nelson
c5cfb3ca98 MDL-45357 events: changed event descriptions to ensure consistency in core 2014-05-05 00:55:50 -07:00
Marina Glancy
a128a24fca Merge branch 'wip-MDL-45127-master' of git://github.com/abgreeve/moodle 2014-05-05 10:18:03 +08:00
Adrian Greeve
028f535fd9 MDL-45127 mod_lesson: Behat test for reviewing a lesson. 2014-05-02 16:09:06 +08:00
Adrian Greeve
0aec842e58 MDL-45127 mod_lesson: Fixed reviewing lesson answers changing the lesson grade. 2014-05-02 16:09:06 +08:00
Adrian Greeve
20685b287d MDL-45127 mod_lesson: Updated question edit screen with more help text. 
Unless the custom scores is selected in the lesson settings the score section
in the question settings will be disabled. A help link has been added with
a description similar to this one.
 2014-05-02 16:09:05 +08:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00
Mark Nelson
4d9c1b573e MDL-43557 mod_lesson: removed incorrect usage of snapshots 2014-04-29 19:15:47 -07:00
Krister Viirsaar
c6ac68eead MDL-42635 lesson: Fixed error message 2014-04-30 09:51:10 +08:00
Marina Glancy
cf051cc46e Revert "MDL-41283 report_participation: Fixed legacy actions returned from api's" 
This reverts commit 7b7bb92d4206beac111fa0eed63a964fd9d20f4a.
 2014-04-15 17:14:57 +08:00
Marina Glancy
c733401634 Merge branch 'MDL-45035-master' of git://github.com/ankitagarwal/moodle 2014-04-15 14:34:36 +08:00
Rajesh Taneja
7b7bb92d42 MDL-41283 report_participation: Fixed legacy actions returned from api's 2014-04-15 13:31:03 +08:00
Rajesh Taneja
b2b4ec308e MDL-41283 report_participation: Added phpdoc about function not used 
In new logging api, xxx_get_view_actions() and xxx_get_post_actions()
will not be used to identify the paticipation of user. Event's crud
and edulevel status will define user's participation.
 2014-04-15 13:31:03 +08:00
Ankit Agarwal
3610ad436c MDL-45035 events: Fix @package and @since tags in Moodle 2.7 events 2014-04-11 13:45:33 +08:00