mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 17:40:26 +01:00
Code Issues Projects Releases Wiki Activity
58,917 Commits 36 Branches 527 Tags
c1b75ece94
Commit Graph

58917 Commits

Author SHA1 Message Date
Andrew Robert Nicols
c1b75ece94 MDL-37566 AJAX Only set max-height for chooser dialogues 
If we set height as well as max-height then there is a potential for
whitespace to be shown at the bottom of the list of choices.

This commit stops removing the height option so that we only rely upon
max-height for dialogue heigh calculation.
 2013-02-01 11:21:47 +00:00
Eloy Lafuente (stronk7)
1918a2452e weekly release 2.5dev 2013-01-31 10:59:41 +01:00
Dan Poltawski
3895cdc2b7 Merge branch 'MDL-37789_master' of git://github.com/dmonllao/moodle 2013-01-31 15:34:46 +08:00
David Monllao
6b1a8fc5dd MDL-37789 behat: Fixing unit test in windows 
The directory separator was specified with
the slash character which is not good when
running the tests on windows
 2013-01-31 15:26:08 +08:00
Dan Poltawski
12f756f9d7 Revert "MDL-37613 mod: changed generalbox class in table to generaltable class in mod/feedback (2 files);mod/glossary (3 files);mod/wiki (1 file)." 
This reverts commit 0434dd24820e8c89e7f03d01c797ca65d211121a.
 2013-01-31 15:02:12 +08:00
Dan Poltawski
8d81f4f4cc Revert "MDL-33105 flexible apply_units() function" 
This reverts commit c2ba17858c1994d9654a5ca64cb9fb22780654c1.
 2013-01-31 10:17:16 +08:00
Dan Poltawski
2c8d31cd72 Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle 2013-01-31 10:14:46 +08:00
Sam Hemelryk
956d3544f0 MDL-36363 cache: added unit tests for muliple loaders 2013-01-31 12:16:08 +13:00
Dan Marsden
220e5b5216 MDL-34231 SCORM: calculate correct number of attemptsleft when entering an attempt. 2013-01-31 10:45:11 +13:00
Sam Hemelryk
3aee2fb8ee MDL-36363 cache: fixed issue with double parsing keys for stacked loaders 2013-01-31 09:10:57 +13:00
Eloy Lafuente (stronk7)
f97db01978 Merge branch 'wip-MDL-37644-m25' of git://github.com/samhemelryk/moodle 2013-01-30 10:27:11 +01:00
Dan Poltawski
7543705d9b Merge branch 'w04_MDL-37726_m25_prevnext_int' of git://github.com/skodak/moodle 2013-01-30 09:18:57 +08:00
Eloy Lafuente (stronk7)
fb44a5db6f Merge branch 'w04_MDL-37734_m25_marshack' of git://github.com/skodak/moodle 2013-01-30 01:11:20 +01:00
Eloy Lafuente (stronk7)
6ca12c1cc1 Merge branch 'w04_MDL-37767_m25_pgsocket' of git://github.com/skodak/moodle 2013-01-30 00:51:01 +01:00
Petr Škoda
47bf916773 MDL-37767 allow empty host in enrol_database which is required for default pg socket 2013-01-30 00:40:03 +01:00
Eloy Lafuente (stronk7)
03612a7b00 MDL-32420 anomaly theme: bump version 2013-01-30 00:28:35 +01:00
Eloy Lafuente (stronk7)
e2b2794368 Merge branch 'wip-MDL-32420_master' of git://github.com/lazydaisy/moodle 2013-01-29 23:38:43 +01:00
Eloy Lafuente (stronk7)
857b40256e Merge branch 'MDL-37526-m' of git://github.com/andrewnicols/moodle 2013-01-29 23:33:22 +01:00
Petr Škoda
7a18f49c60 MDL-37726 remove PREVIOUS/NEXT from all install.xml files 
YAY!
 2013-01-29 22:34:46 +01:00
Petr Škoda
76f2fcdedb MDL-37726 stop using PREVIOUS/NEXT in install.xml files 2013-01-29 22:32:24 +01:00
Sam Hemelryk
c6cbc3c70c MDL-37474 cache: fixed bug with definition cleaning 2013-01-30 10:28:34 +13:00
Eloy Lafuente (stronk7)
a917ef63ae Merge branch 'MDL-37465' of git://github.com/colchambers/moodle 2013-01-29 19:19:29 +01:00
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
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
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