Dan Poltawski
6755498637
Merge branch 'MDL-48595_master' of git://github.com/dmonllao/moodle
...
Conflicts:
version.php
2015-03-10 09:59:28 +00:00
David Monllao
ceba96bbca
Merge branch 'MDL-49256-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2015-03-10 17:42:35 +08:00
Dan Poltawski
1151c0cd8b
Merge branch 'MDL-48682_master' of git://github.com/dmonllao/moodle
2015-03-10 08:25:30 +00:00
Dan Poltawski
a0941ad0af
Merge branch 'wip-mdl-39752' of https://github.com/rajeshtaneja/moodle
2015-03-10 08:08:51 +00:00
David Monllao
fa91462dfa
Merge branch 'MDL-49316-master' of git://github.com/jleyva/moodle
...
Conflicts:
version.php
2015-03-10 15:50:13 +08:00
David Monllao
2af068596a
Merge branch 'MDL-49366' of git://github.com/timhunt/moodle
2015-03-10 14:41:09 +08:00
David Monllao
dbf51f9117
Merge branch 'MDL-49107-master' of git://github.com/FMCorz/moodle
2015-03-10 11:42:58 +08:00
David Monllao
ed1027765e
Merge branch 'MDL-49332-master' of git://github.com/merrill-oakland/moodle
2015-03-10 10:42:42 +08:00
David Monllao
5091a63fc1
Merge branch 'MDL-46064_master' of git://github.com/markn86/moodle
2015-03-10 10:23:55 +08:00
David Monllao
039b74fd01
Merge branch 'MDL-5583-master' of git://github.com/xow/moodle
2015-03-10 10:02:23 +08:00
David Monllao
f966af0da3
Merge branch 'wip-MDL-48437_MASTER' of git://github.com/jason-platts/moodle
2015-03-10 09:56:21 +08:00
Jetha Chan
a1679a115c
MDL-49442 javascript: fix handlebars get_string behaviour
2015-03-09 17:22:22 +08:00
Marina Glancy
51fef1de35
MDL-49418 core: partial revert of MDL-48804
...
this is a quick fix for the issue 'Course module with two or more availability restrictions is not accessible'
MDL-49434 is created to deal with the renderer access inside availability check
2015-03-09 11:26:50 +08:00
David Monllao
59aebbed70
MDL-48595 logstore: Replacing references to deprecated interfaces
2015-03-09 08:25:37 +08:00
David Monllao
1cfce08e63
MDL-48595 logstore: Adding new interfaces
...
sql_reader and sql_internal_table_reader.
2015-03-09 08:25:37 +08:00
David Monllao
45a1a16bfc
MDL-48595 log: Replacing current interfaces
...
Deprecating sql_internal_reader and sql_select_reader in
favour of the new interfaces including get_events_select_iterator.
2015-03-09 08:25:15 +08:00
David Monllao
ad23227bd6
MDL-48595 core_dml: Adding a recordset walker
2015-03-09 08:25:14 +08:00
Rajesh Taneja
5b9e6b5526
MDL-39752 behat: Added support for behat_wwwroot and behat_dataroot
2015-03-09 07:49:25 +08:00
Rajesh Taneja
a2754d791b
MDL-39752 behat: Moved parallel run checks from setup to behat/lib.php
2015-03-09 07:11:57 +08:00
Rajesh Taneja
1bff616611
MDL-39752 behat: Added Fromrun and torun for running on multiple vms
...
https://circleci.com
2015-03-09 07:11:56 +08:00
Rajesh Taneja
ef95c163e4
MDL-39752 behat: Don't package default step count with moodle
2015-03-09 07:11:56 +08:00
Rajesh Taneja
027212b034
MDL-39752 behat: Use symfony2/process
2015-03-09 06:52:54 +08:00
Rajesh Taneja
3c71c15c26
MDL-39752 behat: Modified following for parallel run:
...
1. Create behat datadir within behat_dataroot not at same level
2. Define suffix for link and not use hard-coded values
3. Renamed ns_parallel to run.php
4. Rename variables to best understand them
5. Added support for each run to specify db, prefix, rerun and profile.
6. Showing number of steps in each line of parallel run.
2015-03-09 06:52:54 +08:00
Tony Levi
08e7f97ee4
MDL-39752 behat: Parallel execution support
2015-03-09 06:52:54 +08:00
Juan Leyva
31c202b0ab
MDL-49316 webservices: Add core_course_get_courses to mobile service
2015-03-06 11:35:47 +01:00
Mark Nelson
71611510a0
MDL-46064 install: prevent install/upgrade with MyISAM
2015-03-05 22:29:34 -08:00
Andrew Nicols
c4e2c67134
MDL-49256 atto: Check form existence before resetAutosave
2015-03-06 11:26:41 +08:00
Andrew Nicols
eb67d5a690
MDL-49094 dock: Add -only class to body for non-legacy regions
...
This also tidies up the dock region code.
2015-03-06 11:09:44 +08:00
David Monllao
1a970e5ca0
MDL-49376 behat: Fixing resize step regex
2015-03-06 10:59:03 +08:00
John Okely
9776f3dcdb
MDL-5583 behat: Add multiline version of 'And I set the field to'
2015-03-06 09:55:49 +08:00
Eric Merrill
17e56698ec
MDL-49332 gradebook: Raise time limit if we get into regrade
...
Because all regrading should (and does) start from this point, it
is safe and best to call it just once, from this point.
2015-03-05 10:09:40 -05:00
Eric Merrill
c803fa6855
MDL-49298 backup: Make tgz file format standard for backups
2015-03-05 10:07:58 -05:00
Frederic Massart
7a79030f48
MDL-23296 repository_local: Implementing search through server files
2015-03-05 13:41:47 +01:00
Tim Hunt
9c75f8dc44
MDL-49366 questions: avoid PHP notices from bad pluginfile URLs
2015-03-05 12:18:20 +00:00
Marina Glancy
a1ec48c9e8
MDL-45619 repository: corrections to uninstall, display link
2015-03-04 18:42:16 -05:00
David Monllao
bdc83277a3
MDL-49371 core_message: Unused method deprecation
2015-03-04 09:36:22 +08:00
Andrew Nicols
4b38a19aec
Merge branch 'MDL-49164_old_rego' of https://github.com/andyjdavis/moodle
2015-03-04 08:57:00 +08:00
Andrew Davis
858e92fefe
MDL-49164 admin: removed unused registration config setting
2015-03-04 08:50:39 +08:00
Stephen Bourget
f31f5f6659
MDL-45619 Repository: Allow repositories to be uninstalled
2015-03-03 14:44:53 -05:00
Dan Poltawski
e2d8685247
Merge branch 'MDL-49335' of git://github.com/timhunt/moodle
2015-03-03 14:46:34 +00:00
Dan Poltawski
2076324e7d
Merge branch 'MDL-49334' of git://github.com/timhunt/moodle
2015-03-03 13:25:33 +00:00
Dan Poltawski
f7681b5181
Merge branch 'MDL-47000-master' of git://github.com/merrill-oakland/moodle
2015-03-03 13:21:30 +00:00
Tim Hunt
92caa214ef
MDL-49335 Behat: new question selector
...
So you can say things like
And I click on "True" "radio" in the "First question" "question"
2015-03-03 11:19:48 +00:00
Tim Hunt
f70fbc05e1
MDL-49334 behat: sort selector lists
2015-03-03 11:13:31 +00:00
Eloy Lafuente (stronk7)
6d46e3a4f7
Merge branch 'MDL-45621_m29v3' of git://github.com/sbourget/moodle
2015-03-03 10:54:30 +01:00
Andrew Nicols
962d7359a3
Merge branch 'MDL-49234_master' of git://github.com/crazyserver/moodle
2015-03-03 15:12:29 +08:00
Andrew Nicols
5b0f2ad976
Merge branch 'MDL-49284' of git://github.com/timhunt/moodle
2015-03-03 13:40:53 +08:00
Eloy Lafuente (stronk7)
8d9bdd28e0
MDL-49087 mdeploy: now relying on config.php documented
2015-03-03 02:45:44 +01:00
Stephen Bourget
fad20e3c82
MDL-45621 Portfolio: Allow portfolios to be uninstalled
2015-03-02 20:20:10 -05:00
Eloy Lafuente (stronk7)
e24066ff85
Merge branch 'MDL-37470' of https://github.com/mike-grant/moodle
2015-03-03 01:43:47 +01:00