593 Commits

Author SHA1 Message Date
Helen Foster
fcca760ae7 MDL-44425 Merge English strings from the en_fix language pack 2014-03-05 13:29:32 +01:00
Damyon Wiese
309ae8921f MDL-25499: Centralise management of all types of cron tasks
Centralise management of all types of cron tasks with registration, scheduling,
parallel task conflicts(blocking) and running once off tasks, all using an
administration screen.

This is a combination of several issues:

MDL-25502: Added "black magic" task allocator for cron
MDL-25503: Add step to cron to run all scheduled tasks
MDL-25504 cron: Refactor to use scheduler
MDL-25505: Add an admin interface to schedule tasks via cron.
MDL-25507: Add support for adhoc tasks.
2014-02-26 12:03:46 +08:00
Damyon Wiese
494afb8180 Merge branch '44315-27' of git://github.com/samhemelryk/moodle 2014-02-25 11:09:53 +08:00
Sam Hemelryk
2ef8ff9e05 MDL-44315 phpdoc: fixed up typos and made up tags 2014-02-24 09:13:31 +13:00
David Monllao
702851c071 MDL-44108 behat: Adding a roles data generator 2014-02-21 13:25:44 +08:00
Damyon Wiese
6071a209fe Merge branch 'MDL-44118_2' of git://github.com/timhunt/moodle
Conflicts:
	version.php
2014-02-19 09:08:42 +08:00
Tim Hunt
4e8a07d28b MDL-44118 remove the qeupgradehelper tool
and associated code that was only used by it.
2014-02-18 11:55:21 +00:00
Sam Hemelryk
1f6ba1809d MDL-44104 admin, grade: fixed use of @params 2014-02-16 12:14:30 +13:00
David Monllao
7e3f5e79d0 MDL-43450 behat: Checking the ->behat_* vars contents before showing the steps list 2014-01-29 14:28:37 +08:00
David Monllao
b8c4d91ca0 MDL-43450 behat: Improving error messages 2014-01-24 16:45:27 +08:00
Dan Poltawski
1f931e2928 Merge branch 'MDL-43670' of git://github.com/timhunt/moodle 2014-01-21 11:25:38 +08:00
Tim Hunt
dc4a3ea1ee MDL-43670 quiz_question_instances to match coding guidelines.
Some columns needed to be renamed:
* quiz     -> quizid
* question -> questionid
* grade    -> maxmark

Then all the places that refer to those needed to be fixed.
2014-01-17 10:56:07 +00:00
David Monllao
561e9bb92e MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert 2014-01-17 10:41:37 +08:00
David Monllao
81ad5438c7 MDL-43480 behat: Removing @_only_local tags from steps where it is not necessary 2014-01-17 10:41:37 +08:00
Damyon Wiese
7508094a87 Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle 2014-01-15 09:39:03 +08:00
David Monllao
19a40b1468 MDL-43461 behat: Using linux-style directory separators when using cygwin 2014-01-14 13:10:40 +08:00
Eloy Lafuente (stronk7)
577432283c Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle 2014-01-10 10:08:34 +01:00
Helen Foster
480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Eloy Lafuente (stronk7)
45f6a8340b Merge branch 'm27_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle 2014-01-08 00:45:51 +01:00
Petr Škoda
3e5226ab6e MDL-43528 remove all traces of magic quotes hacking from moodle core 2014-01-02 10:15:06 +08:00
Matteo Scaramuccia
7a66ddb63b MDL-43508 Quiz Invalid get_string() identifier. 2013-12-28 11:12:29 +01:00
Petr Skoda
9bb80d2005 MDL-43213 fix init regression and remove $checkphp parameter 2013-12-19 13:11:25 +08:00
Petr Škoda
60129d5d1f MDL-43213 try to simplify behat config and init code
1/ always require 3 behat settings - $CFG->behat_wwwroot, $CFG->behat_dataroot and $CFG->behat_prefix
2/ cleanup init code
3/ do not require $CFG->wwwroot and $CFG->dataroot on test sites
4/ remove switch completely - the most confusing part for me
5/ print out behat_wwwwroot in init script so that you can test the test site manually
2013-12-13 14:03:04 +08:00
Eloy Lafuente (stronk7)
ebc77165a4 Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle 2013-12-10 23:29:06 +01:00
Sam Hemelryk
3f35f367cb Merge branch 'w50_MDL-31625_m27_replace' of https://github.com/skodak/moodle 2013-12-11 10:50:07 +13:00
David Monllao
333db2e9b9 MDL-42625 behat: Editing .feature files 2013-12-06 12:13:39 +08:00
David Monllao
5d2b67228c MDL-41030 behat: Dock blocks compatible with both selenium and phantomjs 2013-12-06 12:13:39 +08:00
Petr Škoda
6c3ae510f1 MDL-31625 fix multiple global search-replace issues
Includes following fixes:
* support for MS SQL Server
* optional trimming of of oversized VARCHAR fields
* conversion to forms library
* full localisation
* other cleanup
2013-12-06 09:51:49 +08:00
Marina Glancy
07622451a3 MDL-42174 behat: deprecate upload file to filepicker step in favour of filemanager 2013-12-05 21:00:25 +11:00
David Monllao
a9c32ee29e MDL-41592 behat: Setting a default value for CFG->behat_wwwroot in case it is empty 2013-12-05 17:06:02 +13:00
Sam Hemelryk
5d288a5dbb Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle 2013-12-04 11:52:12 +13:00
Eloy Lafuente (stronk7)
e7b3306a69 Merge branch 'MDL-42885_master' of https://github.com/markn86/moodle 2013-12-03 10:01:19 +01:00
Damyon Wiese
a5ec4f7ae9 Merge branch 'wip-MDL-43026-master' of git://github.com/marinaglancy/moodle 2013-12-03 16:11:48 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
David Monllao
677b2e79f1 MDL-41592 general: Also checking the site path 2013-12-02 14:18:10 +08:00
David Monllao
7f7a91e4ce MDL-41592 behat: Config settings more flexible
Adding the option to just set ->behat_wwwroot to
allow switching to the behat test site.
2013-12-02 14:18:10 +08:00
Marina Glancy
dd47f2107f MDL-43026 behat: add tests for all available module generators 2013-11-29 17:24:12 +11:00
Mark Nelson
275d958e62 MDL-42885 tool_uploaduser: removed misleading debugging message 2013-11-26 21:26:03 -08:00
Dan Poltawski
ab47c758d1 MDL-42942 behat: increment version 2013-11-27 11:33:11 +08:00
Dan Poltawski
2bc34d6528 Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle 2013-11-26 14:52:21 +08:00
David Monllao
5df9e40cec MDL-40741 behat: Changing xpaths for clean theme
Keeps compatibility with standard theme.
2013-11-26 11:41:13 +08:00
Dan Poltawski
a136e16c8e Merge branch 'MDL-42547_master' of https://github.com/markn86/moodle 2013-11-25 10:37:33 +08:00
Mark Nelson
7ca44a4963 MDL-42547 tool_uploaduser: trim values before uploading users 2013-11-18 20:07:01 -08:00
Sam Hemelryk
496692fb9d Merge branch 'wip-MDL-42850-master' of git://github.com/abgreeve/moodle 2013-11-19 14:19:20 +13:00
Sam Hemelryk
40dca7e4d6 Merge branch 'MDL-41316-master' of git://github.com/ankitagarwal/moodle 2013-11-19 12:28:08 +13:00
Sam Hemelryk
074e5686db Merge branch 'MDL-42863' of git://github.com/timhunt/moodle 2013-11-19 12:03:41 +13:00
Sam Hemelryk
04fcb4a96c Merge branch 'MDL-42865' of git://github.com/timhunt/moodle 2013-11-19 11:50:44 +13:00
Damyon Wiese
ef16df1449 Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle 2013-11-18 16:08:57 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Adrian Greeve
a2071fbf7c MDL-42850 administration: Updated bulk user upload errors to be more descriptive. 2013-11-18 11:36:16 +08:00