59006 Commits

Author SHA1 Message Date
Dan Poltawski
751f00a0bb Revert "MDL-37164 core_message: prevent users from interacting with themself"
Was breaking unit tests.

This reverts commit 61a73b43c13da988872aab4125a43d0ced322ae9 and 7bb19ee167c6976b4f0910aed8c3070426cd97db.
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
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
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
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
Eloy Lafuente (stronk7)
8d8f9cf756 Merge branch 'master_MDL-33078' of git://github.com/danmarsden/moodle 2013-02-04 23:58:41 +01:00
Eloy Lafuente (stronk7)
a35a7644b9 Merge branch 'MDL-37847' of git://github.com/timhunt/moodle 2013-02-04 22:54:50 +01:00
Tim Hunt
c0d12fc1cd MDL-37847 plain text essays were screwing up HTML special chars.
This was incorrect use of PARAM_CLEANHTML for these inputs.

This fix also adds some unit tests to try to verify that this does not
break again in future.
2013-02-04 12:54:10 +00: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 Marsden
a022192a3b MDL-33078 SCORM: rebuild toc when calling LMSCommit to improve pre-req handling 2013-02-04 22:04:06 +13:00
Damyon Wiese
935ec5e77e Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle 2013-02-04 16:18:00 +08:00
Dan Poltawski
78b161d39b Merge branch 'MDL-37574-m' of git://github.com/andrewnicols/moodle 2013-02-04 16:11:11 +08:00
Dan Poltawski
58e22287a6 Merge branch 'MDL-37422' of git://github.com/colchambers/moodle 2013-02-04 16:02:57 +08:00
Dan Poltawski
6ac9f15969 Merge branch 'master_MDL-29207' of git://github.com/danmarsden/moodle 2013-02-04 15:54:43 +08:00
Dan Poltawski
efd779c2c6 Revert "MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests"
This reverts commit 88df34abeddb5819e82e588b3b909c0de813d6b4.
2013-02-04 15:12:30 +08:00
Dan Poltawski
5389bd999d Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle 2013-02-04 14:30:07 +08:00
Dan Poltawski
cf936fa297 Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle 2013-02-04 13:54:27 +08:00
Dan Poltawski
4ac341c9b6 Merge branch 'MDL-37646-master' of git://github.com/damyon/moodle 2013-02-04 13:49:23 +08:00
Jason Fowler
3246648b48 MDL-35847 - Accessibility - Adding warning icon to the login error message 2013-02-04 12:49:21 +08:00
Barbara Ramiro
ef27582f08 MDL-35847 - Usability - Adding new warning icons 2013-02-04 12:49:02 +08:00
Damyon Wiese
c15cda6138 Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle 2013-02-04 12:48:42 +08:00
Dan Poltawski
d5a13bca09 Merge branch 'MDL-37710-master' of git://github.com/damyon/moodle 2013-02-04 12:12:11 +08:00
Dan Poltawski
b9299c61ca Merge branch 'MDL-37635-master' of git://github.com/damyon/moodle 2013-02-04 11:56:45 +08:00
Mark Nelson
df7d171fc3 MDL-37518 blocks: described the introduction of the myaddinstance capability in upgrade.txt 2013-02-04 11:43:01 +08:00
Damyon Wiese
c04dac3473 Merge branch 'master_MDL-36800' of git://github.com/danmarsden/moodle 2013-02-04 11:35:54 +08:00
Dan Poltawski
40a008b33c Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle 2013-02-04 11:29:22 +08:00
Dan Poltawski
7528ebd23a MDL-35823 - fix trailing whitespace 2013-02-04 11:23:44 +08:00
Dan Poltawski
3428c00d43 Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle 2013-02-04 11:23:41 +08:00
Damyon Wiese
ef23b6ff4f Merge branch 'MDL-37177-master' of git://github.com/FMCorz/moodle 2013-02-04 11:12:45 +08:00
Dan Poltawski
7c433fa526 Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle 2013-02-04 10:26:32 +08:00
Dan Poltawski
e9c0ef3bca Merge branch 'MDL-37746' of git://github.com/timhunt/moodle 2013-02-04 10:17:36 +08:00