Eloy Lafuente (stronk7)
e88100f673
Merge branch 'wip-MDL-51999-master' of https://github.com/marinaglancy/moodle
2015-11-02 19:59:01 +01:00
Eloy Lafuente (stronk7)
373748277a
Merge branch 'MDL-51829-master' of git://github.com/dpalou/moodle
2015-11-02 19:40:16 +01:00
Dan Poltawski
5294052875
MDL-52014 quiz: do not log preview attempt deletions
...
This happens automatically by the system.
2015-11-02 16:17:22 +00:00
Colin Campbell
7006ab3eb7
MDL-51715 lib/grade: Unit test for aggregationweight
2015-11-02 10:15:05 -06:00
Colin Campbell
70ba1f6bcb
MDL-51715 lib/grade: Zero out aggregationweight for novalue and dropped
...
set_usedinaggregation was setting aggregationweight to zero in these
cases for non-category grades, but not for category grades.
2015-11-02 10:14:50 -06:00
Dan Poltawski
28aadc2b12
Merge branch 'MDL-51128-master' of git://github.com/junpataleta/moodle
2015-11-02 14:07:10 +00:00
Dan Poltawski
2088c22e41
Merge branch 'wip-MDL-50633-master2' of https://github.com/marinaglancy/moodle
2015-11-02 14:04:44 +00:00
Marina Glancy
57ee89569a
MDL-50633 dml: deprecated var replaced in mysql 5.7
...
Thanks to Charles Verge for providing a patch
2015-11-02 21:05:20 +08:00
Tony Butler
d3069afd27
MDL-52012 core_lib: Add namespace to $OUTPUT->notify_message definition
2015-11-02 11:12:47 +00:00
Dan Poltawski
deec056650
Merge branch 'MDL-51854-master' of https://github.com/pauln/moodle
2015-11-02 09:08:01 +00:00
Damyon Wiese
cfca338d7a
MDL-52004 assign: Set unique urls when grading so autosaves work
...
The Atto autosave feature uses the $PAGE->url to generate unique hashes for
each page. Assignment uses a MUC cache to persist ordering of lists - the result
is that the urls are not unique (they depend on the cached filter).
The fix is to spoof a unique url that will grade only that student with no
active grading list (no next/prev buttons).
2015-11-02 16:41:55 +08:00
Andrew Nicols
693ed49c10
Merge branch 'MDL-51707-m' of https://github.com/micaherne/moodle
2015-11-02 14:36:10 +08:00
Andrew Nicols
df8095156e
Merge branch 'MDL-47073-master' of git://github.com/junpataleta/moodle
2015-11-02 11:54:21 +08:00
Marina Glancy
bb0ac1fdc2
MDL-51999 user: remove unnecessary continue
2015-11-02 10:53:43 +08:00
Andrew Nicols
117dc470bc
Merge branch 'MDL-51964-master' of git://github.com/damyon/moodle
2015-11-02 10:52:37 +08:00
Marina Glancy
9dfe870449
MDL-51888 mod_resource: cache file details for performance
...
If file details (size, type, date) are configured to be displayed we cache them
in course cache raw and build the display string in user language/timezone when
displaying. Also changed behat test not to fail in 2016
2015-11-02 10:38:26 +08:00
Damyon Wiese
273b255673
MDL-51970 autocomplete: Small refactor because too many options
...
Each function was taking 8-10 args - combine them all in state and options
objects and pass those around instead.
2015-11-02 10:22:53 +08:00
Damyon Wiese
97d2ea7f87
MDL-51970 autocomplete: Add an option to hide the suggestions
...
This is used by tags when official tags are disabled.
2015-11-02 10:21:57 +08:00
Damyon Wiese
be9b036a33
MDL-51964 autocomplete: IE11 fires spurious "input" events
...
We need to check for "real" changes to the input value because
ie11 is just firing events willy nilly.
2015-11-02 10:11:13 +08:00
AMOS bot
e0b2ad1f35
Automatically generated installer lang files
2015-11-01 00:07:45 +08:00
Jun Pataleta
bbbdfc8610
MDL-47073 lib: Replace backslashes with slashes in jquery plugin urls
...
This patch replaces backslash characters in the generated jQuery
plugin URL to forward slashes when slasharguments is disabled and
the Moodle server is running on IIS.
Thanks to Ryan Panning <Ryan.Panning@district196.org> for
reporting this issue and for suggesting a fix.
2015-10-30 17:05:23 -05:00
Dan Poltawski
821ab27c19
on-demand release 3.0beta+
2015-10-30 21:09:21 +00:00
Dan Poltawski
999aa8ca45
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2015-10-30 21:09:20 +00:00
Dan Poltawski
3a723033e8
MDL-36109 accesibility: use proper words for logo alt text
2015-10-30 16:55:03 +00:00
Eloy Lafuente (stronk7)
d708bf59e4
Merge branch 'wip-mdl-51981' of https://github.com/rajeshtaneja/moodle
2015-10-30 10:23:52 +01:00
Marina Glancy
58e5ab1bac
MDL-51985 files: sync timemodified when possible
2015-10-30 14:46:09 +08:00
rajesh Taneja
4b274a10c2
MDL-51981 behat: No need for JS tag
...
This scenario crashes win-chrome and probably
other comninations. Looking at this, it seems
js tag is not needed, so removing js tag to make
it pass on all OS
2015-10-30 11:29:52 +08:00
Andrew Nicols
ee0546291a
Merge branch 'wip-MDL-51552-master' of git://github.com/abgreeve/moodle
2015-10-30 11:01:00 +08:00
Adrian Greeve
42b3a58c47
MDL-51552 gradebook: Update to singleview behat test.
2015-10-30 10:08:02 +08:00
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