2ffd822e63
Merge branch 'MDL-31345_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE
2012-02-08 11:17:26 +01:00
0c657454d6
MDL-31316 Fix block controls when default home is My Moodle
2012-02-08 11:08:22 +01:00
018f49465c
MDL-31345 theme_afterburner fixes pagelayout-report overflow
2012-02-08 03:59:42 +00:00
e5f77fdae4
Merge branch 'MDL-31407_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2012-02-08 11:27:39 +08:00
47475df527
Merge branch 'MDL-29892_overview_hidden_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
2012-02-08 03:38:44 +01:00
4bd74c8ddc
Merge branch 'm22_MDL-31461' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
2012-02-08 10:12:26 +08:00
822790437e
Merge branch 'MDL-31482-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE
2012-02-08 09:59:04 +08:00
76456cf5f2
Merge branch 'MDL-30722_forum_unsubscribe_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
2012-02-08 02:37:46 +01:00
6fe3c3907b
Merge branch 'wip-MDL-30540-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE
2012-02-08 01:18:09 +01:00
16f5ffacd4
Merge branch 'MDL-26384-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
2012-02-08 00:53:15 +01:00
c2db2793d2
Merge branch 'MDL-27360-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE
2012-02-07 23:49:19 +01:00
357274c6b9
Merge branch 'm22_MDL-31374' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
2012-02-07 22:41:39 +01:00
e455406b69
MDL-31482 Lib: IE8/IE7 (even with stupid user agent) should not be 'legacy' device type
2012-02-07 17:42:07 +00:00
3e299e464d
Merge branch 'MDL-31469_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2012-02-07 15:12:26 +08:00
6e1cf8fde8
MDL-26384 Tags Fixed redirect issue when editing is toggled
2012-02-03 14:54:04 +05:30
f2301c3258
MDL-30540 - BLOG - Fixing context problems for single blog entries - Thanks Aparup and Sam for the help
2012-02-03 10:50:42 +08:00
2ad0278bd2
MDL-29892 grade: added a check to prevent hidden courses appearing on student overview reports
2012-02-03 08:56:10 +07:00
733196d843
MDL-31461 Plagiarism - adjust api functions to allow better support for renderers
2012-02-03 11:38:33 +13:00
0007843de0
MDL-29684 improve enrol_meta plugin
...
List of changes:
* configurable unenrol action
* new setting for synchronisation of all enrolled users or users with at least one role
* cron period increased to 1 hour in order to lower server load, courses should not get out of sync often
* CLI sync script for debugging or manual sync
* phpdocs fixes
* when plugin is disabled all roles are removed, enrollments are kept
* uninstall script
* other bugfixing
2012-02-03 11:29:47 +13:00
e8e2f4f62c
MDL-31469 formslib: fix invalid for="" attributes on optional dates
2012-02-02 18:16:07 +00:00
648cf3397d
MDL-31445 formslib: add a nice id and class to the wrapper div for CSS
2012-02-02 18:15:31 +00:00
e1ded0ff55
MDL-31407 quiz: review all uses of global $USER
2012-02-02 18:13:34 +00:00
c31783bb34
MDL-31407 quiz: finish_attempt method should not rely on $USER
2012-02-02 18:13:30 +00:00
4d2f89f85b
weekly release 2.2.1+
2012-02-02 12:13:28 +01:00
18a727e6fd
Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE
2012-02-02 12:08:48 +01:00
28a3a568aa
MDL-27360 Web service tokens are displayed for deleted users
2012-02-02 16:23:56 +08:00
6432e1b4e1
Merge branch 'm22_MDL-31360' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
2012-02-02 11:13:22 +08:00
52453939f2
MDL-31360 use extra param in get_in_or_equal - one less line of code...
2012-02-01 23:09:49 +13:00
be15c303e0
Merge branch 'wip-MDL-31160-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE
2012-02-01 00:54:14 +01:00
acef9e8a7f
Merge branch 'wip-MDL-31197-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE
2012-02-01 00:50:38 +01:00
6badc27a66
Merge branch 'm22_MDL-31039' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
2012-02-01 00:41:47 +01:00
c904d241d5
MDL-31000 Respect sortorder of repositories when displaying the filepicker
2012-02-01 00:33:54 +01:00
7da14ca7c5
MDL-31448 Replaced incorrect PHP comment
2012-01-31 23:58:06 +01:00
14b273b3c8
MDL-30714 theme_afterburner: better, output the information, LOL
2012-01-31 23:36:35 +01:00
b1591e5081
MDL-30714 theme_afterburner: logo link to home page
2012-01-31 23:19:51 +01:00
f22c2e015a
Merge branch 'MDL-31015-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE
2012-01-31 23:02:56 +01:00
d4184875ce
Merge branch 'MDL-30854_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2012-01-31 19:38:48 +01:00
26be1bf17a
Merge branch 'MDL-30484_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2012-01-31 17:16:51 +01:00
5a1e6f2a6c
Merge branch 'MDL-31314_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2012-01-31 17:06:14 +01:00
cfbde86579
Merge branch 'MDL-30828_feedback_sort_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
2012-01-31 16:51:08 +08:00
5684c6ab99
Merge branch 'MDL-30707_forum_log_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
2012-01-31 16:43:46 +08:00
a5f1f8c0e2
Merge branch 'MDL-29097_mod_update_create_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
2012-01-31 14:36:15 +08:00
7759183593
MDL-28522 Choice : View reports now correctly shows unanswered column - thanks to Marcus Boon for the patch
2012-01-31 12:23:35 +08:00
3d257cbf08
Merge branch 'MDL-31426_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE
2012-01-31 11:52:24 +08:00
611d3bd71d
Merge branch 'MDL-31428_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE
2012-01-31 11:15:55 +08:00
fc9ca7eca3
Automatically generated installer lang files
2012-01-31 00:31:14 +00:00
94e62d8d02
MDL-31428 forum: prevent some warnings with debug enabled
2012-01-31 00:25:42 +01:00
e163fbc943
MDL-31426 forum: don't show/allow any subscription to not enrolled users
2012-01-30 23:22:05 +01:00
699f075ad2
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 17:05:56 +00:00
a3b0c9462f
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:30 +00:00
Eloy Lafuente (stronk7)