54200 Commits

Author SHA1 Message Date
Sam Hemelryk
e3036985b2 MDL-33468 css_optimiser: Added support for multiple values for a single attribute 2012-06-12 14:22:55 +12:00
Sam Hemelryk
6a519fdcf1 MDL-33468 css_optimiser: Improved consolidation of background styles and fixed ordering issue 2012-06-12 14:22:55 +12:00
Sam Hemelryk
0663b5353c MDL-33468 css_optimiser: Added support for prioritising reset rules 2012-06-12 14:22:55 +12:00
Sam Hemelryk
1121f79b91 MDL-33468 css_optimiser: Added support for @keyframes to the CSS optimiser 2012-06-12 14:22:55 +12:00
Sam Hemelryk
f2e8d3798c MDL-33468 css_optimiser: Numerous fixes to the CSS optimiser and its tests 2012-06-12 14:22:55 +12:00
Eloy Lafuente (stronk7)
f8dfdb524b on-demand release 2.3dev 2012-06-12 03:01:04 +02:00
Eloy Lafuente (stronk7)
92b0d9820e Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-06-12 02:55:03 +02:00
Eloy Lafuente (stronk7)
daf28d868b MDL-32117 equella: make it core plugin 2012-06-12 02:37:04 +02:00
Eloy Lafuente (stronk7)
74ea1b95f4 MDL-32117 equella: add missing MOODLE_INTERNAL + phpdocs tidy 2012-06-12 02:23:14 +02:00
Eloy Lafuente (stronk7)
37b8257de5 Merge branch 'equella' of git://github.com/danpoltawski/moodle 2012-06-12 02:22:26 +02:00
Aparup Banerjee
42fd396171 Merge branch 'MDL-33548' of git://github.com/timhunt/moodle 2012-06-11 13:55:20 +08:00
Eloy Lafuente (stronk7)
3ea1330949 MDL-33455 restore: process grade_grades only if user matches.
Note this has been applied both to individual activities grade_grades
and to general ones.
2012-06-11 11:30:20 +08:00
Dan Poltawski
d66e5720a1 MDL-32117 - equella: prevent errors when no username 2012-06-11 10:08:16 +08:00
Eloy Lafuente (stronk7)
f0852f474b MDL-33630 backup: invalidate ids cache on temptable drop. 2012-06-10 04:57:40 +02:00
AMOS bot
73da957671 Automatically generated installer lang files 2012-06-09 00:31:15 +00:00
Eloy Lafuente (stronk7)
fcbf68fd05 Merge branch 'w23_MDL-33595_m23_phpunitinit' of git://github.com/skodak/moodle 2012-06-08 19:32:26 +02:00
Eloy Lafuente (stronk7)
997c7e2744 Merge branch 'MDL-33471' of git://github.com/timhunt/moodle 2012-06-08 17:08:18 +02:00
Tim Hunt
815fcecc40 MDL-33471 quiz cron: better mtrace output for overdue handling 2012-06-08 16:02:01 +01:00
Petr Skoda
7cb76d1645 MDL-33595 fix recent initial PHPUnit init regression 2012-06-08 11:50:03 +02:00
Eloy Lafuente (stronk7)
78117cb1a4 MDL-33465 fix incorrect merge conflict resolution 2012-06-08 10:55:39 +02:00
Dan Poltawski
ec3d3ede80 MDL-33465 - bump version number for new log entry defintion 2012-06-08 15:54:31 +08:00
Dan Poltawski
4e020fe71d Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle 2012-06-08 15:51:41 +08:00
Ankit Agarwal
283ba570c0 MDL-33465 course: COALESCE is not cross-db compatible while using fields of different datatypes 2012-06-08 15:48:18 +08:00
Dan Poltawski
dcac0787b9 Revert "MDL-31863 Web service : added modified to parameters and modifiedtime to description"
This reverts commit 25ccaf54949cfafc1f61572dba203a3a76700089.
2012-06-08 15:25:40 +08:00
Dan Poltawski
c13dcf934e Revert "MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time."
This reverts commit 130d3fbf964f2efbcc6fee3855edb7bc0a2af744.
2012-06-08 15:25:34 +08:00
Dan Poltawski
c9d7e6fa16 Merge branch 'MDL-33498' of git://github.com/netspotau/moodle-mod_assign 2012-06-08 13:39:17 +08:00
Jason Fowler
d508e71d4c MDL-33594 - Glossary - fixing portfolio exports 2012-06-08 13:32:44 +08:00
Dan Poltawski
b63084a58b MDL-33594 mod_data: use filelib rather than speciifc internal file 2012-06-08 13:31:31 +08:00
Dan Poltawski
8ac226d23c Merge branch 'MDL-33587-delete-alias' of git://github.com/mudrd8mz/moodle 2012-06-08 11:40:56 +08:00
Dan Poltawski
e13388c1c0 MDL-32783 quiz overdue handling: improve lang string
And remove a stray #
2012-06-08 10:47:31 +08:00
Dan Poltawski
583c698ee1 Merge branch 'MDL-32783' of git://github.com/timhunt/moodle 2012-06-08 10:36:17 +08:00
Eloy Lafuente (stronk7)
61aaad4833 Merge branch 'w23_MDL-33583_m23_keepall' of git://github.com/skodak/moodle 2012-06-08 01:56:06 +02:00
Sam Hemelryk
c224cc643b Merge branch 'w23_MDL-33557_m23_initpath' of git://github.com/skodak/moodle 2012-06-08 11:53:43 +12:00
Eloy Lafuente (stronk7)
a3974b0106 Merge branch 'w23_MDL-30725_m23_backuptrash' of git://github.com/skodak/moodle 2012-06-08 01:43:40 +02:00
Sam Hemelryk
76cc4fd177 Merge branch 'MDL-33080' of git://github.com/stronk7/moodle 2012-06-08 10:23:16 +12:00
Sam Hemelryk
5874cc6aab Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle 2012-06-08 10:20:43 +12:00
Eloy Lafuente (stronk7)
03a94794fc Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle 2012-06-08 00:04:19 +02:00
Sam Hemelryk
a15e8b4101 MDL-30506 navigation: Fixed up reference handling issue and added docs post integration 2012-06-08 09:34:19 +12:00
Sam Hemelryk
a509cb29c3 Merge branch 'MDL-30506' of git://github.com/jonof/moodle 2012-06-08 09:04:46 +12:00
Tim Hunt
a6866c7e9f MDL-32783 quiz overdue handling: enforce end of grace period
The summary page was not enforcing the end of the grace period. If the
user had the summary page open, then they coudl still stubmit after the
end of the grace period.

Also, the editing form was not validating that the quiz grace period was
greater than quiz|graceperiodmin in the quiz configuration, and that
should be checked, so I added it.

I fear that processattempt.php is becoming very spaghetti-like with all
the timing rules, it really needs to be refactored, but not 2 weeks
before the 2.3 release. (When refactoring, we really need unit tests for
this.)
2012-06-07 19:17:07 +01:00
David Mudrak
3b2465fee6 MDL-33587 Delete the reference properly in stored_file::delete() 2012-06-07 18:02:12 +02:00
David Mudrak
1c0da8498f MDL-33587 Improve stored_file::delete_reference() method 2012-06-07 17:37:25 +02:00
David Mudrak
2fa8aea279 MDL-33587 Throw coding exception when trying to unlink a non-reference file 2012-06-07 17:36:29 +02:00
David Mudrak
2d2c194bbe MDL-33587 Add unit tests for stored_file::delete_reference()
The first unit test forces the File API to be more picky as any sane
core API should be. The second one illustrates the buggy behaviour of
the current implementation of delete_reference(). They both fail at the
moment, of course...
2012-06-07 17:36:23 +02:00
Dan Poltawski
55244f8527 Merge branch 'MDL-33577' of git://github.com/timhunt/moodle 2012-06-07 23:15:45 +08:00
Dan Poltawski
901f49097a Merge branch 'MDL-33532' of git://github.com/timhunt/moodle 2012-06-07 22:23:38 +08:00
Dan Poltawski
9c1fe3356f Merge branch 'MDL-33565' of git://github.com/timhunt/moodle 2012-06-07 22:14:28 +08:00
Dan Poltawski
3bc24f9aa7 Merge branch 'MDL-33517' of git://github.com/timhunt/moodle 2012-06-07 21:49:14 +08:00
Tim Hunt
7f5f384477 MDL-33532 quiz editing: let uses enter locale floats.
So, for example, Croatian users can set the maximum grade to 65,5.
2012-06-07 12:55:53 +01:00
Tim Hunt
b84477000a MDL-33577 qtype_multianswer: Fix strict syntax warning. 2012-06-07 12:32:41 +01:00