76120 Commits

Author SHA1 Message Date
Andrew Nicols
22d0a8f11e MDL-51966 forms: Typo correction 2015-10-30 07:56:25 +08:00
Andrew Nicols
63a03a8b05 Merge branch 'wip-MDL-51966-master' of https://github.com/marinaglancy/moodle 2015-10-30 07:31:28 +08:00
AMOS bot
1a9d1593e4 Automatically generated installer lang files 2015-10-30 00:04:09 +08:00
Dan Poltawski
ca9daf0fb0 Merge branch 'MDL-51955' of git://github.com/stronk7/moodle 2015-10-29 14:22:28 +00:00
Dan Poltawski
02315eb2bb Merge branch 'MDL-51939-master' of git://github.com/andrewnicols/moodle 2015-10-29 13:54:56 +00:00
Eloy Lafuente (stronk7)
1f0f002e1d MDL-51939 mod_forum: all participants discussions are viewed by students
Added scenario to verify that "all participants" discussions, under
separate-groups mode are, by default, visible for students.
2015-10-29 21:10:20 +08:00
Andrew Nicols
7774cf96f8 MDL-51939 mod_forum: Fix groupid data on upgrade
This upgrade step addresses issues identified in MDL-51939 where the
groupid was incorrectly set. The issue itself is not present in 2.9, but
this upgrade step is required to correct any incorrect data.
2015-10-29 21:10:11 +08:00
Eloy Lafuente (stronk7)
aa4a2716ef MDL-51955 testing: Exported files may be smaller than expected
Open a bit the allowed size expectation to accomodate oracle
producing smaller files when outputing decimal numbers.
2015-10-29 13:19:36 +01:00
Dan Poltawski
3adcb91d55 Merge branch 'MDL-50811-master' of git://github.com/cameron1729/moodle 2015-10-29 10:53:40 +00:00
Dan Poltawski
ab0ad70a83 Merge branch 'MDL-51921-master' of git://github.com/junpataleta/moodle 2015-10-29 10:35:03 +00:00
Adrian Greeve
81e3251512 MDL-51552 gradebook: Single view bulk insert fix.
Single view now doesn't overwrite non-empty grades.

A thank you to Sam Anderson and Robert Russo for providing a patch.
2015-10-29 16:00:46 +08:00
Marina Glancy
ecbc2a2f25 MDL-51966 forms: case-insensitive search in autocomplete 2015-10-29 15:10:20 +08:00
Andrew Nicols
b5df2c1db0 Merge branch 'MDL-51923-master-2' of git://github.com/xow/moodle 2015-10-29 14:48:25 +08:00
Andrew Nicols
37d0021369 Merge branch 'MDL-51915' of git://github.com/timhunt/moodle 2015-10-29 14:41:45 +08:00
Andrew Nicols
a72f3add06 Merge branch 'MDL-51799-master' of git://github.com/ryanwyllie/moodle 2015-10-29 13:16:15 +08:00
Ryan Wyllie
f8f477ece5 MDL-51799 javascript: dialogue accessibility
Moved setting the aria visiblity of the dialogues from the show
and hide functions into the visibility change handler to stop
multiple calls.

Also made the visibility checker just continue to buffer the elements
it hides, rather than clearning them, on multiple calls.
2015-10-29 05:10:10 +00:00
Andrew Nicols
68881fb620 Merge branch 'MDL-51956-master' of git://github.com/ryanwyllie/moodle 2015-10-29 11:06:18 +08:00
Ryan Wyllie
1c53bc813e MDL-51956 atto_table: fix bg colour bug
The table editor will now set the backgorund colour on the
table in Firefox version 34 and below.

Also expanded the dialogue slightly because the colour choices
were wrapping and I added some styling to put a gap in for the
metric markers for border width and table width.
2015-10-29 02:51:06 +00:00
Dan Poltawski
de342562cc Merge branch 'wip-MDL-51919-master' of git://github.com/abgreeve/moodle 2015-10-28 12:48:18 +00:00
Dan Poltawski
bb63c18443 Merge branch 'MDL-51924-master' of git://github.com/barbararamiro/moodle 2015-10-28 12:04:20 +00:00
Dan Poltawski
b2aaab60f3 Merge branch 'MDL-51838-master' of git://github.com/damyon/moodle 2015-10-28 11:53:53 +00:00
Dan Poltawski
413c321a18 Merge branch 'MDL-51914' of git://github.com/timhunt/moodle 2015-10-28 11:52:03 +00:00
Tim Hunt
2d391d1b10 MDL-51914 qtype_ddmarker: precise grading round the edges of zones
There was a previous change to the CSS (7px -> 3px) to make things
look prettier, which acutally broke the grading by a few pixes.
I fixed this by:

* Changing the offset of the cross hairs back to the correct value,
  and adding a comment to point out the imporance of not changing
  that CSS.

* Achieved the nice layout of the label relative to the cross-hairs
  in a different way.

* Added a similar clafirying comment in the JavaScript.

* Improved how the grid on the editing form is aligned with the
  background image.

* Added rounding to the grading code, to cope better now that
  browsers do sub-pixel positioning.
2015-10-28 10:53:00 +00:00
Jun Pataleta
9f555a7e77 MDL-51921 files: Fixes for file manager issues
Fixed the issue where the file path select box goes beyond the
container with very long folder names. Instead of setting to
"width: auto", I set it the select box's "width: 100%" so that it will
just fill up its container's width.
Fixed the issue where markups are being shown on file aliases.
2015-10-28 04:48:25 -05:00
Rajneel Totaram
494fec0071 MDL-51923 enrol: Enrolment list filter 'No Group' shows incorrect count
With contributions from John Okely
2015-10-28 17:34:16 +08:00
Adrian Greeve
527bde6e0f MDL-51919 forms lib: Autocomplete doesn't hide prematurely.
Quickly navigating via the keyboard to an autocomplete
element and hitting down would result in the selections
being displayed and then quickly removed. This has now
been fixed.
2015-10-28 14:15:26 +08:00
Andrew Nicols
d412f8552d on-demand release 3.0beta+ 2015-10-28 12:59:31 +08:00
Andrew Nicols
6fb6859945 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-10-28 12:59:25 +08:00
Andrew Nicols
af39ce0f8d MDL-51880 atto_table: Coding style fix 2015-10-28 11:39:17 +08:00
Andrew Nicols
7dea2c1707 Merge branch 'MDL-51880-master' of git://github.com/ryanwyllie/moodle 2015-10-28 11:37:17 +08:00
Ryan Wyllie
f45937e17d MDL-51880 atto/plugins/table: improve table borders
* Removed the "No borders" option from general borders setting
  since it's a style choice.
* Added inherit, initial and unset as border style options.
* Made the border settings disabled if "Theme default" is selected.
* Changed the transparent colour to be "Theme default" which means
  apply no colour at all.
2015-10-28 03:28:36 +00:00
Dan Poltawski
e360ff5db6 Merge branch 'MDL-51893' of git://github.com/stronk7/moodle 2015-10-27 14:43:00 +00:00
Dan Poltawski
61257ae417 Merge branch 'MDL-51863' of git://github.com/stronk7/moodle 2015-10-27 11:57:20 +00:00
Dan Poltawski
101df9a634 Merge branch 'MDL-51906-master-fixes' of git://github.com/andrewnicols/moodle 2015-10-27 10:49:10 +00:00
Andrew Nicols
68b35af353 MDL-51906 testing: Hardcode branch name 2015-10-27 18:31:23 +08:00
Eloy Lafuente (stronk7)
7c549a17f4 MDL-51893 core_date: Stop using Pacific/Norfolk as 11.5 replacement
Norfolk Island's standard time (NFT) was on UTC+11:30 until 4 October
2015, when it was changed to UTC+11:00. So it's not suitable for 11.5
bad mapping replacement anymore.

It seems that there isn't any other location using such 11.5 timezone
so completely getting rid of it for conversions.
2015-10-27 10:17:05 +01:00
Barbara Ramiro
39f360ae38 MDL-51924 Using box-sizing mixin to prevent blocks overlap on profile page 2015-10-27 16:13:43 +08:00
Corey Wallis
346ba4f443 MDL-50811 mod_forum: Add completion tracking for emailed replies 2015-10-27 15:53:42 +08:00
Andrew Nicols
10a8d040dc Merge branch 'MDL-51905-master' of git://github.com/xow/moodle 2015-10-27 14:50:55 +08:00
Andrew Nicols
03f2797b09 MDL-51922 testing: Add memcached + mongodb testing to Travis matrix 2015-10-27 14:29:21 +08:00
John Okely
161ffc5605 MDL-51905 block_activity_results: Default to the current activity
Due to an incorrect condition, the activity results block would
incorrectly identify some blocks as not being gradeable.
This meant that edit form could not determine what activity the block
was added to. This commit fixes the condition, allowing the current
block to be determined correctly
2015-10-27 13:47:58 +08:00
Andrew Nicols
53759a0c91 Merge branch 'wip-MDL-51840-master' of git://github.com/abgreeve/moodle 2015-10-27 11:13:44 +08:00
Andrew Nicols
f5e587c1db Merge branch 'wip-MDL-51841-master' of git://github.com/abgreeve/moodle 2015-10-27 11:03:43 +08:00
Andrew Nicols
4727a4a207 Merge branch 'MDL-51864-master' of git://github.com/junpataleta/moodle 2015-10-27 10:57:45 +08:00
Andrew Nicols
d891a6dcb7 Merge branch 'MDL-51127-master' of git://github.com/lazydaisy/moodle 2015-10-27 10:47:48 +08:00
Eloy Lafuente (stronk7)
70ae75674d MDL-51863 packer: ensure empty zip files behavior remains consistent
With PHP bug #70322 fixed, ZipArchive::close() did start returning false
and throwing PHP Warnings with recent PHP versions (5.6.14 and up).
Previously (5.6.13 verified) it was returning true, and false in older
versions (5.4.x verified).

This change does silent the 2 "hacky" calls to close() that we perform
in core leaving the 3rd one (used for files having files) unmodified.

A new unit test has been created to cover the close() behavior, ideally
supporting both old and new PHP versions without harcoding any PHP
version.

Note that we don't use to rely much on results coming from close(), and
that's a good thing given the buggy behavior commented above. This just
keeps empty zips working like they were before.
2015-10-26 21:16:54 +01:00
Tim Hunt
42406bc413 MDL-51915 lib tests: Extra unit test for html_to_text. 2015-10-26 18:30:21 +00:00
Barry Oosthuizen
3e90d870bc MDL-51913 report_stats: Make first column unique 2015-10-26 17:22:31 +00:00
Dan Poltawski
d3cd5f1f8f Merge branch 'wip-MDL-51834-master' of https://github.com/kwiliarty/moodle 2015-10-26 13:54:41 +00:00
Dan Poltawski
3ec49c6de3 Merge branch 'MDL-51906-master' of git://github.com/andrewnicols/moodle 2015-10-26 13:49:32 +00:00