4200 Commits

Author SHA1 Message Date
Frederic Massart
0a94e4a928 MDL-38563 navigation: Removed extra parameters when calling add() 2013-03-22 14:40:12 +08:00
Damyon Wiese
c2eb74df47 Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/db/caches.php
	version.php
2013-03-20 14:08:55 +08:00
Eloy Lafuente (stronk7)
6a32219c84 Merge branch 'w12_MDL-38364_m25_phpunitloading' of git://github.com/skodak/moodle 2013-03-20 00:17:35 +01:00
Eloy Lafuente (stronk7)
58b9cd031f Merge branch 'MDL-38497-admintree-beforesibling' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/upgrade.txt
2013-03-19 17:16:32 +01:00
Damyon Wiese
db98fa786e Merge branch 'wip-mdl-36395-m' of git://github.com/rajeshtaneja/moodle
Conflicts:
	version.php
2013-03-19 15:18:13 +08:00
Petr Škoda
94388d18ca MDL-38364 rework PHPUnit autoloading
This is related to BC incompatibility introduced in https://github.com/sebastianbergmann/phpunit/issues/848
2013-03-17 19:54:55 +01:00
David Mudrák
56aee7c2f6 MDL-38497 Fix invalid $ADMIN->add() calls
As the admin_category::add() method now checks for the third parameter,
couple of typos were detected in the code. Additional parameters passed
to the add() method were probably a mistake, a relict or a typo.

Note that the typo in admin/tool/unsuproles/settings.php had actually
significant impact on the functionality as the array with required
capabilities was not actually passed to the admin_externalpage
constructor as intended.
2013-03-15 01:00:29 +01:00
Eloy Lafuente (stronk7)
2472cdd305 Merge branch 'wip-mdl-38332' of git://github.com/rajeshtaneja/moodle 2013-03-12 22:50:32 +01:00
Rajesh Taneja
9a51c3d95c MDL-36395: Converted hard-coded MAX_USER_PER_PAGE to config setting
course, cohort, enrol, role, groups and forum used to use hard-coded
MAX_USERS_PER_PAGE=100 for rendering user list. This has been converted
to $CFG->maxusersperpage.
2013-03-12 17:14:53 +08:00
Damyon Wiese
61cd50618a Merge branch 'MDL-38184_master' of git://github.com/dmonllao/moodle 2013-03-12 16:35:19 +08:00
Eloy Lafuente (stronk7)
8aa0a1423b Merge branch 'MDL-38307_master' of git://github.com/dmonllao/moodle 2013-03-12 00:50:50 +01:00
Eloy Lafuente (stronk7)
8ed6ee97a6 Merge branch 'MDL-38346_master' of git://github.com/dmonllao/moodle 2013-03-12 00:43:38 +01:00
Eloy Lafuente (stronk7)
e314a6436e Merge branch 'wip-mdl-38382' of git://github.com/rajeshtaneja/moodle 2013-03-12 00:38:37 +01:00
David Mudrák
ad3ed98b05 MDL-34401 Replace ad-hoc plugin request caches with proper application caches
Data cached in these caches change only at well defined places (during
need for upgrade checks, at the plugin management screen etc). So it
makes sense to use proper application caches instead of request caches.

This saves couple of database queries at almost every page in Moodle.
2013-03-11 12:48:53 +01:00
David Monllao
37652a9cb9 MDL-38352 behat: Updating tests
According to non-escaped double quotes
in TableNodes. Also refactoring previous
test affected by the issue.
2013-03-11 12:52:13 +08:00
David Monllao
bceb65ee2d MDL-38307 behat: Remove notices 2013-03-08 12:29:59 +08:00
David Monllao
bd21f796cb MDL-38184 behat: Tests for filepicker steps 2013-03-08 11:57:54 +08:00
Rajesh Taneja
4e0b615ede MDL-38332 Users: Browse list of users should not contain guest user record 2013-03-08 11:44:42 +08:00
Rajesh Taneja
c22a579bed MDL-38382: Update will show minor number with leading zeros (if any) 2013-03-08 10:14:02 +08:00
Frederic Massart
ac5fc59534 MDL-37852 repository: Admins can't access user instances settings 2013-03-07 16:37:43 +08:00
David Monllao
5ecb87a9a2 MDL-38352 behat: Updating tests
According to latest language strings
changes
2013-03-07 13:56:49 +08:00
Eloy Lafuente (stronk7)
641577eb32 Merge branch 'MDL-38352-en_fix' of git://github.com/mudrd8mz/moodle 2013-03-06 17:26:37 +01:00
Helen Foster
ca084ef149 MDL-38352 Merge English strings from the en_fix language pack 2013-03-06 16:44:39 +01:00
Eloy Lafuente (stronk7)
88906d068d Merge branch 'MDL-37958_master' of git://github.com/dmonllao/moodle 2013-03-05 19:28:14 +01:00
David Monllao
6fe3986dec MDL-38007 behat: Refining error texts
Also removing a couple of silly notices
2013-03-05 16:52:48 +08:00
Damyon Wiese
d0eac6f639 Merge branch 'MDL-38178_master' of git://github.com/dmonllao/moodle 2013-03-05 15:10:52 +08:00
Aparup Banerjee
c0da001c49 Merge branch 'MDL-38025_master' of git://github.com/dmonllao/moodle 2013-03-05 14:43:46 +08:00
David Monllao
2b6287b744 MDL-38178 behat: New tests for fieldsets expansion 2013-03-05 14:41:54 +08:00
Aparup Banerjee
212e5ee909 Merge branch 'MDL-38007_master' of git://github.com/dmonllao/moodle 2013-03-05 14:37:05 +08:00
Aparup Banerjee
d1e220eb0e Merge branch 'MDL-36171-m' of git://github.com/andrewnicols/moodle 2013-03-05 11:13:33 +08:00
Sam Hemelryk
f87ce4e9a0 MDL-32975 navigation: Added option to select how my courses are sorted 2013-03-05 09:46:11 +13:00
David Monllao
d636a3e6cd MDL-38026 behat: New tests 2013-03-01 17:34:39 +08:00
David Monllao
46ac40cd0b MDL-38025 behat: Compliant with moodlechecker and codechecker 2013-03-01 16:07:04 +08:00
David Monllao
80e4150615 MDL-38025 behat: Updating tests according to modified steps 2013-03-01 16:06:23 +08:00
David Monllao
4092397794 MDL-38025 behat: Adding generic manipulation methods
Also required modifications in the affected
steps definitions
2013-03-01 16:06:15 +08:00
David Monllao
5f470b28bf MDL-38025 behat: Replacing selector-based steps by human-friendly options 2013-03-01 15:24:37 +08:00
David Monllao
ac41f878da MDL-38007 behat: Adding new script using util.php 2013-03-01 10:50:22 +08:00
David Monllao
fa7e4e2b6a MDL-38007 behat: Changing check_behat_setup interface 2013-03-01 10:44:31 +08:00
David Monllao
b9d551e17d MDL-37958 behat: Tests for permissions management 2013-03-01 09:52:10 +08:00
Andrew Robert Nicols
08b196e265 MDL-36171 Administration Skip replace in the log table 2013-02-28 19:44:42 +00:00
Dan Poltawski
7e94bdcca1 Merge branch 'MDL-38009_master' of git://github.com/dmonllao/moodle 2013-02-19 11:34:07 +08:00
David Monllao
ee7447a9f4 MDL-37858 behat: Testing the step arguments replacements 2013-02-15 13:38:14 +08:00
David Monllao
a3b4d42b45 MDL-38009 behat: Reset cachedir and tempdir 2013-02-14 16:28:05 +08:00
Damyon Wiese
6e59159387 Merge branch 'MDL-37750_master-add-seconds' of git://github.com/dmonllao/moodle 2013-02-13 15:04:51 +08:00
David Monllao
cd65dc3220 MDL-37750 behat: More time for AJAX-related actions
When we want to assert against data coming
from an AJAX request with 1 second we don't
have enough time to ensure the elements are
loaded
2013-02-13 13:19:56 +08:00
Damyon Wiese
147f592742 Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle
Conflicts:
	course/tests/behat/add_activities.feature
2013-02-12 14:48:40 +08:00
Dan Poltawski
08eef1a4bd Merge branch 'MDL-37886_master' of git://github.com/dmonllao/moodle 2013-02-12 09:43:50 +08:00
Eloy Lafuente (stronk7)
ce9c323635 Merge branch 'MDL-37686-master' of git://github.com/FMCorz/moodle 2013-02-12 01:16:48 +01:00
Damyon Wiese
1e7db9fee8 Merge branch 'master_MDL-35332' of git://github.com/totara/moodle
Conflicts:
	lib/tests/moodlelib_test.php
	version.php
2013-02-11 14:51:11 +08:00
Andrew Davis
c90e6b4644 MDL-36091 added debugging() calls in blocks of code marked as "should never happen" 2013-02-11 13:24:52 +08:00