moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59049 commits 37 branches 540 tags 1.3 GiB
Commit graph

59049 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
96b997d759 Merge branch 'MDL-37533-master' of git://github.com/damyon/moodle 2013-01-29 15:35:05 +01:00
Eloy Lafuente (stronk7)
38e4fa58d5 MDL-37101 donot use donot. 2013-01-29 15:24:59 +01:00
Eloy Lafuente (stronk7)
0ed03cc295 Merge branch 'MDL-37101-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	calendar/tests/externallib_tests.php
 2013-01-29 15:19:11 +01:00
Eloy Lafuente (stronk7)
6155915ffb Merge branch 'wip-MDL-36363-m25' of https://github.com/samhemelryk/moodle 2013-01-29 12:06:33 +01:00
David Monllao
fe856690cb MDL-37662 behat: Add blocks definition 2013-01-29 18:21:08 +08:00
David Monllao
d780452472 MDL-37661 behat: Test to add activities to courses 2013-01-29 18:19:04 +08:00
David Monllao
a1990e50e8 MDL-37661 behat: Add activities to courses 2013-01-29 18:18:57 +08:00
David Monllao
bedc20aa96 MDL-37659 behat: Adding tests for the data generators 2013-01-29 17:25:43 +08:00
David Monllao
f0200d1462 MDL-37659 behat: Adding data generator definition 2013-01-29 17:25:25 +08:00
David Monllao
87bb583cbc MDL-37659 testing: New data generators 
- Grouping groups
- Group members
 2013-01-29 17:25:02 +08:00
Damyon Wiese
3e1b63f1c8 MDL-37710 Assign: Fix pluginfile permission checks for student viewing their own team submission. 
This change adds a function to the assign class to allow the permissions for a group submission
to be checked and updates all the submission plugins to call it.
 2013-01-29 17:14:36 +08:00
Petr Škoda
dd8a39a881 MDL-37734 add one more recordset isolation test 2013-01-29 10:10:40 +01:00
Petr Škoda
0363b7826b MDL-37734 use prefetching workaround for MARS transaction problems 2013-01-29 10:10:09 +01:00
Dan Poltawski
2a090a1581 Merge branch 'wip-mdl-34190' of git://github.com/rajeshtaneja/moodle 2013-01-29 16:53:49 +08:00
Dan Poltawski
cbb26eb0ec Merge branch 'MDL-37600' of git://github.com/timhunt/moodle 2013-01-29 16:49:58 +08:00
Aparup Banerjee
37c68301f9 Merge branch 'w04_MDL-37499_m25_authldaptest' of git://github.com/skodak/moodle 2013-01-29 16:33:37 +08:00
Dan Poltawski
0fed6554f9 Merge branch 'MDL-33105' of https://github.com/ppichet/moodle 2013-01-29 16:31:50 +08:00
Dan Poltawski
cc0ee3c4f3 Merge branch 'MDL-29691' of https://github.com/ppichet/moodle 2013-01-29 16:30:00 +08:00
David Monllao
c7369f79a3 MDL-37657 behat: Adding acceptance tests to the acceptance test tool 2013-01-29 15:31:26 +08:00
David Monllao
23ebc481e7 MDL-37657 behat: Adding definitions related with forms 2013-01-29 15:31:26 +08:00
David Monllao
b1bc8cfc65 MDL-37657 behat: Add tree nodes expansion definition 2013-01-29 15:31:25 +08:00
David Monllao
0a56fc6976 MDL-37657 behat: Simple log in/out steps with test 2013-01-29 15:31:25 +08:00
David Monllao
786ea937cc MDL-37657 behat: General steps definitions 2013-01-29 15:31:25 +08:00
Dan Poltawski
4653ecd3b3 Merge branch 'MDL-37046_master' of git://github.com/dmonllao/moodle 2013-01-29 15:07:48 +08:00
David Monllao
33063f2eb5 MDL-37046 behat: Quick fix 
Provides feedback when trying to use the web interface
to list steps definitions when $CFG->behat_dataroot hasn't
been set or can not be written
 2013-01-29 14:46:41 +08:00
Damyon Wiese
6792b8f5d3 MDL-37646 Assign: Quickgrading fix when using grading filters or lots of students. 2013-01-29 14:36:18 +08:00
Dan Poltawski
10b8d16deb Merge branch 'MDL-37656_master' of git://github.com/dmonllao/moodle 2013-01-29 13:46:26 +08:00
Dan Poltawski
e0f755035b Merge branch 'MDL-37046_master' of git://github.com/dmonllao/moodle 2013-01-29 13:25:13 +08:00
David Monllao
f5ceb6c233 MDL-37656 behat: Adding hooks 
At suite, scenario and step levels
 2013-01-29 12:57:03 +08:00
David Monllao
d4322e3859 MDL-37656 behat: Base empty class 2013-01-29 12:57:03 +08:00
David Monllao
ec017a3460 MDL-37046 behat: Skip unit test if behat is not installed 2013-01-29 12:54:48 +08:00
Dan Poltawski
68aaba6c84 Merge branch 'MDL-37046_master' of git://github.com/dmonllao/moodle 2013-01-29 12:03:10 +08:00
David Monllao
475ac3f8ee MDL-37046 behat: Changes from integration review 
* RTL languages problem solved
* Fixed curl errno return
* Switch to behat test environment code more readable
 2013-01-29 11:56:42 +08:00
Dan Poltawski
5d80fc80c0 Merge branch 'MDL-37694' of git://github.com/timhunt/moodle 2013-01-29 11:54:36 +08:00
Dan Poltawski
5774879060 Merge branch 'wip-MDL-37615-m25' of git://github.com/samhemelryk/moodle 2013-01-29 11:47:17 +08:00
Dan Poltawski
c2f1837e5d Merge branch 'wip-MDL-25630_master' of git://github.com/lazydaisy/moodle 2013-01-29 11:23:12 +08:00
Sam Hemelryk
da810f5816 Merge branch 'MDL-37476-master' of git://github.com/mouneyrac/moodle 2013-01-29 15:24:06 +13:00
Paul Nicholls
606554d5b0 MDL-32652 - Make block drag-drop work throughout Moodle 
The central "content" region on My Home / user profile pages also needs to
be initialised in lib/ajax/blocks.php in order to allow blocks to be
dropped into that region successfully.  Some tweaks were also necessary in
order to correct the "content" region's structure in order for drag-drop
to function on this region on these pages.

Non-standard block regions (including the central "content" region
used by My Home and user profile pages) were causing the temporary empty
block region used as a drop target to sometimes appear in the wrong place.

The call to init_requirements_data (which includes the block drag-drop JS)
happens at a late enough stage in page generation that we can simply
pass the context ID through to the JS, so that it can be sent as part of
the AJAX request.  This prevents lib/ajax/blocks.php from having to try
to guess the context from the other bits of information it receives, so
block drag-drop should now work everywhere without issues.
 2013-01-29 14:57:28 +13:00
Sam Hemelryk
ab58c6b724 Merge branch 'w04_MDL-37716_m25_enrolexpiry' of git://github.com/skodak/moodle 2013-01-29 14:56:57 +13:00
David Monllao
096858ed83 MDL-37046 behat: Use behat test env 
Moving from phpunit test environment
to a specific behat test environment
 2013-01-29 08:40:38 +08:00
David Monllao
b5c130092b MDL-37046 behat: Split in different classes 2013-01-29 08:40:38 +08:00
David Monllao
9516712114 MDL-37046 behat: Coding standards compliant 2013-01-29 08:40:38 +08:00
David Monllao
ff2ec29bb1 MDL-37046 behat: Added to standard plugins list 2013-01-29 08:40:38 +08:00
David Monllao
0922ef8789 MDL-37046 behat: Windows compatibility 2013-01-29 08:40:38 +08:00
David Monllao
1c36cb2a9c MDL-37046 behat: Only composer.json 2013-01-29 08:40:37 +08:00
David Monllao
5347dae079 MDL-37046 behat: Adding empty Behat config file 
This empty behat config file allows behat CLI
command to run before test environment has been set
 2013-01-29 08:40:37 +08:00
David Monllao
bd770617a9 MDL-37046 behat: New setting to switch completely to test env. 2013-01-29 08:40:37 +08:00
David Monllao
f2f66ea4af MDL-37046 behat: Some unit tests 2013-01-29 08:40:37 +08:00
David Monllao
d6abac76ca MDL-37046 behat: Allow default config overrides 2013-01-29 08:40:37 +08:00
David Monllao
0b5f481bf5 MDL-37046 behat: Externalizations 
Instead of starting the PHP web server and calling
behat as a passthru we maintain them as standalone
 2013-01-29 08:40:37 +08:00