72402 Commits

Author SHA1 Message Date
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
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
Ruslan Kabalin
d1bb9ea917 MDL-48841 admin: Fix scheduled task reset to defaults finctionality.
It is safe to make fields as non-required, because form validation will not
pass through any empty field anyway.
2015-02-11 11:19:27 +00:00
Rajesh Taneja
c44da97711 MDL-36296 block_navigation: navigate to course before following activity
Activity name is wrapped and chrome driver can't click on it
So navigate to course where it is visible in full
2015-02-11 09:32:28 +00:00
David Monllao
d3dac40019 MDL-48894 core_registration: Fixing version value 2015-02-11 16:18:06 +08:00
Andrew Davis
fe391a4e0c MDL-48894 core_registration: minor string tweak 2015-02-11 14:28:46 +08:00
David Monllao
d0676138b2 Merge branch 'MDL-48894_registration' of git://github.com/andyjdavis/moodle 2015-02-11 09:11:06 +08:00
Marina Glancy
6a2c10a89d MDL-49003 login: prevent signup when user is logged in 2015-02-11 00:03:44 +01:00
gthomas2
78c36b065f MDL-46763 core: Change icon processing to retain source format 2015-02-10 23:55:57 +01:00
Andrew Davis
806c06fc7b MDL-48894 core_registration: make it more obvious if site is registered 2015-02-10 21:12:10 +01:00
AMOS bot
4834fcb875 Automatically generated installer lang files 2015-02-11 00:04:09 +08:00
Eloy Lafuente (stronk7)
3b77006451 Merge branch 'MDL-49036-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2015-02-10 13:29:10 +01:00
Eloy Lafuente (stronk7)
438193ef45 Merge branch 'MDL-48910_block_my' of https://github.com/andyjdavis/moodle 2015-02-10 13:14:59 +01:00
Eloy Lafuente (stronk7)
83ab09a001 Merge branch 'MDL-49058-master' of git://github.com/jethac/moodle 2015-02-10 13:09:38 +01:00
David Monllao
c365148292 MDL-48679 gradebook: Fixing trailing whitespace 2015-02-10 17:48:57 +08:00
David Monllao
b300c1deba Merge branch 'MDL-48679-master' of git://github.com/lameze/moodle 2015-02-10 17:45:22 +08:00
Simey Lameze
e82aa04399 MDL-48679 gradebook: fix grade publishing feature 2015-02-10 17:39:52 +08:00
Dan Poltawski
53018f5fc4 Merge branch 'm29_MDL-49052' of https://github.com/totara/moodle 2015-02-10 09:24:42 +00:00
Dan Poltawski
bb2b3dea79 Merge branch 'wip-mdl-49081' of https://github.com/rajeshtaneja/moodle 2015-02-10 09:08:31 +00:00
Juan Leyva
126470f3c8 MDL-49036 webservices: gradereport_user_get_grades_table ws tests 2015-02-10 09:41:28 +01:00
Jetha Chan
3451a51cdf MDL-37477 output: Add support for table captions
Conflicts:
	lib/upgrade.txt
	theme/bootstrapbase/style/moodle.css
2015-02-10 16:15:49 +08:00
David Monllao
6c33ed43cf MDL-48805 theme: Fixing trailing whitespace 2015-02-10 15:47:41 +08:00
David Monllao
fa42965c2a Merge branch 'm29_MDL-48805' of git://github.com/totara/moodle 2015-02-10 15:26:49 +08:00
Andrew Davis
b6d7cff65f MDL-48910 core_block: user_can_addto() respects applicable formats 2015-02-10 08:07:23 +01:00
David Monllao
0e8182e8f8 Merge branch 'MDL-48822-master' of git://github.com/andrewnicols/moodle 2015-02-10 14:10:28 +08:00
Zachary Durber
a6fe447a9a MDL-43415 auth_db: support textarea and uppercase fields 2015-02-10 13:47:22 +08:00
Marina Glancy
330e51fa14 MDL-10405 course: CSS classname correction 2015-02-10 13:05:51 +08:00
Simey Lameze
58ccdcd2ac MDL-48679 gradebook: helper methods for grade publishing 2015-02-10 12:46:40 +08:00
David Monllao
6e47fb1da3 Merge branch 'MDL-49024_master' of git://github.com/nadavkav/moodle 2015-02-10 12:32:23 +08:00
David Monllao
912ec5c7c2 Merge branch 'm29_MDL-49064' of git://github.com/totara/moodle 2015-02-10 11:56:52 +08:00
David Monllao
4c75cc3278 Merge branch 'MDL-48937-master' of git://github.com/FMCorz/moodle 2015-02-10 11:41:42 +08:00
David Monllao
4b408c3afe Merge branch 'MDL-48960-master' of git://github.com/danpoltawski/moodle 2015-02-10 11:12:18 +08:00
Vadim Dvorovenko
4ad0d0f2f5 MDL-43415 auth_db: Adding custom profile fields to "Lock user fields"
Adding custom profile fields to "Lock user fields". It's needed to sync
custom user profile fields with external DB.
2015-02-10 10:37:12 +08:00
David Monllao
12b20241ec Merge branch 'wip-mdl-49113' of git://github.com/rajeshtaneja/moodle 2015-02-10 10:35:00 +08:00