Commit graph

67179 commits

Author SHA1 Message Date
Dan Poltawski
8939d65608 Merge branch 'wip-MDL-43719-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE 2014-04-14 15:23:18 +08:00
Petr Škoda
c4f6292cc8 MDL-45049 improve debugging output in error log for NO_DEBUG_DISPLAY scripts 2014-04-14 13:17:53 +08:00
Damyon Wiese
da4533bcd4 Merge branch 'MDL-44936-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-14 11:47:45 +08:00
Adrian Greeve
7a1d3e4db8 MDL-45037 gradebook: Allow dashes in xml grade values to be ignored.
This was delivering an error message when trying to import an exported
xml file (from Moodle).
2014-04-14 10:48:42 +08:00
Dan Poltawski
951ba5e8a6 Merge branch 'MDL-45048-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-14 10:02:01 +08:00
Mark Nelson
55a579c960 MDL-45071 mod_quiz: retrieve all the name fields when deleting a user override 2014-04-13 18:42:24 -07:00
Tim Lock
6769f7302b MDL-45012: Enable support for wma files within tinymce Moodle Media plugin 2014-04-14 08:32:11 +09:30
Andrew Nicols
b3cf6fa12a MDL-43145 dock: Enable regions before the drag operation starts 2014-04-13 18:27:09 +08:00
Sam Hemelryk
edb5a21285 MDL-43145 dock: fixed up region_completely_docked code to ignore empty regions 2014-04-13 18:27:00 +08:00
Gareth J Barnard
1f8f7aea0a MDL-45045 block theme: Fake blocks show empty region when editing and clicked.
Conflicts:
	lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
2014-04-11 13:17:05 +01:00
sam marshall
10d98c1b73 MDL-44991 Behat: step to check if attribute does not contain text
The step checks that an attribute exists, but doesn't contain the
specified text.

Example:
Then the "class" attribute of "#mydiv" "css_element" should
not contain "accesshide"
2014-04-11 11:26:46 +01:00
Eloy Lafuente (stronk7)
629e98b575 MDL-43673 wiki: verify page tags work as expected
This covers MDL-43109, verifying that saved tags
are available on re-edition of a page, without any warning/error.

Also official tags are verified to be working ok. With support
for multiple options added by MDL-43713 and MDL-43738.
2014-04-11 10:38:33 +02:00
Jetha Chan
2f06c0bb34 MDL-44951 theme_bootstrapbase: forum post css tweaks
Adjusted forum post CSS for cleaner appearance.
2014-04-11 16:18:43 +08:00
Frederic Massart
3acaa40e0d MDL-45048 repository_wikimedia: Abusing usage of optional_param
The optional_param call was moved outside of the constructor
because it was called every time the repository would be initialised.
That was leading to problems when the parameter was defined from
another form and not complying with its expected type.
2014-04-11 15:20:36 +08:00
James Pratt
9cf2bc9d3f MDL-45003 qtype numeric : classify invalid response as no response. 2014-04-11 14:14:14 +07:00
James Pratt
6569d675f1 MDL-44981 quiz statistics report : Differentiating '0' and no response
in numeric questions.
2014-04-11 13:36:15 +07:00
Adrian Greeve
76204f6898 MDL-45036 blocks: Update to the mentee block sql to incorporate additional name fields. 2014-04-11 14:02:10 +08:00
Adrian Greeve
f2ae72dcf0 MDL-43719 tags: Fix the sql statement in the tag management page.
MSSQL and Oracle require that all fields in teh select also be present
in the group by section.
2014-04-11 13:55:31 +08:00
Ankit Agarwal
6aa4c5186a MDL-45035 events: Fix @package and @since tags in Moodle 2.6 events 2014-04-11 13:38:12 +08:00
Adrian Greeve
8bfd7dbe2c MDL-43626 survey: Addition of additional names to survey. 2014-04-11 13:35:37 +08:00
Frederic Massart
0ae185c9d3 MDL-44936 csslib: Chunking supports @media queries and commas in rules 2014-04-11 12:04:53 +08:00
Dan Poltawski
c16911b50f weekly release 2.6.2+ 2014-04-11 11:40:10 +08:00
Dan Poltawski
a219c38b13 Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-04-11 11:40:06 +08:00
AMOS bot
56b837c82b Automatically generated installer lang files 2014-04-10 22:38:41 +00:00
Sam Hemelryk
6c334f7875 MDL-45046 output: reviewed standard/base layouts and converted where a better option was available 2014-04-11 09:30:55 +12:00
Damyon Wiese
fd06eb6d79 MDL-44170 LTI - fix unit tests. 2014-04-10 14:15:50 +08:00
Adrian Fish
83543ffcb9 MDL-44170 Added form field for url matched type.
Added a new mod_form field called urlmatchedtypeid which is populated
by mod_form.js when a matched url is entered. On save, if typeid is 0
and urlmatchedtypeid is supplied, the type id is set to the url matched
id.
2014-04-10 13:41:46 +08:00
Sam Hemelryk
bdaa857d78 MDL-44354 page: fixed ignored property when fetching a renderer 2014-04-10 15:15:38 +12:00
Rajesh Taneja
1706f96ce7 MDL-44979 behat: no need to purge all cache again 2014-04-10 11:02:12 +08:00
David Monllao
f791924e98 MDL-44619 behat: Converting MDLQA-8
In a standard forum, students can start discussions
add replies and attach files to their posts.
2014-04-09 20:09:11 +07:00
David Monllao
0786df6ebe MDL-44619 behat: filemanager field manager
Enough to allow attachments use in multi-field steps.
2014-04-09 19:37:12 +07:00
David Monllao
c3499ca3f2 MDL-44619 behat: Helper to init contexts outside behat 2014-04-09 19:37:12 +07:00
Marina Glancy
52194ac12d MDL-40843 chat: fixed bug in SQL query in recent activity block 2014-04-09 15:45:04 +08:00
Mark Nelson
1b1350947e MDL-42462 mod_feedback: added $OUTPUT to list of global variables used to avoid error 2014-04-09 15:37:52 +08:00
Damyon Wiese
077c9b0dcb MDL-42195 Bootstrap: Make selector for responsive images 100% the same as bootstrap3.
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-09 15:16:48 +08:00
Frederic Massart
76dcccc1e3 MDL-45010 mod_chat: Use H3 instead of H2 in recent activity info 2014-04-09 15:11:18 +08:00
Damyon Wiese
8c3065911b Merge branch 'mdl44669-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE 2014-04-09 13:11:45 +08:00
Dan Poltawski
b54edd00e2 Merge branch 'MDL-29572_moodle26' of https://github.com/jrchamp/moodle into MOODLE_26_STABLE 2014-04-09 11:41:26 +08:00
Ashley Holman
9a1e5b9911 MDL-39740 grade: Fix grade_item::add_idnumber strict type checking 2014-04-09 11:13:05 +08:00
David Scotson
40a88c19a0 MDL-44468 backup: use html_writer::div call
Simplify the renderer code with the new html_writer
div function.
2014-04-08 12:10:35 +01:00
David Scotson
68de16b334 MDL-44468 backup: use notification API
Replace a hardcoded div.notifyproblem with a API call that,
in Standard theme, outputs the same HTML.

Also removes the .notifyproblem class from the heading,
as that might cause problems for themers who expect it to be
used consistently with the API.
2014-04-08 12:10:25 +01:00
Damyon Wiese
a1bb397cf4 MDL-42195 Bootstrap - put border and vertical-align back in the reset for all images
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-08 17:09:05 +08:00
Michael Milette
e69ef947b4 MDL-42462 - Feedback - Fix for WCAG 2.0 issue with Informational and Error Content Displayed in red
1) The same code used in other Moodle forms is now used in Feedback to display the "There are required fields in this form marked (*/Required field)" message at the top of the screen and each of the asterisks next to required fields.

2) Feedback specific styles (missingrequire, feeback_required_mark), which were used to highlight required and error fields, have been eliminated. These colours are now controlled by the common Moodle styles (mform1, mform, fdescription, required, req and error) that are used throughout the rest of Moodle for a more uniform appearance.

3) Field level error reporting now displays a message instead of just highlighting the field in a similar way that other Moodle forms do.

Affected files:

- /mod/feedback/styles.css
- /mod/feedback/complete.php
- /mod/feedback/complete_guest.php
- /mod/feedback/edit.php
- /mod/feedback/print.php
- /mod/feedback/item/captcha/lib.php
- /mod/feedback/item/info/lib.php
- /mod/feedback/item/multichoice/lib.php
- /mod/feedback/item/multichoicerated/lib.php
- /mod/feedback/item/numeric/lib.php
- /mod/feedback/item/textarea/lib.php
- /mod/feedback/item/textfield/lib.php
- /mod/feedback/lang/en/feedback.php

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
2014-04-08 14:12:14 +08:00
Damyon Wiese
ed14b4c8e2 Merge branch 'MDL-41895-m26' of https://github.com/micaherne/moodle into MOODLE_26_STABLE 2014-04-08 13:17:09 +08:00
Marina Glancy
6520c5362b Merge branch 'MDL-44891-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-04-08 11:15:39 +08:00
Dan Poltawski
8cb19a633b Merge branch '42317-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-08 09:22:21 +08:00
Marina Glancy
1ec21eb0cd Merge branch 'MDL-42195-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-04-08 08:54:27 +08:00
Marina Glancy
87618534eb Merge branch 'm26_MDL-44938' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-04-08 08:54:14 +08:00
Sam Hemelryk
7e9b7392ca Merge branch 'MDL-38183_M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE 2014-04-08 11:31:01 +12:00
AMOS bot
6726fa2c1b Automatically generated installer lang files 2014-04-07 22:39:50 +00:00