mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity
58,995 Commits 36 Branches 527 Tags
Commit Graph

15085 Commits

Author SHA1 Message Date
Damyon Wiese
183e656eea Merge branch 'MDL-30102_master' of git://github.com/markn86/moodle 2013-02-05 11:23:01 +08:00
Dan Poltawski
ba076613d3 Merge branch 'MDL-36986' of git://github.com/moodlerooms/moodle 2013-02-05 10:47:15 +08:00
Dan Poltawski
a849391244 Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle 2013-02-05 09:29:25 +08:00
Jason Fowler
1466eccba7 MDL-35847 - Documentation - removing doc block param for on error_text 2013-02-05 09:23:54 +08:00
Dan Poltawski
43b5915e04 MDL-37574 - Fix navigation tests: remove title 
We are no longer setting it, to improve accessibility
 2013-02-05 08:38:32 +08:00
Eloy Lafuente (stronk7)
b97d3e46df Merge branch 'MDL-36472-master' of git://github.com/FMCorz/moodle 2013-02-05 01:28:35 +01:00
Eloy Lafuente (stronk7)
b7c238798c Merge branch 'MDL-37566-m' of git://github.com/andrewnicols/moodle 2013-02-05 01:14:07 +01:00
Eloy Lafuente (stronk7)
1df33d5427 Merge branch 'w04_MDL-37780_m25_wintests' of git://github.com/skodak/moodle 2013-02-05 01:06:40 +01:00
Eloy Lafuente (stronk7)
1615caae6f Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle 2013-02-05 00:08:44 +01:00
Mark Nelson
a9a0cb691c MDL-30102 mod_forum: adding webservice function to allow for the retrieval of forum discussions 2013-02-04 19:28:29 +08:00
Dan Poltawski
78b161d39b Merge branch 'MDL-37574-m' of git://github.com/andrewnicols/moodle 2013-02-04 16:11:11 +08:00
Jason Fowler
3246648b48 MDL-35847 - Accessibility - Adding warning icon to the login error message 2013-02-04 12:49:21 +08:00
Dan Poltawski
40a008b33c Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle 2013-02-04 11:29:22 +08:00
Damyon Wiese
ef23b6ff4f Merge branch 'MDL-37177-master' of git://github.com/FMCorz/moodle 2013-02-04 11:12:45 +08:00
Andrew Robert Nicols
2f545feb89 MDL-37574 Remove default link title from navigation items 2013-02-01 11:30:02 +00:00
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
Andrew Robert Nicols
2324cf045e MDL-37645 Generalise style for moodle-core-dialogues 2013-02-01 10:20:16 +00:00
Frederic Massart
39bb9b1f00 MDL-36472 files: Improved file area uploads error messages. 2013-01-31 15:09:44 +08:00
Frederic Massart
d422fb22f7 MDL-37177 navigation: Prevent exception when viewing a profile 
When viewing a profile as a non-authenticated user, an exception
was raised because we were trying to fetch the context of this user.
 2013-01-31 12:24:37 +08:00
Petr Škoda
73d20f36cb MDL-37780 hack around some unicode date formatting issues on Windows 2013-01-30 22:36:40 +01:00
Petr Škoda
774d1d2429 MDL-37780 make sure there are no windows line endings in test files 2013-01-30 21:23:29 +01: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)
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
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
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
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
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
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
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
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
bd770617a9 MDL-37046 behat: New setting to switch completely to test env. 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