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

19780 Commits

Author SHA1 Message Date
Andrew Nicols
db23cd087b Merge branch 'MDL-48716-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	lib/db/upgrade.php
	version.php
 2015-02-25 09:20:26 +08:00
Andrew Nicols
1725c553ac MDL-49008 lang: Revert unnecessary rename warning 
This was failing unit tests because it does not check for the presence of
the source directory first. If there is no source directory, it cannot be
moved.
 2015-02-25 08:54:45 +08:00
Dan Poltawski
6750b66c39 Merge branch 'MDL-48142-master' of git://github.com/lameze/moodle 2015-02-24 11:21:50 +00:00
Andrew Nicols
17dd7e7ccd Merge branch 'MDL-48730-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2015-02-24 18:12:32 +08:00
Dan Poltawski
e6c453bb3d Merge branch 'MDL-48108-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	version.php
 2015-02-24 08:59:53 +00:00
Juan Leyva
5d62e813ab MDL-48730 webservices: New ws core_group_get_course_user_groups 2015-02-24 09:39:05 +01:00
Andrew Nicols
5a3fe24392 Merge branch 'MDL-49008_lang_vanish' of https://github.com/andyjdavis/moodle 2015-02-24 16:15:35 +08:00
Andrew Davis
21b859e935 MDL-29008 lang: reintroduced error silencing to prevent unit test failures 2015-02-24 09:00:25 +01:00
Andrew Nicols
2eaf309d16 Merge branch 'MDL-49008_lang_vanish' of https://github.com/andyjdavis/moodle 2015-02-24 11:07:05 +08:00
Andrew Nicols
8b52863f0a MDL-48108 core: Add new indexes to message tables 2015-02-24 09:39:05 +08:00
Dan Poltawski
c40678fb44 Merge branch 'MDL-49046-master' of git://github.com/damyon/moodle 2015-02-23 13:33:40 +00:00
Damyon Wiese
adeb96d28f MDL-49046 javascript: Add support for AMD modules and jquery. 
Grunt is the build tool.
 2015-02-23 16:23:10 +08:00
Andrew Nicols
558354df81 MDL-48807 accesslib: Change create_level_instance to recordset 2015-02-23 16:01:58 +08:00
Simey Lameze
77df1778f2 MDL-48807 core_task: change create_contexts_task to daily frequency 2015-02-23 14:33:39 +08:00
Simey Lameze
5a39b24b9a MDL-48807 accesslib: table locking fix on all create_level_instance 2015-02-23 14:25:21 +08:00
Andrew Davis
4a85b4c0d0 MDL-49008 lang: removed preemptive deleting of old language files 2015-02-22 19:58:57 +01:00
Juan Leyva
3221718eda MDL-48716 webservices: New ws core_user_remove_user_device 2015-02-19 15:15:18 +01:00
Simey Lameze
4ae5ecbeef MDL-48142 core_badge: bug fixes on badge awarded event class 2015-02-19 12:32:36 +08:00
Andrew Nicols
4ec9e2a613 Revert "Merge branch 'MDL-49154' of git://github.com/timhunt/moodle" 
This reverts commit 7a5d394e3c3e0fab8200d0867f6974d9c583d6e4, reversing
changes made to 58d5cc53604aa4181adc1cddc39114f40673a2a3.
 2015-02-19 08:55:22 +08:00
Eloy Lafuente (stronk7)
e912b82704 Merge branch 'MDL-48973' of https://github.com/pauln/moodle 2015-02-17 23:51:01 +01:00
Eloy Lafuente (stronk7)
7a5d394e3c Merge branch 'MDL-49154' of git://github.com/timhunt/moodle 2015-02-17 23:44:43 +01:00
Eloy Lafuente (stronk7)
b062cd5cb1 Merge branch 'MDL-49205' of git://github.com/timhunt/moodle 2015-02-17 22:11:57 +01:00
Eloy Lafuente (stronk7)
d1b94e5437 Merge branch 'MDL-49059-split' of https://github.com/pauln/moodle 2015-02-17 20:56:45 +01:00
David Monllao
fc8f8e6e5a Merge branch 'MDL-49167-master' of git://github.com/damyon/moodle 2015-02-17 17:01:15 +08:00
Ankit Agarwal
bbcd308340 MDL-48559 behat: Moving cronclionly to the installer 2015-02-17 14:33:56 +08:00
Andrew Nicols
cbae4e39ea Merge branch 'wip-mdl-48670' of https://github.com/rajeshtaneja/moodle 2015-02-17 14:07:55 +08:00
James Ballard
483cfd763d MDL-48142 core_badge: add badge awarded event 2015-02-17 09:37:35 +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
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
Tim Hunt
f0edd9d8f6 MDL-49205 behat: fix I set the field with xpath fail message. 2015-02-13 16:15:49 +00: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
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
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
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
d3dac40019 MDL-48894 core_registration: Fixing version value 2015-02-11 16:18:06 +08:00
David Monllao
d0676138b2 Merge branch 'MDL-48894_registration' of git://github.com/andyjdavis/moodle 2015-02-11 09:11:06 +08: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
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
Dan Poltawski
bb2b3dea79 Merge branch 'wip-mdl-49081' of https://github.com/rajeshtaneja/moodle 2015-02-10 09:08:31 +00: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
6e47fb1da3 Merge branch 'MDL-49024_master' of git://github.com/nadavkav/moodle 2015-02-10 12:32:23 +08:00
David Monllao
4c75cc3278 Merge branch 'MDL-48937-master' of git://github.com/FMCorz/moodle 2015-02-10 11:41:42 +08:00