52496 Commits

Author SHA1 Message Date
Sam Hemelryk
9f31cf9f33 Merge branch 'w16_MDL-32447_m23_tcpdf' of git://github.com/skodak/moodle 2012-04-16 17:25:27 +12:00
Dan Poltawski
a096a21ef3 MDL-32443 queupgradehelper cli: fix path & whitespace 2012-04-16 13:22:53 +08:00
Eric Merrill
8767142576 MDL-32443 qeupgradehelper: Add cli tool to execute qeupgrade helper 2012-04-16 13:16:17 +08:00
Sam Hemelryk
fa3671d49f Merge branch 'MDL-32385_master' of git://github.com/lazydaisy/moodle 2012-04-16 17:06:15 +12:00
Dan Poltawski
31aec26c18 Merge branch 'MDL-32404' of git://github.com/timhunt/moodle 2012-04-16 13:01:48 +08:00
Sam Hemelryk
52bb02020d Merge branch 'MDL-32444_master' of git://github.com/lazydaisy/moodle 2012-04-16 15:59:55 +12:00
Sam Hemelryk
d4e2d9463e MDL-32353 fixed up very minor whitespace 2012-04-16 15:23:05 +12:00
Sam Hemelryk
cb4b46f45c Merge branch 'MDL-32353' of git://github.com/merrill-oakland/moodle 2012-04-16 15:14:45 +12:00
Sam Hemelryk
e3d34313ab Merge branch 'MDL-26099-workshop-phase-switch' of git://github.com/mudrd8mz/moodle 2012-04-16 15:00:20 +12:00
Dan Poltawski
20dcbbf26a Merge branch 'MDL-32442' of git://github.com/merrill-oakland/moodle 2012-04-16 10:45:02 +08:00
Dan Poltawski
570d76c456 Merge branch 'wip-MDL-32381-master' of git://github.com/marinaglancy/moodle 2012-04-16 10:35:56 +08:00
Dan Poltawski
85b0540605 Merge branch 'wip-MDL-32395-m23' of git://github.com/samhemelryk/moodle 2012-04-16 10:32:09 +08:00
Sam Hemelryk
448cebee57 Merge branch 'master_MDL-32388' of git://github.com/danmarsden/moodle 2012-04-16 12:23:23 +12:00
Kordan
8b83e36e60 MDL-32355 theme_formal_white: changed the order of parent themes 2012-04-16 12:06:13 +12:00
Kordan
71e5d66642 MDL-32355 formal_white: improved reliability e maintainability 2012-04-16 12:04:56 +12:00
Sam Hemelryk
d8b09e5eb2 Merge branch 'MDL-32356_master' of git://github.com/kordan/moodle 2012-04-16 12:00:55 +12:00
Sam Hemelryk
885d208283 Merge branch 'MDL-32433_master' of git://github.com/kordan/moodle 2012-04-16 11:58:17 +12:00
Sam Hemelryk
2a535174c0 MDL-32426 phpunit: Fixed up phpdocs for generator changes 2012-04-16 11:52:56 +12:00
Sam Hemelryk
e3a660a2e7 Merge branch 'MDL-32426-master-1' of git://git.luns.net.uk/moodle 2012-04-16 11:52:12 +12:00
Sam Hemelryk
f295ffebd0 Merge branch 'MDL-30819_grader_col_highlight' of git://github.com/andyjdavis/moodle 2012-04-16 11:45:55 +12:00
Sam Hemelryk
be58371e4e Merge branch 'MDL-30955_forum_ratings' of git://github.com/andyjdavis/moodle 2012-04-16 11:34:39 +12:00
Sam Hemelryk
b9afb90b7f Merge branch 'MDL-32316_master_wip' of git://github.com/grabs/moodle 2012-04-16 11:00:43 +12:00
Sam Hemelryk
68c7673088 Merge branch 'MDL-27547' of git://github.com/mouneyrac/moodle 2012-04-16 10:48:15 +12:00
Petr Skoda
585ae3d949 MDL-32447 import latest tcpdf and point cache to tcpdf subdirectory of moodle cache dir 2012-04-15 16:08:46 +02:00
Mary Evans
3689a8599b MDL-32444 theme_afterburner: adds 5px margin to the left of #loginbtn, input, button, select in /style/afterburner_styles.css 2012-04-15 01:37:55 +01:00
Tim Hunt
b8a70832be MDL-32404 question export: missing error message when exporting an empty category. 2012-04-14 15:58:54 +01:00
Mary Evans
0465dd3e01 MDL-32385 theme_base: adds line-height:normal in style/course.css for section summary 2012-04-14 14:40:09 +01:00
Eric Merrill
288893f3a7 MDL-32442 questionupgrade: error in SQL from postgres systems 2012-04-14 09:05:12 -04:00
David Mudrak
2fc04a4b9b MDL-26099 fixing the strict standards warning
The signature of mod_workshop_mod_form::validation() is now compatible
with that of moodleform_mod::validation() even though the parent's
declaration sucks. No one can choose their parents.
2012-04-13 14:04:43 +02:00
kordan
275526d27a MDL-32433_master theme_formal_white: increased the line spacing in plugin list page 2012-04-13 13:24:05 +02:00
David Mudrak
9260bb3c48 MDL-26099 workshop can be switched into the assessment phase automatically 2012-04-13 04:49:46 +02:00
David Mudrak
3fe6d62289 MDL-26099 workshop planner tool displays info about the automatic phase switching 2012-04-13 04:49:46 +02:00
David Mudrak
40ff3ce33c MDL-26099 New i/scheduled icon
Based on http://commons.wikimedia.org/wiki/File:Appointment-new.svg
(public domain Tango! Desktop Project icon)
2012-04-13 04:49:46 +02:00
David Mudrak
3ff0805726 MDL-26099 new workshop DB field phaseswitchassessment
Note that most line changes in the patch are caused by the recent
changes in the XMLDB TEXT fields handling (no size specified now) and by
the change in the indentation.
2012-04-13 04:49:46 +02:00
David Mudrak
df558765a4 MDL-26099 validate the phases open dates and deadlines 2012-04-13 04:49:46 +02:00
David Mudrak
a80b772864 MDL-32235 scheduled allocation settings form displays the execution status
AMOS BEGIN
 CPY [allocationsettings,workshopallocation_random],[randomallocationsettings,workshopallocation_scheduled]
AMOS END
2012-04-13 04:49:46 +02:00
David Mudrak
2a3aac40e4 MDL-32235 execute scheduled allocation by cron 2012-04-13 04:49:46 +02:00
David Mudrak
782a35e225 MDL-32235 fixing DB schema
Removing the table "scheduled" created by the XMLDB by default (it's a
bug in XMLDB, I'm just too lazy now to fix it). Adding new fields to
hold the result of the most recent execution.
2012-04-13 04:49:46 +02:00
David Mudrak
f6bc60cbe4 MDL-32235 workshop cron support
On every invocation, the workshop will give its subplugins a chance to
to something useful. For now, we know that the scheduled allocator will
use it, no need to load other plugin types yet (until there will be a
real reason for it).
2012-04-13 04:49:46 +02:00
David Mudrak
9f8f380832 MDL-32235 the allocation settings form can be saved and edited 2012-04-13 04:49:46 +02:00
David Mudrak
9862128087 MDL-32235 introducing new workshop scheduled allocation plugin
The idea is to build a plugin that will internally call the random
allocator when the submissions deadline is reached. The teacher is able
to pre-define the configuration for the random allocator.
2012-04-13 04:49:45 +02:00
David Mudrak
b7cd6736e8 MDL-32235 workshop random allocator now uses the new workshop_allocation_result class 2012-04-13 04:49:45 +02:00
David Mudrak
8a62500fd5 MDL-32235 workshop manual allocator now uses the new workshop_allocation_result class 2012-04-13 04:49:45 +02:00
David Mudrak
31cea236af MDL-32235 improving the allocation results rendering
The new renderable class workshop_allocation_result provides a cleaner
interface between the allocator's init() method and the allocation.php
script.
2012-04-13 04:49:45 +02:00
David Mudrak
0ee608e99d MDL-32235 preparing the random allocator's API
The random allocator's init() method was split into two logical
parts. The init() now handles data from the form and executes the new
execute() method to do the actual job. The execute() method will be
called by the future scheduled allocator, too.
2012-04-13 04:49:45 +02:00
Eric Merrill
eba9236cea MDL-32353 backup: Flaw in settings logic for user info and anonymise 2012-04-12 11:01:08 -04:00
Kordan
c9aeac6299 MDL-32356_master theme_formal_white: swapped style and color in css border style 2012-04-12 16:40:37 +02:00
Andrew Robert Nicols
f15d451549 MDL-32426 Add unit test generators for groups and groupings 2012-04-12 15:32:19 +01:00
Marina Glancy
061eeed5df MDL-32381: Fixed Accessing non-static methods in repository class as static (causing php notices) 2012-04-12 15:05:20 +08:00
Dan Poltawski
668a499d89 weekly release 2.3dev 2012-04-12 13:29:01 +08:00