mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 18:12:29 +01:00
Code Issues Projects Releases Wiki Activity
72,484 Commits 36 Branches 527 Tags
Commit Graph

72484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Nelson
0687f998b9 MDL-49200 core_form: corrected string 2015-02-16 21:56:14 -08:00
David Monllao
a50840db34 Merge branch 'MDL-48215_master' of git://github.com/markn86/moodle 2015-02-17 13:23:30 +08:00
David Monllao
77b0238bdb Merge branch 'MDL-43415-master' of git://github.com/zbdd/moodle 2015-02-17 13:16:39 +08:00
Petr Skoda
5fb2315a8b MDL-49184 choice: fix block actions 
The problems was that blocks editing breaks if you redirect
after if (data_submitted()) - all form actions must make sure
it is really their form, otherwise they may hijack the post from
block actions.

Note that this is not a problem for mforms, only legacy forms
are affected.

# Conflicts:
#	mod/choice/view.php
 2015-02-17 17:00:15 +13:00
David Monllao
bbc009f26c MDL-48543 filter_mathjaxloader: Fixing upgrade version 2015-02-17 11:00:52 +08:00
Damyon Wiese
b1a55c5ffb MDL-48543 Mathjax: Update default config for JAWS Math player 
JAWS Maths player does not recognise the math content when manually specifying the config for MathJax.
If you use one of the default config files it works.
So - we switch our config to the Accessible.js config that it is based off anyway.
There are no features changes with this approach.

Conflicts:
	filter/mathjaxloader/version.php
 2015-02-17 10:54:12 +08:00
David Monllao
be1bc2d4cb MDL-48760 filter_mathjaxloader: Removing post-2.9 release comment 2015-02-17 10:48:06 +08:00
James Ballard
483cfd763d MDL-48142 core_badge: add badge awarded event 2015-02-17 09:37:35 +08:00
David Monllao
57ff8d92f9 Merge branch 'MDL-48709' of git://github.com/jmvedrine/moodle 2015-02-17 09:17:10 +08:00
David Monllao
a27b8c9b3b Merge branch 'MDL-48559-master' of git://github.com/ankitagarwal/moodle 2015-02-16 16:51:51 +08:00
David Monllao
73152e4dff Merge branch 'wip-MDL-48760-master' of git://github.com/abgreeve/moodle 2015-02-16 16:38:34 +08:00
Michael Hughes
3a1cc9475d MDL-48215 gradingform_guide: Name length validation 
Validating both criterion name and guide name to be 255 chars.
 2015-02-15 21:52:12 -08:00
David Monllao
470e087d80 Merge branch 'MDL-47529-master' of git://github.com/FMCorz/moodle 2015-02-16 11:52:50 +08:00
Damyon Wiese
0bb431e3ac MDL-49167 YUI: Fix for theme/yui_combo.php and $CFG->yuislashargs 
It was too aggressively cleaning it's params (broken in MDL-48980).
 2015-02-16 11:26:31 +08:00
Frederic Massart
308e481ce8 MDL-47529 lock: Fix typo on lock factory in config-dist 2015-02-16 10:53:45 +08:00
David Monllao
36977d39d0 Merge branch 'MDL-40776_master' of git://github.com/s-cenni/moodle 2015-02-16 10:35:06 +08:00
David Monllao
608132d7e4 MDL-47172 print_overview: Fixing indentation 2015-02-16 09:38:05 +08:00
Brian Barnes
ff6744c5e2 MDL-48519 accessibility: improved accessibility of user filters 2015-02-16 10:00:01 +13:00
Yuliya Bozhko
aebac578db MDL-49170 badges: Backpack connection missing a port colon in URL 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2015-02-16 09:32:54 +13:00
Mary Evans
a20ae5be3a MDL-49211 theme_bootstrapbase: Text alignment issue in CLOZE questions. 2015-02-15 18:44:10 +00:00
Jean-Michel Vedrine
fc16a1acba MDL-48709 mod_lesson: subclusters are not working 2015-02-14 18:26:03 +01:00
Stephen Bourget
c04b66a564 MDL-34375 Choice: Display choice on 'my home' 2015-02-13 14:19:55 -05:00
Tim Hunt
f0edd9d8f6 MDL-49205 behat: fix I set the field with xpath fail message. 2015-02-13 16:15:49 +00:00
Adrian Greeve
01dfdf7e41 MDL-48760 maths filters: Upgrade to mathjax 2.5 2015-02-13 14:26:11 +08:00
Ankit Agarwal
81251186e7 MDL-47172 print_overview: Add more unit tests 2015-02-13 11:12:13 +05:30
Ankit Agarwal
a7366bc858 MDL-47172 print_overview: Show assignments only when needed 
The intended behaviour is not to display this notification when:-
1) The assignment is closed.
2) User is a student and has a valid submission in place.
3) User is a teacher and there is nothing to grade.

Beisdes the above changes the patch also includes minor other fixes such as:-
1) Fixed phpdocs
2) Fixed inconsistent return value.
3) Fixed unit tests that had arguments in wrong order.
 2015-02-13 11:12:12 +05:30
David Monllao
667ef02858 MDL-18553 mod_lesson: Requiring just the grade constants 2015-02-13 10:40:47 +08:00
Jean-Michel Vedrine
49aaac3e6f MDL-18553 Lesson: No gradeinfo display if lesson grade is zero 2015-02-13 10:28:00 +08:00
Paul Nicholls
10fae2779e MDL-48973 Atto: Atto does not listen to the drop event 
The 'drop' event fires before the native ContentEditable drop handler, so
in order to update the underlying textarea we need to call updateOriginal
with a brief delay so that the dropped content has actually been added to
the editor.
 2015-02-13 14:48:12 +13:00
Mark Nelson
5962f0df5d MDL-49182 core_course: minor changes to deleting section strings 2015-02-12 17:16:56 -08:00
Rajesh Taneja
02fafff411 MDL-48670 behat: Set timezone to Australia/perth 
Behat tests might rely on time related tests
Ensure we have default timezone set to Australia/Perth
 2015-02-13 08:11:53 +08:00
Eric Merrill
deb7f93af8 MDL-48993 gradebook: When importing new items, treat blank or - as empty 2015-02-12 17:17:06 -05:00
Eric Merrill
502aa0fbfd MDL-48991 gradebook: Fix style problems 2015-02-12 16:49:17 -05:00
Matt Switlik
cf0af62603 MDL-48991 gradebook: Properly import multiple new grade items 
Work done in MDL-46547 caused a problem where multiple new grade items
were not imported. Fix up the passing of new grade objects.
 2015-02-12 16:06:59 -05:00
Paul Nicholls
408a41bd35 MDL-49059 medialib: Add test cases for invalid Youtube URL param values 
Tests to ensure that we're not allowing injection via invalid values of
the Youtube start time and playlist parameters.
 2015-02-13 09:45:41 +13:00
Paul Nicholls
8fcb99bc88 MDL-49059 medialib: Support links to Youtube videos within playlists 
As well as embedding playlists, you can embed specific videos from them -
resulting in the playlist UI displaying, but starting with the specified
video rather than the first in the playlist.  Previously, just the
specified video would embed - without the playlist UI.
 2015-02-13 09:45:02 +13:00
Paul Nicholls
d518ff1813 MDL-49059 medialib: Support start time params in Youtube URLs 
Medialib (and thus the Multimedia Plugins filter) was ignoring start time
parameters on YouTube video URLs, meaning that the video would always
start at the start, even when the appropriate parameter was present.
 2015-02-13 09:44:23 +13:00
Paul Nicholls
b600abe20f MDL-49059 medialib: Add tests for Youtube videos within playlists 
As well as embedding playlists, you can embed specific videos from them -
resulting in the playlist UI displaying, but starting with the specified
video rather than the first in the playlist.  These URLs should be covered
by the tests to ensure that we're handling them properly.
 2015-02-13 09:43:43 +13:00
Paul Nicholls
8050cfe0b7 MDL-49059 medialib: Add test cases for Youtube start times 
Add test cases to core_medialib_testcase to cover YouTube videos with
start times.
 2015-02-13 09:43:05 +13:00
Tim Hunt
2116de5f80 MDL-49154 behat: step to type with focus on a given element 2015-02-12 20:14:50 +00:00
Andreas Grabs
3d944c8b20 MDL-49169 user - After MDL-48978-Fix description is not saved anymore 2015-02-12 12:26:36 +01:00
Mike Grant
b609413154 MDL-37470 blocklib: Respect block weight and offset 2015-02-12 09:37:52 +00:00
David Monllao
7357af2b0c weekly release 2.9dev 2015-02-12 15:30:03 +08:00
David Monllao
0471328c70 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-02-12 15:30:01 +08:00
Frederic Massart
3630ab92d9 MDL-47529 task: Remove usage of lock when editing a task 2015-02-12 11:16:20 +08:00
Frederic Massart
0af336ef93 MDL-47529 task: Do not use lock when updating task records 2015-02-12 11:16:20 +08:00
David Monllao
5bb0ee2a7a MDL-43535 webservices: Adding missing deprecated WS 
- enrol_manual needs a version bump to execute
  external_update_descriptions()
- core_user_get_users_by_id() is now also marked
  as deprecated
 2015-02-12 10:13:36 +08:00
Stephen Bourget
6f5d9a9350 MDL-49178 Lesson: Add question pages to generators 2015-02-11 21:03:36 -05:00
Stephen Bourget
eaa717bbe1 MDL-48883 Lesson: Improve unit tests 2015-02-11 10:53:35 -05:00
Sara Cenni
54867385b2 MDL-40776 grade: fix query for report outcomes 
Add a missing space to the query for report outcomes to avoid error with Oracle.
 2015-02-11 14:14:02 +01:00