Commit graph

1930 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
3c2e7a0e7c Merge branch 'MDL-34472-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	lib/upgrade.txt
2013-07-02 14:09:11 +02:00
Damyon Wiese
f48f4827d1 Merge branch 'w27_MDL-40299_m26_textlib' of https://github.com/skodak/moodle 2013-07-02 15:23:38 +08:00
Ankit Agarwal
bfb99cc619 MDL-34472 phpunit: Make sure a debugging is thrown when get_context_instance() is called 2013-07-02 15:09:01 +08:00
Damyon Wiese
a57885a651 Merge branch 'w27_MDL-26943_m26_localsubplugins' of https://github.com/skodak/moodle 2013-07-02 11:00:33 +08:00
Dan Poltawski
91d445db9a Merge branch 'wip-MDL-39212-m26' of git://github.com/samhemelryk/moodle 2013-07-01 11:55:45 +08:00
Petr Škoda
3601c5f09c MDL-26943 implement subplugin support for local plugins 2013-06-30 09:18:35 +02:00
David Mudrák
a7182af94a MDL-35206 Fix the links list enumeration in the html2text library 2013-06-28 13:10:10 +02:00
Sam Hemelryk
1eb2b51703 MDL-39212 css: we now chunk and no longer separate 2013-06-28 16:49:02 +12:00
Petr Škoda
d534708fd3 MDL-40299 textlib conversion to core_text and core_collator 2013-06-27 22:18:57 +02:00
David Monllao
d0a9a29bd0 MDL-40246 mod_forum: Changing scenario to non-JS
Also replacing hardcoded waits for a
wait to be redirected.
2013-06-27 14:24:00 +08:00
Petr Škoda
5e72efd498 MDL-17081 add role export/import
This includes improved role creation, allowed roles are editable and other improvements.
2013-06-24 12:40:59 +02:00
Dan Poltawski
846f6fbe00 MDL-33955 filelib: accept any HTTP 1.0 in tests
This is common with proxies like squid which don't support http
pipelining.
2013-06-19 14:55:35 +08:00
Sam Hemelryk
9d109ad60d Merge branch 'w25_MDL-33955_m26_curlredir' of git://github.com/skodak/moodle 2013-06-19 09:13:30 +12:00
Petr Škoda
402a974e5e MDL-39854 fix get_list_of_plugins() test 2013-06-18 11:46:44 +02:00
Petr Škoda
9e19a0f08b MDL-39854 reimplement Frankenstyle support and enable classloader
Better performance, more reliable, completely self contained,
more validation and full backwards compatibility.

This will also allow us to implement ignoring of plugins.
2013-06-18 09:10:07 +02:00
Marina Glancy
da107ae428 Merge branch 'MDL-40207-master' of git://github.com/danpoltawski/moodle 2013-06-18 15:36:42 +10:00
Sam Hemelryk
07cfd5e599 Merge branch 'MDL-39152-master' of git://github.com/ankitagarwal/moodle 2013-06-18 15:34:30 +12:00
Ankit Agarwal
5b23d9adac MDL-39152 webservices: Rename external_api::get_context() to external_api::get_context_from_params() 2013-06-17 15:18:49 +08:00
Dan Poltawski
f1da132271 MDL-40207 simplepie: reduce false failures in unit tests
The simplepie tests time out too quickly due to a low connect timeout,
to fix this:

* Introduced a way to set the timeout during intitial construction
* Converted the unit tests to use a high timeout value
2013-06-17 10:32:25 +08:00
David Monllao
051e9663f0 MDL-39634 behat: Removing unused arguments
Also adding deprecated methods.
2013-06-14 16:14:04 +08:00
Ankit Agarwal
aac70ffc18 MDL-39152 webservices: Abstract context fetching
Since many apis in future will need to provide alternative method to fetch context, I have abstracted this bit into the core external_api class
2013-06-14 15:47:48 +08:00
Petr Škoda
35ea5db031 MDL-33955 add file download and curl unit tests 2013-06-14 08:03:50 +02:00
Sam Hemelryk
10c98b64e6 Merge branch 'MDL-39454-master' of git://github.com/sammarshallou/moodle 2013-06-11 12:26:55 +12:00
Petr Škoda
66056f994f MDL-39096 fix obfuscate_text() utf-8 compatibility 2013-06-07 22:38:48 +02:00
Eloy Lafuente (stronk7)
79452da1c8 Merge branch 'MDL-39723-master' of git://github.com/sammarshallou/moodle 2013-06-04 17:47:45 +02:00
Dan Poltawski
7f639dd352 Merge branch 'MDL-39536-master' of git://github.com/FMCorz/moodle 2013-06-04 13:18:49 +08:00
Frederic Massart
1530fe2192 MDL-39536 completion: Unit tests for get_activities and has_activities 2013-06-04 12:57:13 +08:00
Eloy Lafuente (stronk7)
b50ddbdbd5 Merge branch 'wip-MDL-39801-master' of git://github.com/marinaglancy/moodle 2013-06-04 01:51:10 +02:00
Eloy Lafuente (stronk7)
d13d3f2d31 MDL-39465 Show env. info instead of part twice. 2013-06-04 00:50:15 +02:00
Petr Škoda
7dc1feaa99 MDL-39465 detect environment problems in tests
This should help explain why something else fails.
2013-05-31 22:02:34 +02:00
Marina Glancy
5150c30203 MDL-39801 navigation_node::remove does not allow to insert nodes afterwards 2013-05-31 11:49:34 +10:00
Marina Glancy
e3b11a6e2b MDL-39801 navigation_node::remove fails if first child does not have a key 2013-05-31 11:49:12 +10:00
Eloy Lafuente (stronk7)
aeb5f9ae37 Merge branch 'w22_MDL-39676_m26_whereparam' of git://github.com/skodak/moodle 2013-05-28 15:31:07 +02:00
sam marshall
a260245739 MDL-39723 Remove unnecessary queries for COURSE, SITE 2013-05-28 13:14:55 +01:00
Damyon Wiese
e750fcc4da Merge branch 'MDL-39702_master' of git://github.com/dmonllao/moodle
Conflicts:
	lib/testing/generator/repository_generator.php
2013-05-28 11:13:43 +08:00
Eloy Lafuente (stronk7)
cc4cbf67f0 Merge branch 'MDL-39795_master' of git://github.com/dmonllao/moodle 2013-05-28 00:02:58 +02:00
Damyon Wiese
e6302a3c75 Merge branch 'MDL-39686_master' of git://github.com/dmonllao/moodle 2013-05-27 16:29:00 +08:00
David Monllao
41eb672ba4 MDL-39686 behat: Add option to restart the browser 2013-05-27 15:03:25 +08:00
David Monllao
c29e3e248f MDL-39702 generators: Adding MOODLE_INTERNAL
As discussed generators should include MOODLE_INTERNAL
as they make use of CFG and they don't make sense without
requiring config.php.
2013-05-27 14:52:53 +08:00
David Monllao
9a1f4922bd MDL-39795 behat: Improving find-texts-in-page-contents performance 2013-05-27 14:24:20 +08:00
Dan Poltawski
87787191e4 Merge branch 'MDL-38239-master' of git://github.com/StudiUM/moodle 2013-05-27 14:04:04 +08:00
Petr Škoda
5ce443a1b1 MDL-39676 improve get_role_users() unit tests 2013-05-25 10:09:42 +02:00
Gilles-Philippe Leblanc
d381fb7776 MDL-38239 gradebook: Importing grades from a .txt file with commas for decimals causes an error 2013-05-21 14:15:26 -04:00
Eloy Lafuente (stronk7)
388b7d7d98 Merge branch 'MDL-39638_master' of git://github.com/dmonllao/moodle 2013-05-21 00:59:42 +02:00
Eloy Lafuente (stronk7)
5e1a48df97 Merge branch 'MDL-39717_master' of git://github.com/dmonllao/moodle 2013-05-21 00:44:05 +02:00
David Monllao
7daab4016d MDL-39717 behat: Add info to experimental steps definitions
JS modal dialogs and drag & drop should be
considered experimental as the steps are not
working as expected in all OS/browser combinations.
2013-05-17 11:23:05 +08:00
David Monllao
c4509f8084 MDL-39638 behat: New step to collapse nodes based on the expand nodes
Also updating steps with a collapse behaviour.
2013-05-16 12:43:54 +08:00
David Monllao
870349ee67 MDL-39528 behat: Avoid modal window suite failure
Catching JS alerts/confirms exceptions and
auto-accepting them before each test run to
avoid chained scenarios failures.
2013-05-16 10:11:40 +08:00
Frederic Massart
188c04b0a8 MDL-39579 form: Type can be set on repeated elements in a group 2013-05-10 12:05:43 +08:00
Eloy Lafuente (stronk7)
da2cff35c5 Merge branch 'MDL-38885-master-int' of git://github.com/FMCorz/moodle 2013-05-10 03:16:09 +02:00