Commit graph

72601 commits

Author SHA1 Message Date
Dan Poltawski
4501ee4b16 Merge branch 'MDL-48965' of git://github.com/jmvedrine/moodle 2015-03-16 21:05:56 +00:00
Dan Poltawski
f5526fdf8f Merge branch 'wip-MDL-49267-master' of git://github.com/marinaglancy/moodle 2015-03-16 15:52:36 +00:00
Dan Poltawski
448a80c6e9 Merge branch 'MDL-48717-master' of git://github.com/jleyva/moodle 2015-03-16 15:28:50 +00:00
Juan Leyva
e6d6393478 MDL-48717 book: book_exports_contents unit tests 2015-03-16 15:59:20 +01:00
Dan Poltawski
f3b35cffc3 Merge branch 'MDL-49187' of https://github.com/spvickers/moodle 2015-03-16 14:45:53 +00:00
Dan Poltawski
f4e1913530 Merge branch 'MDL-49152-master' of git://github.com/damyon/moodle 2015-03-16 14:26:15 +00:00
Dan Poltawski
3bec364f35 Merge branch 'MDL-49442-master' of git://github.com/jethac/moodle 2015-03-16 13:31:07 +00:00
Dan Poltawski
e4d0db1769 Merge branch 'MDL-49163-master' of git://github.com/damyon/moodle 2015-03-16 11:01:18 +00:00
Dan Poltawski
6a24f0a796 Merge branch 'MDL-45725-master' of https://github.com/lucisgit/moodle 2015-03-16 10:52:02 +00:00
Tony Butler
60ec267b0b MDL-45725 core_lib: Add unit test for persistent flexible tables 2015-03-16 10:41:11 +00:00
Tony Butler
f5ba1b93a2 MDL-45725 core_lib: Save user preferences for flexible tables 2015-03-16 10:41:11 +00:00
Dan Poltawski
8f5378700a Merge branch 'MDL-44367_master' of git://github.com/dmonllao/moodle 2015-03-16 09:57:16 +00:00
David Monllao
7035377b58 Merge branch 'MDL-49445' of git://github.com/timhunt/moodle 2015-03-16 15:38:02 +08:00
Andrew Nicols
5d41952fbb Merge branch 'MDL-47712-int-fix' of git://github.com/dmonllao/moodle 2015-03-16 13:50:11 +08:00
David Monllao
fd822c0bc5 Merge branch 'MDL-19670-master' of git://github.com/gurgus/moodle 2015-03-16 13:45:31 +08:00
David Monllao
365377bcb2 MDL-47712 question_multianswer: Concat as string 2015-03-16 12:28:51 +08:00
David Monllao
da7f38007e Merge branch 'MDL-47712-master' of git://github.com/dthies/moodle 2015-03-16 10:33:14 +08:00
David Monllao
5f2747c866 Merge branch 'master_MDL-44548' of git://github.com/danmarsden/moodle 2015-03-16 10:04:14 +08:00
David Monllao
4950f166d5 Merge branch 'wip-MDL-47729-master' of git://github.com/marinaglancy/moodle 2015-03-16 09:49:05 +08:00
Dan Marsden
9e733da743 MDL-44548 mod_scorm: force an external sync to check for updated files. 2015-03-16 09:02:26 +13:00
Damyon Wiese
9bdcf57951 MDL-49152 output: Templates for renderers (JS and PHP)
Mustache support for rendering templates from either php or js.
2015-03-14 22:48:40 +08:00
Daniel Thies
530a2cb0d1 MDL-47712 qtype_multianswer: Move mathjaxloader spans to outer question 2015-03-13 20:43:03 -05:00
Tim Hunt
ca0ceacd27 MDL-49446 behat: should_not_be_visible steps were not working
I fixed all similar problems in this class, even ones where it did
actually work becuase the two exceptions were of different types.
This pattern seems to have been copied and pasted a lot in this class,
and I am sure that will happen again, so I did not want to leave any
dangerous potential examples around.
2015-03-13 14:28:47 +00:00
Tim Hunt
5954a9de10 MDL-49445 behat: selectors should match the most specific tr or li
I also fixed the text rule, which already did this, to use the same
idiom. It is unnecessarily inefficient to count all the things and
compare to 0. Not exists should be faster.

Also, updated all the selectors here to consistently start relative to
the current node (.//, not //).
2015-03-13 14:28:13 +00:00
Juan Leyva
752901faf3 MDL-48717 book: book_exports_contents function implementation 2015-03-13 11:14:59 +01:00
Marina Glancy
1c4f42e1b2 MDL-47729 repository_filesystem: smarter sync of references
It was noticed that if file content was once imported the following
synchronisations do not discover the changes
2015-03-13 11:01:02 +08:00
David Monllao
06122e46fd weekly release 2.9dev 2015-03-13 10:27:23 +08:00
David Monllao
2b03198ed8 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-03-13 10:27:21 +08:00
David Monllao
774b0af2a0 Merge branch 'MDL-48943-master-arialive' of git://github.com/andrewnicols/moodle 2015-03-13 10:15:29 +08:00
Dave Cooper
2587313a9a MDL-19670 mod_forum: Allow user to post a copy to all accessible groups 2015-03-12 17:02:49 +08:00
Dave Cooper
f267b8b2f4 MDL-19670 mod_forum: Add tests for posting to multiple discussions 2015-03-12 17:02:43 +08:00
Dan Poltawski
c0976b0229 Merge branch 'MDL-48595_master-test-fix' of git://github.com/dmonllao/moodle 2015-03-12 08:03:15 +00:00
Dan Poltawski
4b83ee9b9f Merge branch 'wip-mdl-48595' of git://github.com/rajeshtaneja/moodle 2015-03-12 08:03:11 +00:00
Damyon Wiese
72f8324ec5 MDL-49163 Webservices, AJAX: Add support for a new ajax webservice handler.
This is a new script that can call any function in the built-in AJAX webservice. This is
a new system service that is added at install time (like the mobile webservice). It has no
protocols added to it, but it accessible by a new ajax script /lib/ajax/service.php.

Requests and responses to the script are required to be in json format, and multiple functions can
be called in a single request.
2015-03-12 15:07:08 +08:00
David Monllao
5803e36cc5 MDL-48595 logstore_standard: Fixing unit tests comparing performance
Adding also an extra userid checking as databases
may include userid = 0 records.
2015-03-12 14:17:29 +08:00
Rajesh Taneja
f978c3347a MDL-48595 core_stats: get time everytime it's used
Depending on server speed, time might be more then
expected. So rather then using variable, get current
time where required
2015-03-12 12:49:44 +08:00
Andrew Nicols
f4042b73f2 MDL-48943 calendar: Remove aria-live when showing 2015-03-12 09:41:26 +08:00
Eloy Lafuente (stronk7)
ce1be0e738 MDL-48943 calendar: des@arn-izating acceptance tests 2015-03-11 12:46:23 +01:00
Eloy Lafuente (stronk7)
aa38c5e98d Merge branch 'MDL-49094-master' of git://github.com/andrewnicols/moodle 2015-03-11 12:36:34 +01:00
Eloy Lafuente (stronk7)
3fb98d64e2 Merge branch 'MDL-48943-master' of git://github.com/andrewnicols/moodle 2015-03-11 12:02:49 +01:00
Jetha Chan
728e272851 MDL-49224 tooL_generator: fallback to "Test course <x>" when no fullname specified 2015-03-11 15:25:34 +08:00
Andrew Nicols
cfb8019b67 MDL-49269 javascript: Set default loglevel to warn 2015-03-11 12:18:31 +08:00
David Monllao
677e0dd6ca MDL-44367 filter_data: Adding basic unit tests 2015-03-11 09:54:32 +08:00
David Monllao
9a4ad19f55 MDL-44367 filter_data: Moving cache at course level 2015-03-11 09:54:25 +08:00
David Monllao
79565fa55a MDL-49298 admin: Adding upgrade.txt info about enabletgzbackups 2015-03-11 08:41:22 +08:00
David Monllao
42d81ef740 Merge branch 'MDL-49298-master' of git://github.com/merrill-oakland/moodle
Conflicts:
	version.php
2015-03-11 08:33:23 +08:00
David Monllao
43e15173dd Merge branch 'MDL-49315' of git://github.com/timhunt/moodle 2015-03-11 08:28:02 +08:00
David Monllao
7f7fd7e1e2 Merge branch 'MDL-49269-master' of git://github.com/andrewnicols/moodle 2015-03-11 08:23:30 +08:00
Andrew Nicols
3acc64e323 MDL-49269 javascript: Add log, and loglevel amd modules 2015-03-11 08:17:54 +08:00
David Monllao
ac28aad351 Merge branch 'MDL-49069' of git://github.com/rlorenzo/moodle 2015-03-11 08:17:29 +08:00