mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 12:34:28 +01:00
Code Issues Projects Releases Wiki Activity
51,272 Commits 36 Branches 523 Tags
Commit Graph

51272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
9a7e63128a Merge branch 'wip-MDL-31197-m23' of git://github.com/samhemelryk/moodle 2012-02-01 00:48:47 +01:00
Eloy Lafuente (stronk7)
94a0c97464 Merge branch 'master_MDL-31039' of git://github.com/danmarsden/moodle 2012-02-01 00:41:25 +01:00
Eloy Lafuente (stronk7)
8aac56c6be Merge branch 'MDL-31000-master-3' of git://git.luns.net.uk/moodle 2012-02-01 00:25:05 +01:00
Eloy Lafuente (stronk7)
a14e3f274e Merge branch 'MDL-31448_incorrect-comment' of https://github.com/ncsu-delta/moodle 2012-01-31 23:57:32 +01:00
Eloy Lafuente (stronk7)
f31e83015d MDL-30714 theme_afterburner: better, output the information, LOL 2012-01-31 23:37:19 +01:00
Mary Evans
250633ebe3 MDL-30714 theme_afterburner: logo link to home page 2012-01-31 23:19:21 +01:00
Glenn Ansley
7493a4bb3b MDL-31448 Replaced incorrect PHP comment 2012-01-31 14:39:23 -05:00
Eloy Lafuente (stronk7)
008bf7f0ac Merge branch 'MDL-31015-master' of git://github.com/sammarshallou/moodle 2012-01-31 19:44:21 +01:00
Eloy Lafuente (stronk7)
ba353742ce Merge branch 'MDL-30854' of git://github.com/timhunt/moodle 2012-01-31 19:30:58 +01:00
Eloy Lafuente (stronk7)
7ce92ac1ad Merge branch 'MDL-30484' of git://github.com/timhunt/moodle 2012-01-31 17:16:04 +01:00
Eloy Lafuente (stronk7)
ade31f5f4f Merge branch 'MDL-31314' of git://github.com/timhunt/moodle 2012-01-31 17:06:01 +01:00
Aparup Banerjee
d7da31228e Merge branch 'MDL-30828_feedback_sort' of git://github.com/andyjdavis/moodle 2012-01-31 16:48:59 +08:00
Aparup Banerjee
42edf34d43 Merge branch 'MDL-30707_forum_log' of git://github.com/andyjdavis/moodle 2012-01-31 16:43:28 +08:00
Aparup Banerjee
df71b4d72f Merge branch 'MDL-29097_mod_update_create' of git://github.com/andyjdavis/moodle 2012-01-31 14:21:14 +08:00
Aparup Banerjee
640d4d9563 Merge branch 'MDL-31426' of git://github.com/stronk7/moodle 2012-01-31 11:51:14 +08:00
Aparup Banerjee
6342696140 Merge branch 'MDL-31428' of git://github.com/stronk7/moodle 2012-01-31 11:15:26 +08:00
Andrew Davis
02c34fe143 MDL-30707 mod_forum: fixed a add_to_log() call that was causing invalid URLs to be added to the log 2012-01-31 09:06:01 +07:00
Andrew Davis
a5448b3f6b MDL-30828 mod_feedback: fixed sorting when viewing responses 2012-01-31 09:05:09 +07:00
Andrew Davis
c85cf7df5c MDL-29097 course: refactored to avoid having two seperate calls to events_trigger() 2012-01-31 09:00:53 +07:00
Eloy Lafuente (stronk7)
ecabd5b039 MDL-31428 forum: prevent some warnings with debug enabled 2012-01-31 00:22:32 +01:00
Eloy Lafuente (stronk7)
b688c44907 MDL-31426 forum: don't show/allow any subscription to not enrolled users 2012-01-30 23:20:03 +01:00
Tim Hunt
94815ccfa0 MDL-30484 question engine: don't lose response files when regrading. 
The problem was mostly that, in the past, we did not worry if
question_attempt_step.id changed during regrade (because we deleted the
old step row and inserted a new one). However, now that steps can have
associated files, we can't be that slack, becuase the step id is used as
the file itemid.

So, now, we have to update the existing rows during a regrade. We do
this by having the question engine tell the question_engine_unit_of_work
that the step has first been deleted, and then added back. Then we make
the unit-of-work spot that delete + add = update.

This also means that during regrading, we have to pass around some extra
ids so that new steps know the id of the step they are replacing.

Naturally, this requires some quite trickly logic, so I finally got
around to writing unit tests for question_engine_unit_of_work, which is
a good thing.

Along the way I also got around to renaming
question_attempt->set_number_in_usage, which got missed out when
everthing else was renamed to slot ages ago.

Finally, while working on this code, I noticed and fixed some PHPdoc
comments.
 2012-01-30 16:57:23 +00:00
Tim Hunt
72553162ba MDL-30854 quiz/question editing: fix create calc question & add on page. 
This was one of those innocent seeming issues where, once you start
digging, you find a mess. In this case, the code that is now in
question_wizard_form::add_hidden_fields used to exist in four different
places, in four inconsistent versions. This is now all nicely
re-factored, and that solves the problem.

Along the way, I found and fixed some wrong string references in
qtype_random, and stripped out some unnecessary &s in function
declarations.
 2012-01-30 12:32:12 +00:00
Tim Hunt
a60835c721 MDL-31314 gradebook restore: fix category.depth on restore. 
Without this, restoring backups made with the OU's custom 'restore from
1.9' feature, and possibly other people's custom converstion code, does
not work properly.

Also, fix poor recordset code.
 2012-01-30 12:31:43 +00:00
Aparup Banerjee
1fac035503 Merge branch 'MDL-26260' of git://github.com/timhunt/moodle 2012-01-30 16:23:54 +08:00
Aparup Banerjee
627618e140 Merge branch 'MDL-31311-Fix_iframe_titles' of git://github.com/ncsu-delta/moodle 2012-01-30 15:52:50 +08:00
Aparup Banerjee
44983c3f3d Merge branch 'MDL-31319' of git://github.com/mackensen/moodle 2012-01-30 15:01:53 +08:00
Aparup Banerjee
fd174542e3 Merge branch 'MDL-31392' of git://github.com/timhunt/moodle 2012-01-30 14:24:31 +08:00
sam marshall
68828cc431 MDL-31015 File/URL resource 'Open' and 'Force download' options should work consistently 2012-01-27 16:01:19 +00:00
Glenn Ansley
4d7e89d72c MDL-31311 Enhance unhelpful iframe title attributes 2012-01-27 10:22:59 -05:00
David Mudrak
10d7dac528 MDL-31317 original_site_identifier_hash falls back to null during the backup conversion 
Even if the site identifier is not defined in the source 1.9 backup then the
converted 2.0 version should still contain the element to prevent PHP
notices on direct assignment.
 2012-01-27 08:48:37 +01:00
Dan Marsden
047b4e83ab SCORM AICC MDL-31039 update external AICC url correctly - thanks to Albert Rhemrev for report/fix 2012-01-27 19:41:59 +13:00
Eloy Lafuente (stronk7)
216f6d8e9d weekly release 2.3dev (blame stronk7 for 0202 mistake) 
On 20120102 version was incorrectly bumped to 2012-02-02. So,
until then (< 1mo) we are going to be incrementing decimal digits
only and not date ones (first 8).
 2012-01-27 02:27:25 +01:00
Eloy Lafuente (stronk7)
6f20a79104 fix permissions 2012-01-27 02:19:54 +01:00
Eloy Lafuente (stronk7)
cba018a30b Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-01-27 02:19:05 +01:00
AMOS bot
9c82a7cd39 Automatically generated installer lang files 2012-01-27 00:31:13 +00:00
Tim Hunt
6401b3c5bb MDL-31392 qeupgradehelper partial upgrade support broken since 2.2 2012-01-26 16:31:44 +00:00
Sam Hemelryk
dff66010be Merge branch 'wip-mdl-30993' of git://github.com/rajeshtaneja/moodle 2012-01-25 13:53:56 +08:00
Rajesh Taneja
9df12115a7 MDL-30993 time api: Php document updated for time api 2012-01-25 11:15:27 +08:00
Eloy Lafuente (stronk7)
f8b8abcc55 Merge branch 'MDL-31122-master' of git://github.com/sammarshallou/moodle 2012-01-25 01:52:25 +01:00
Eloy Lafuente (stronk7)
8300d8894c Merge branch 'MDL-31121-master' of git://github.com/sammarshallou/moodle 2012-01-25 01:40:20 +01:00
Eloy Lafuente (stronk7)
00a4543c5b Merge branch 'MDL-29896-master' of git://github.com/sammarshallou/moodle 2012-01-25 01:16:49 +01:00
Eloy Lafuente (stronk7)
478ba353b0 Merge branch 'MDL-31113_multiple_files_file_manager' of https://github.com/davosmith/moodle 2012-01-25 01:06:00 +01:00
Eloy Lafuente (stronk7)
897e14e263 Merge branch 'MDL-31110_loading_animation' of git://github.com/davosmith/moodle 2012-01-25 01:02:30 +01:00
Eloy Lafuente (stronk7)
28f7043f61 Merge branch 'MDL-31153-master' of git://github.com/sammarshallou/moodle 2012-01-25 00:57:25 +01:00
Eloy Lafuente (stronk7)
2def471913 Merge branch 'MDL-30120' of git://github.com/timhunt/moodle 2012-01-25 00:47:10 +01:00
Eloy Lafuente (stronk7)
9a50502acc Merge branch 'w04_MDL-31238_m23_php54' of git://github.com/skodak/moodle 2012-01-24 23:54:44 +01:00
Eloy Lafuente (stronk7)
5f67e1f395 Merge branch 'MDL-31245-master-1' of git://git.luns.net.uk/moodle 2012-01-24 18:45:29 +01:00
Aparup Banerjee
f37b3defb1 Merge branch 'wip-MDL-31224-m23' of git://github.com/samhemelryk/moodle 2012-01-24 22:57:24 +08:00
Aparup Banerjee
3dd00d7030 Merge branch 'wip-MDL-29941-master' of git://github.com/samhemelryk/moodle 2012-01-24 20:23:05 +08:00