Commit graph

60238 commits

Author SHA1 Message Date
Damyon Wiese
070d431771 MDL-37883 Assign offline marking: Properly handle french decimal grades when importing worksheet. 2013-02-06 15:43:19 +08:00
Dan Poltawski
ef5a82104c MDL-37572 - fix typo in has_any_capability() 2013-02-06 14:47:29 +08:00
Dan Poltawski
8c8d314ffd Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle 2013-02-06 14:21:03 +08:00
Jason Fowler
083c15e640 MDL-35823 - Accessibility - Readding Focus to header in the help popup 2013-02-06 14:17:29 +08:00
Dan Poltawski
69b2f366b1 Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle 2013-02-06 13:42:47 +08:00
Jason Fowler
fc7defef99 MDL-35823 - Accessibility - Follow up changes from the original commit: addint in theme fixes and updating upgrade.txt 2013-02-06 13:36:37 +08:00
Dan Poltawski
6b106e2e8e Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle 2013-02-06 13:21:31 +08:00
Rajesh Taneja
45281abcfa MDL-30144 Assignmnet 2.2: fixed context retrival 2013-02-06 12:36:25 +08:00
Mark Nelson
9a9cb74118 MDL-37654 core_course: ensure exceptions return static error codes for debugging purposes 2013-02-06 12:10:10 +08:00
David Monllao
b048f85f8a MDL-37886 behat: Prevent dropping test site when running tests 2013-02-06 11:20:09 +08:00
Dan Poltawski
0110cc2d49 MDL-37645 Add another missing trailing ;
GRR. Clearly didn't review this one well enough!
2013-02-06 10:36:39 +08:00
Dan Poltawski
da92e1b081 Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle 2013-02-06 08:54:55 +08:00
Mary Evans
a0e3b2b11e MDL-37828 theme_base: Removed old CSS for popuphelp in style/core.css 2013-02-06 00:08:19 +00:00
Andrew Robert Nicols
2c653f9919 MDL-37645 Add missing trailing ; on some CSS rules 2013-02-05 16:56:47 +00:00
Eloy Lafuente (stronk7)
5ab0371d74 Merge branch 'MDL-37854_master' of https://github.com/markn86/moodle 2013-02-05 11:10:48 +01:00
Mark Nelson
17222a4a25 MDL-37854 phpunit: replaced occurrence of non-existent function assertFail 2013-02-05 18:03:25 +08:00
Eloy Lafuente (stronk7)
6617125ca4 Merge branch 'MDL-37870-progressive_parser_exception' of git://github.com/mudrd8mz/moodle 2013-02-05 10:19:06 +01:00
Andrew Robert Nicols
487989d8ef MDL-37872 AJAX Remove node option from jshintrc 2013-02-05 08:37:41 +00:00
Jerome Mouneyrac
b4d24344c2 MDL-37012 some typos, add a new lang string, change tag 'a' for 'link', some code cleaning,
clean the external string against cross-scripting, proper usage of doclink,
correcting the require_once quickform/input

AMOS BEGIN
    CPY [download,block_community],[install,block_community]
AMOS END
2013-02-05 16:36:37 +08:00
Howard Miller
540b8834fa MDL-37797 HTML block: add contextid to block_positions query and make it more unique. 2013-02-05 16:20:34 +08:00
Damyon Wiese
e2adaaf788 MDL-30062 - Fix whitespace 2013-02-05 16:07:08 +08:00
Damyon Wiese
33d943500f Merge branch 'wip-mdl-30062' of git://github.com/rajeshtaneja/moodle 2013-02-05 15:53:21 +08:00
Dan Poltawski
9cf44c32b5 Merge branch 'wip-MDL-37572-m25' of git://github.com/samhemelryk/moodle 2013-02-05 15:25:08 +08:00
Dan Poltawski
751f00a0bb Revert "MDL-37164 core_message: prevent users from interacting with themself"
Was breaking unit tests.

This reverts commit 61a73b43c1 and 7bb19ee167.
2013-02-05 14:42:20 +08:00
Dan Poltawski
61a73b43c1 MDL-37164 message - fix broken unit tests
We have fixed the returning of the guest user now
2013-02-05 14:27:20 +08:00
Rajesh Taneja
791723c34a MDL-30062 Webservices: added update_course webservice 2013-02-05 14:15:53 +08:00
Damyon Wiese
4c5dc0e367 MDL-36206 Unit tests - Cleanup whitespace issues from previous patch 2013-02-05 14:11:11 +08:00
Damyon Wiese
9d6f6a6987 Merge branch 'wip-MDL-36206-master' of git://github.com/phalacee/moodle 2013-02-05 14:11:07 +08:00
Dan Poltawski
6e59d6628c Merge branch 'MDL-37164_message_self' of git://github.com/andyjdavis/moodle 2013-02-05 13:51:17 +08:00
Dan Poltawski
9631a80283 Merge branch 'MDL-37800_master' of git://github.com/grabs/moodle 2013-02-05 12:43:06 +08:00
Damyon Wiese
174d857235 Merge branch 'MDL-37626-m' of git://github.com/andrewnicols/moodle 2013-02-05 11:49:16 +08:00
David Mudrák
5aeff5ebc0 MDL-37870 Fix the number of parameters when calling the parent constructor 2013-02-05 04:47:41 +01:00
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
d8d02951bb Merge branch 'wip-MDL-36322-m25' of https://github.com/samhemelryk/moodle 2013-02-05 10:25:57 +08:00
Dan Poltawski
f7e2143665 MDL-37357 - fix trailing whitespace 2013-02-05 09:57:00 +08:00
Dan Poltawski
837946d5f0 Merge branch 'MDL-37357_hidden_rank' of git://github.com/andyjdavis/moodle 2013-02-05 09:56:16 +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
Jason Fowler
b9271ffd94 MDL-35832 - Accessibility - Adding more precise context sensitive title text to undock controls on docked blocks 2013-02-05 09:21:15 +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)
70e963ea9c Merge branch 'MDL-37801_glossary_links' of git://github.com/davosmith/moodle 2013-02-05 01:01:14 +01:00
Eloy Lafuente (stronk7)
fc395e02f7 Merge branch 'MDL-37775_master' of git://github.com/lazydaisy/moodle 2013-02-05 00:57:20 +01:00
Eloy Lafuente (stronk7)
a0c3faeaef Merge branch 'MDL-37785_master' of git://github.com/lazydaisy/moodle 2013-02-05 00:35:24 +01:00
Eloy Lafuente (stronk7)
f941a7864b Merge branch 'MDL-37523_master' of git://github.com/lazydaisy/moodle 2013-02-05 00:28:10 +01:00
Eloy Lafuente (stronk7)
208f59137a Merge branch 'MDL-37518_master' of https://github.com/markn86/moodle 2013-02-05 00:13:48 +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