Sam Hemelryk
009b14c065
MDL-30270 rubric Cleaned up minor points after review before integration
2011-11-22 10:40:15 +13:00
Sam Hemelryk
495bcb06d1
Merge branch 'wip-MDL-30270-master' of git://github.com/marinaglancy/moodle
2011-11-22 10:39:02 +13:00
Eloy Lafuente (stronk7)
2b72f6dc62
Merge branch 'mdl-23006-xmldb-missing-strings' of git://github.com/sbourget/moodle
2011-11-21 19:42:20 +01:00
Andrew Robert Nicols
70eddb71cf
MDL-30174 Assignment : Only increment submission offset if the current assignment was not saved
2011-11-22 02:20:16 +08:00
Andrew Robert Nicols
89a4471b97
MDL-30173 Assignment : Convert to use moodle_url and add missing filter param
2011-11-22 02:02:26 +08:00
Aparup Banerjee
85227804b4
Merge branch 'MDL-29814_blank_emails2' of git://github.com/andyjdavis/moodle
2011-11-22 01:15:26 +08:00
Eloy Lafuente (stronk7)
7715c88d36
MDL-30344 lti - whitespace & comments cleanup
2011-11-21 16:59:58 +01:00
Chris Scribner
59fc5c5404
MDL-30344 lti - Hiding roster permission from the UI as it's not implemented in LTI 1.1.
2011-11-21 16:42:28 +01:00
Chris Scribner
038d8e30c3
MDL-30344 lti - Fix issue with privacy settings not working for a course level tool if no Launch URL is specified.
2011-11-21 16:42:12 +01:00
Chris Scribner
4c598b133f
MDL-20534 lti: Updating privacy settings dynamically based on matched Launch URL.
2011-11-21 16:42:12 +01:00
Aparup Banerjee
3a59d04c65
MDL-30268 Web service : resolved version number conflict
2011-11-21 14:47:23 +08:00
Aparup Banerjee
9dc97097b1
Merge branch 'wip-MDL-30289-master' of git://github.com/abgreeve/moodle
2011-11-21 13:57:34 +08:00
Aparup Banerjee
338b9cab83
Merge branch 'w46_MDL-21617_m22_xhack' of git://github.com/skodak/moodle
2011-11-21 11:28:27 +08:00
Eloy Lafuente (stronk7)
6b532f5d4d
Merge branch 'w46_MDL-30147_m22_tablenotexists' of git://github.com/skodak/moodle
2011-11-21 02:30:19 +01:00
Eloy Lafuente (stronk7)
feeb52949f
MDL-30328 some whitespace changes
2011-11-21 02:23:51 +01:00
Eloy Lafuente (stronk7)
27e5ce8b9f
Merge branch 'MDL-30328' of git://github.com/scriby/moodle
2011-11-21 02:22:40 +01:00
Eloy Lafuente (stronk7)
e5235e6eef
Merge branch 'MDL-30326' of git://github.com/scriby/moodle
2011-11-21 02:03:51 +01:00
Charles Fulton
6737aae6bb
MDL-30289 forum - set page context when pruning a discussion
2011-11-21 08:58:26 +08:00
Eloy Lafuente (stronk7)
5f72d1025b
MDL-30354 lti - whitespace fixes
2011-11-21 01:57:24 +01:00
Eloy Lafuente (stronk7)
d167cc3397
Merge branch 'MDL-30354' of git://github.com/scriby/moodle
2011-11-21 01:48:52 +01:00
Eloy Lafuente (stronk7)
eba4bcb441
Merge branch 'master' of git.moodle.org:/git/integration
2011-11-21 01:45:37 +01:00
Sam Hemelryk
919423fc6c
Merge branch 'w46_MDL-30228_m22_pdftestcopyright' of git://github.com/skodak/moodle
2011-11-21 13:32:55 +13:00
Eloy Lafuente (stronk7)
77a7978f11
MDL-20534 lti: B9 - mini bump
2011-11-21 01:27:34 +01:00
Mary Evans
6ee5f11511
MDL-30236 removed outlawed javasript from theme_anomaly
2011-11-21 13:27:22 +13:00
Eloy Lafuente (stronk7)
695f327a70
Merge branch 'MDL-30343' of git://github.com/scriby/moodle
2011-11-21 01:17:06 +01:00
Eloy Lafuente (stronk7)
0fca3dbbce
Merge branch 'MDL-30341' of git://github.com/scriby/moodle
2011-11-21 01:11:54 +01:00
Eloy Lafuente (stronk7)
253f5575c9
MDL-30339 lti lang - whitespace fixes
2011-11-21 01:03:22 +01:00
Eloy Lafuente (stronk7)
8efcee5f8c
Merge branch 'MDL-30295' of git://github.com/scriby/moodle
...
Conflicts:
mod/lti/lang/en/lti.php
2011-11-21 00:58:12 +01:00
Eloy Lafuente (stronk7)
34087d7be2
Merge branch 'MDL-30339' of git://github.com/scriby/moodle
2011-11-21 00:50:32 +01:00
Sam Hemelryk
28e6598dff
Merge branch 'w46_MDL-30294_m22_errorsinthemefiles' of git://github.com/skodak/moodle
2011-11-21 12:48:06 +13:00
Sam Hemelryk
67c768dbe8
Merge branch 'w46_MDL-30308_m22_reqstrict' of git://github.com/skodak/moodle
2011-11-21 12:39:42 +13:00
Sam Hemelryk
4f0596f874
Merge branch 'plagiarismbranch' of git://github.com/peterbulmer/moodle
2011-11-21 12:23:32 +13:00
Sam Hemelryk
291029dfd5
Merge branch 'MDL-30309' of git://github.com/lazydaisy/moodle
2011-11-21 12:01:45 +13:00
Sam Hemelryk
34e05996c1
Merge branch 'MDL-30319' of git://github.com/lazydaisy/moodle
2011-11-21 11:53:45 +13:00
Sam Hemelryk
b8c117e126
Merge branch 'w46_MDL-30327_m22_blockconfig' of git://github.com/skodak/moodle
2011-11-21 11:48:47 +13:00
Sam Hemelryk
eb3217dc40
MDL-30359 theme_base Fixed regression with course completion icons
2011-11-21 11:30:17 +13:00
Sam Hemelryk
7cdf3904a7
Merge branch 'MDL-30359' of git://github.com/lazydaisy/moodle
2011-11-21 10:28:32 +13:00
Petr Skoda
685dc4438f
MDL-30228 fix incorrect author info
...
Sorry David!
2011-11-19 19:03:10 +01:00
Petr Skoda
32322d8680
MDL-30308 outputrequirementslib.php breaks xhtml validation
...
Credit goes to Matthew Davidson.
2011-11-19 18:43:55 +01:00
Petr Skoda
544832790d
MDL-30327 standardise block deletion process
2011-11-19 16:56:11 +01:00
Petr Skoda
4e8d084bc9
MDL-21617 remove problematic attempt to remove script events from random text
...
This "feature" was used to partially eliminate XSS attacks on vulnerable code. Developers MUST use clean_text() on HTML text fragments only, it can not be used on random html tag attributes.
This change may simplify a bit exploiting of vulnerable code, but every XSS cheat sheet contains information how to work around this outdated anti-XSS measure.
Please note this change fixes many problems with valid uses of language= or onXXXXX= such as in urls, tex, code samples, etc.
2011-11-19 13:22:33 +01:00
Petr Skoda
c198390a49
MDL-30294 prevent notices and errors in theme files content
...
Theme images, css and JS are broken by PHP error messages which creates major problems for production sites with enabled displaying of errors because the files are cached indefinitely. It is better to send the errors and notices to logs only, in any case all developers must learn to use error logs.
2011-11-19 11:23:28 +01:00
Petr Skoda
fed02be153
MDL-30147 do not expect text comparison exceptions when not in debug mode
...
Unfortunately the column type fetching is too expensive, we do extra verification in debug mode only.
2011-11-19 09:44:33 +01:00
Petr Skoda
a453ec079f
MDL-30147 optional verification if dml exception when table missing
2011-11-19 09:39:07 +01:00
Eloy Lafuente (stronk7)
870896eca1
MDL-30147 dml - mysql and no params now behaving "standard"
2011-11-19 09:27:10 +01:00
Eloy Lafuente (stronk7)
a8097d6dda
MDL-30147 dml - one more test behavior without params
2011-11-19 09:27:09 +01:00
Eloy Lafuente (stronk7)
8f201c9ded
MDL-30147 dml - added some tests demoing bad get_columns() behavior
2011-11-19 09:27:09 +01:00
Petr Skoda
69ac5d478f
MDL-30147 do not rely on dml exception type outside of dml layer
...
The trouble is that dml driver methods (insert, update, select) are not guaranteed to return the same exception class for various db problems and coding style issues. The recommended practice is to catch dml_exception only.
2011-11-19 09:25:11 +01:00
Petr Skoda
c04e80e328
MDL-30147 detect missing table when processing query conditions
2011-11-19 09:16:51 +01:00
Andrew Davis
22e23da6f4
MDL-29814 message: made html personal messages store a plain text version as a fallback
2011-11-19 15:35:23 +08:00
