David Monllao
0a7f6a02eb
MDL-37958 behat: Nasty strings in HTML
...
Nasty strings includes html entities and
non-breaking spaces followed by spaces which makes
very hard to find these strings in the DOM html,
this patch keeps the non-breaking spaces and all
the nasty characters, but leaves them isolated from
other regular spaces. It swaps the strings to HTML before
finding elements in the HTML that matches that contents.
2013-03-06 13:34:09 +08:00
Sam Hemelryk
c629c91feb
MDL-32975 navigation: fixed error when viewing my with no enrolments
2013-03-06 14:35:19 +13:00
Eloy Lafuente (stronk7)
6026f23559
MDL-38311 Add missing comment format.
2013-03-06 02:02:45 +01:00
Eloy Lafuente (stronk7)
9f4da038c8
Merge branch 'MDL-38311' of git://github.com/timhunt/moodle
2013-03-06 01:22:32 +01:00
Eloy Lafuente (stronk7)
ab1e921c31
Merge branch 'MDL-36749-m' of git://github.com/andrewnicols/moodle
2013-03-06 01:19:17 +01:00
Rossiani Wijaya
6a9235c998
MDL-37411 Notes: unset courseid and userid when updating the note to prevent accidental changes. Thank you Sam Hemelryk for suggesting an alternative solution.
2013-03-06 09:35:42 +13:00
Andrew Robert Nicols
a6d81a73ac
MDL-36749 lib Complete deprecation of old_help_icon
...
This deprecates the old_help_icon and helpbutton functions. Since they can
no longer be used, the renderers are removed altogether.
2013-03-05 19:07:06 +00:00
Eloy Lafuente (stronk7)
88906d068d
Merge branch 'MDL-37958_master' of git://github.com/dmonllao/moodle
2013-03-05 19:28:14 +01:00
Eloy Lafuente (stronk7)
8d0a042263
Merge branch 'MDL-38327_master' of git://github.com/dmonllao/moodle
2013-03-05 19:26:52 +01:00
Eloy Lafuente (stronk7)
9af30e60b5
Merge branch 'MDL-38252-master' of git://github.com/danpoltawski/moodle
2013-03-05 18:12:55 +01:00
Eloy Lafuente (stronk7)
af733564f4
Merge branch 'MDL-38119' of git://github.com/timhunt/moodle
2013-03-05 16:45:01 +01:00
Eloy Lafuente (stronk7)
4afd580231
Merge branch 'MDL-38271_master' of git://github.com/dmonllao/moodle
2013-03-05 15:43:15 +01:00
Tim Hunt
53b8e25626
MDL-38311 questions: manual grading API should accept commentformat
...
Comment format (FORMAT_...) was correctly being processed when the
manual grading happened as the result of a form submission. It was only
when done using the question_usage or question_attempt API method that
there was no way to specify the format. (Although I think the only place
this API as used was in the unit tests.)
Note that question_attempt::manual_grade API had to change, but I don't
think that is a real API change. Calling code should be using
question_usage::question_attempt, which is backwards compatible.
Note that now, if you don't pass format, then no error is generated, but
a developer debugging message is generated.
2013-03-05 11:51:47 +00:00
Aparup Banerjee
045a4173b1
Merge branch 'MDL-38209' of git://github.com/timhunt/moodle
2013-03-05 17:14:02 +08:00
Aparup Banerjee
77e08c04d3
Merge branch 'MDL-38072' of git://github.com/lazydaisy/moodle
2013-03-05 17:07:50 +08:00
Aparup Banerjee
11abbe276f
Merge branch 'wip-MDL-34775-master' of git://github.com/phalacee/moodle
2013-03-05 17:01:54 +08:00
Frederic Massart
da9d3a1205
MDL-37852 phpunit: Tests for repository::can_be_edited_by_user()
2013-03-05 09:56:23 +01:00
Frederic Massart
89a9d21a15
MDL-37852 repository: Prevent undesired access to repositories settings
2013-03-05 09:56:22 +01:00
David Monllao
6fe3986dec
MDL-38007 behat: Refining error texts
...
Also removing a couple of silly notices
2013-03-05 16:52:48 +08:00
Damyon Wiese
ce91af8114
Merge branch 'MDL-38282' of git://github.com/timhunt/moodle
2013-03-05 16:06:31 +08:00
Aparup Banerjee
810fb772c3
Merge branch 'MDL-38240' of git://github.com/timhunt/moodle
2013-03-05 16:00:49 +08:00
Damyon Wiese
915b7aca62
Merge branch 'MDL-38279' of git://github.com/timhunt/moodle
2013-03-05 15:22:38 +08:00
Damyon Wiese
d0eac6f639
Merge branch 'MDL-38178_master' of git://github.com/dmonllao/moodle
2013-03-05 15:10:52 +08:00
Aparup Banerjee
c0da001c49
Merge branch 'MDL-38025_master' of git://github.com/dmonllao/moodle
2013-03-05 14:43:46 +08:00
David Monllao
2b6287b744
MDL-38178 behat: New tests for fieldsets expansion
2013-03-05 14:41:54 +08:00
David Monllao
f8f1bdc315
MDL-38178 behat: Adding find_all and step to expand all form's fieldsets
2013-03-05 14:41:52 +08:00
Aparup Banerjee
212e5ee909
Merge branch 'MDL-38007_master' of git://github.com/dmonllao/moodle
2013-03-05 14:37:05 +08:00
Damyon Wiese
ffb95d5fdc
Merge branch 'MDL-38241' of git://github.com/timhunt/moodle
2013-03-05 14:13:42 +08:00
Damyon Wiese
6fbf382cd4
Merge branch 'MDL-38280' of git://github.com/timhunt/moodle
2013-03-05 14:10:00 +08:00
David Monllao
5f26d1c8b8
MDL-38327 behat: Don't switch completely if switchcompletely is false
2013-03-05 14:03:50 +08:00
Damyon Wiese
be98769eab
Merge branch 'wip-MDL-37903-m25' of git://github.com/samhemelryk/moodle
2013-03-05 13:12:12 +08:00
Aparup Banerjee
c2b40106d3
Merge branch 'wip-MDL-38251-m25' of git://github.com/samhemelryk/moodle
2013-03-05 13:09:37 +08:00
Damyon Wiese
775eeb1ac2
MDL-37935: Cache - fix spelling mistake in language string
2013-03-05 13:06:49 +08:00
Damyon Wiese
6be6b2b073
Merge branch 'wip-MDL-37935-m25' of git://github.com/samhemelryk/moodle
2013-03-05 13:05:57 +08:00
Aparup Banerjee
da33f689dc
Merge branch 'MDL-30481' of git://github.com/rwijaya/moodle
2013-03-05 12:55:41 +08:00
Sam Hemelryk
44cfa89576
Merge branch 'MDL-38094' of git://github.com/timhunt/moodle
2013-03-05 16:57:50 +13:00
Damyon Wiese
a27996bbad
Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle
2013-03-05 11:42:25 +08:00
Aparup Banerjee
d1e220eb0e
Merge branch 'MDL-36171-m' of git://github.com/andrewnicols/moodle
2013-03-05 11:13:33 +08:00
David Monllao
15c7fb4adb
MDL-37958 behat: Ignoring spaces when comparing field contents
2013-03-05 11:08:04 +08:00
Aparup Banerjee
fb3c1d2b34
Merge branch 'MDL-38067-m' of git://github.com/andrewnicols/moodle
2013-03-05 11:06:55 +08:00
Aparup Banerjee
23a6fca502
Merge branch 'MDL-34300-m' of git://github.com/andrewnicols/moodle
2013-03-05 10:37:33 +08:00
Frederic Massart
dfe203c12e
MDL-34284 library: Import ZF2012-01 security patch for Zend
2013-03-05 10:35:56 +08:00
Sam Hemelryk
2e2bac9d32
Merge branch 'MDL-37932' of git://github.com/timhunt/moodle
2013-03-05 15:30:45 +13:00
Sam Hemelryk
dc8e7116a7
Merge branch 'wip-MDL-37901_master' of git://github.com/gjb2048/moodle
2013-03-05 15:23:46 +13:00
Aparup Banerjee
b4f110f1a4
Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle
2013-03-05 10:21:25 +08:00
Sam Hemelryk
aa9f48ed59
Merge branch 'MDL-38298' of git://github.com/stronk7/moodle
2013-03-05 15:12:08 +13:00
Sam Hemelryk
627a43917a
MDL-37127 js: fixed indentation of tooltip.js
2013-03-05 14:11:35 +13:00
Sam Hemelryk
5c1d5998ac
Merge branch 'MDL-37127-m' of git://github.com/andrewnicols/moodle
2013-03-05 13:54:10 +13:00
Eloy Lafuente (stronk7)
86d053490d
Merge branch 'wip-MDL-36215-m25' of git://github.com/samhemelryk/moodle
2013-03-05 01:27:50 +01:00
Eloy Lafuente (stronk7)
2b48123b92
Merge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle
2013-03-05 01:21:47 +01:00