59650 Commits

Author SHA1 Message Date
Aparup Banerjee
c3d1c73076 Merge branch 'MDL-38352-behat-fix' of git://github.com/dmonllao/moodle 2013-03-07 15:46:07 +08:00
Frederic Massart
bd6581935d MDL-37852 repository: Re-inforced checks to manage repository instances 2013-03-07 14:32:44 +08:00
David Monllao
5ecb87a9a2 MDL-38352 behat: Updating tests
According to latest language strings
changes
2013-03-07 13:56:49 +08:00
Jason Fowler
ae18db7025 MDL-35816 - User - Modify the profile page to use semantic HTML rather than tables for layout 2013-03-07 11:00:16 +08:00
Aparup Banerjee
c65e7fcbc8 Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle 2013-03-07 10:41:52 +08:00
Damyon Wiese
3d231eda76 Revert "MDL-38055 block_courseoverview: fixed formatting of course fullname"
This reverts commit a9ff59979fbda8d26214013eb8da7440614d2bd5.
This reverts commit 4e83302f6f6b95504cc33e7a75e3694750b5621e.

This issue has failed testing and will be delayed
2013-03-07 10:30:37 +08:00
Davo Smith
2748d8efdb MDL-33946 course dndupload - fixes to dialog when dragging text
Radio buttons have unique IDs, matching the label IDs
'What do you want to call this text' input moved down and disabled when 'label' selected
'Add page here' changed to 'Add text here'
2013-03-06 22:38:01 +00:00
Eloy Lafuente (stronk7)
b9f3138dbe Merge branch 'MDL-38173-master' of git://github.com/damyon/moodle 2013-03-06 18:35:33 +01:00
Brent Boghosian
7e21ee683b MDL-38356 Forms: Check that the form exists before applying changechecker
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
2013-03-06 16:43:48 +00:00
Eloy Lafuente (stronk7)
641577eb32 Merge branch 'MDL-38352-en_fix' of git://github.com/mudrd8mz/moodle 2013-03-06 17:26:37 +01:00
Damyon Wiese
005c6640dd MDL-38173 Course: Fix DB from regression when adding a (new) course module to a section. 2013-03-06 23:59:19 +08:00
Helen Foster
ca084ef149 MDL-38352 Merge English strings from the en_fix language pack 2013-03-06 16:44:39 +01:00
Eloy Lafuente (stronk7)
69d0129389 Merge branch 'MDL-38311' of git://github.com/timhunt/moodle 2013-03-06 10:36:24 +01:00
Eloy Lafuente (stronk7)
4384eea0c9 Merge branch 'MDL-37958_master-fix' of git://github.com/dmonllao/moodle 2013-03-06 10:31:20 +01:00
Tim Hunt
770e4a467f MDL-38311 question manual grading: comment fixes. 2013-03-06 09:27:11 +00:00
David Monllao
e8a88ebbd8 MDL-37958 behat: Avoid problems with Background cached steps 2013-03-06 15:49:37 +08:00
David Monllao
31c75894e0 MDL-38271 behat: Fixing typo 2013-03-06 15:07:36 +08:00
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
AMOS bot
a48b920ddf Automatically generated installer lang files 2013-03-06 00:36:54 +00: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
Justin Filip
2e667c7405 MDL-38268 files: Must be explicit about switching cURL request method from HEAD to GET. 2013-03-05 11:30:22 -05: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
Daniele Cordella
a5b884fe6f MDL-35615 Course section: fixed alignment for userdefaultname checkbox to be inline with section name text input 2013-03-05 16:03:13 +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