50940 Commits

Author SHA1 Message Date
Sam Hemelryk
eacb470338 Merge branch 'w52_MDL-30924_m23_pspell' of git://github.com/skodak/moodle 2012-01-03 12:49:06 +13:00
Sam Hemelryk
03edfee475 Merge branch 'w52_MDL-30926_m23_blogassoc' of git://github.com/skodak/moodle 2012-01-03 12:38:51 +13:00
Sam Hemelryk
466973a143 Merge branch 'w52_MDL-30934_m23_modules' of git://github.com/skodak/moodle 2012-01-03 12:26:14 +13:00
Sam Hemelryk
19c6ff514e Merge branch 'w52_MDL-30943_m23_adminreport' of git://github.com/skodak/moodle 2012-01-03 12:22:44 +13:00
Sam Hemelryk
d0a8d04551 Merge branch 'MDL-30802' of git://github.com/timhunt/moodle 2012-01-03 11:26:02 +13:00
Sam Hemelryk
929ea9ed6b Merge branch 'MDL-30766' of git://github.com/timhunt/moodle 2012-01-03 11:23:13 +13:00
Sam Hemelryk
221dd28b65 Merge branch 'MDL-30168_tim2' of git://github.com/timhunt/moodle 2012-01-03 11:15:04 +13:00
Sam Hemelryk
a46fe43ba2 Merge branch 'MDL-27200' of git://github.com/timhunt/moodle 2012-01-03 11:12:14 +13:00
Sam Hemelryk
f6b2946a06 Merge branch 'MDL-29266' of git://github.com/bostelm/moodle 2012-01-03 11:09:19 +13:00
Sam Hemelryk
62ff78e6de Merge branch 'w52_MDL-13572_m23_messaging' of git://github.com/skodak/moodle 2012-01-03 11:00:42 +13:00
Petr Skoda
1f6d1ebf0a MDL-13572 fix incorrect value printing 2012-01-02 22:52:04 +01:00
Petr Skoda
36a5396417 MDL-13572 fix incorrect value printing 2012-01-02 22:51:38 +01:00
Sam Hemelryk
fe4abbe180 Merge branch 'MDL-30868' of git://github.com/lazydaisy/moodle 2012-01-03 10:38:04 +13:00
Petr Skoda
9a3e8a1fa7 MDL-13572 do not send emails to invalid addresses 2012-01-02 22:36:37 +01:00
Sam Hemelryk
e525c992ca Merge branch 'MDL-30601' of git://github.com/rwijaya/moodle 2012-01-03 10:30:41 +13:00
Sam Hemelryk
03273b5357 Merge branch 'MDL-29821' of git://github.com/bostelm/moodle 2012-01-03 10:11:58 +13:00
Sam Hemelryk
ed569481a3 Merge branch 'MDL-30706' of git://git.luns.net.uk/moodle 2012-01-03 10:09:11 +13:00
Sam Hemelryk
01dcafd8d5 Merge branch 'MDL-30804-master-1' of git://git.luns.net.uk/moodle 2012-01-03 10:06:20 +13:00
Sam Hemelryk
2fa7c29c06 Merge branch 'MDL-30805-master-1' of git://git.luns.net.uk/moodle 2012-01-03 10:02:18 +13:00
Sam Hemelryk
4b8ae84cd0 Merge branch 'MDL-13572_validate_email' of git://github.com/andyjdavis/moodle 2012-01-03 09:57:00 +13:00
Eloy Lafuente (stronk7)
c31d7ca2e0 Merge branch 'MDL-30851_master_wip' of git://github.com/grabs/moodle 2012-01-02 20:23:11 +01:00
Eloy Lafuente (stronk7)
6f68eabb7e Merge branch 'w52_MDL-30953_m23_pspell' of git://github.com/skodak/moodle 2012-01-02 20:19:43 +01:00
Eloy Lafuente (stronk7)
2a297e537d Merge branch 'MDL-30873' of git://github.com/timhunt/moodle 2012-01-02 20:16:02 +01:00
Eloy Lafuente (stronk7)
ae95489d68 MDL-30610 add missing savepoint to get the upgrade checks passing.
Note the savepoint is 100% unreachable, because of the exit() call.
But it's needed to have all the upgrade checks (CI) balanced and
passing.
2012-01-02 19:48:33 +01:00
Eloy Lafuente (stronk7)
5f7d519ecf MDL-30610 Version bump. Time to diverge!
Once all the pre 2.2 upgrade code has been deleted, we bump
main version.php to start diverging in master after the
initial 3-4 weeks of on-sync with 22_STABLE.
2012-01-02 19:31:49 +01:00
Petr Skoda
8b19cf4fc7 MDL-30953 fix utf-8 support in PSpell class
Credit for discover and proposed fix goes to David Hai Gootvilig, this patch is part of https://github.com/moodle/custom-tinymce_spellchecker_php/tree/MOODLE_22_2.0.6b which will be used in the next tinymce import. It was reported upstream as https://github.com/tinymce/tinymce_spellchecker_php/pull/5
2012-01-02 12:49:09 +01:00
Petr Skoda
ff53a58b65 MDL-30926 fix course and module blog associations 2011-12-28 20:18:10 +01:00
Petr Skoda
daca599ff1 MDL-30943 fix forgotten admin/report/ references 2011-12-28 19:36:23 +01:00
Petr Skoda
a0fee9c07e MDL-30934 fix module delete cleanup
Credit goes to Rajiv Navada.
2011-12-27 14:59:45 +01:00
Petr Skoda
72f2318b83 MDL-30924 merge upstream pspell fix
See https://github.com/moodle/custom-tinymce_spellchecker_php/tree/MOODLE_22_2.0.6a
2011-12-27 14:01:05 +01:00
Mary Evans
9bb15cf956 MDL-30868 Fix for assignment view in theme_boxxie 2011-12-24 00:54:25 +00:00
Andreas Grabs
0f61fb72d8 MDL-30851 - Syntax error in analysis_course.php 2011-12-23 17:40:07 +01:00
Tim Hunt
ce70117bba MDL-30873 quiz: display an overall grade for preview users.
Also, don't display an overall grade unless there is at least one finished attempt.
2011-12-23 12:54:50 +00:00
Tim Hunt
35c37afc12 MDL-30802 question nav: fix questions link in front page course. 2011-12-23 12:54:29 +00:00
Tim Hunt
0c5abe6c3e MDL-30766 mod_quiz: fix edge cases of repaginate function. 2011-12-23 12:54:08 +00:00
Tim Hunt
820b41e34f MDL-30168 formslib: untangle automatic id generation.
Previously, we had overridden the _generateId method in almost all
subclasses; and then we mostly, but not always; ignored the value that
was generated there, and instead generated new (nicer) values in
MoodleQuickForm_Renderer::renderElement. Of course, that is not really a
logical place to (re)generate ids.

I have fixed the code so that the _generateId method now uses the 'nice
id' algorithm from renderElement. This should make the whole code flow
more logical.

This make all our overriding of _generateId unnecessary.

We do need a special _generateId for radio buttons, because you often
have different radio buttons with the same name but different values.

This change should only change the ids on radio, checkbox and
advcheckbox elements. Previously, those were essentially random, so I
don't think anyone could have been relying on the particular values.

This commit also has new unit tests, first to test the basic _generateId
algorithm, and then to create and render an example form (including some
tricky things like repeat_elements) and chech the acutal ids in the
generated HTML.
2011-12-23 11:51:45 +00:00
Tim Hunt
658ad69fa0 MDL-27200 missing {} in various lang strings. 2011-12-23 11:51:24 +00:00
Petr Skoda
5c79b8ed91 MDL-30610 prevent upgrades from pre2.2.0 2011-12-23 10:42:25 +01:00
Petr Skoda
527c8239a2 MDL-30610 remove outdated question upgrade code 2011-12-23 10:39:34 +01:00
Petr Skoda
4034485eb7 MDL-30610 remove outdated quiz upgrade code 2011-12-23 10:38:13 +01:00
Petr Skoda
a2f5eaca6a MDL-30610 remove outdated theme upgrade code 2011-12-23 10:38:13 +01:00
Petr Skoda
2e210163ee MDL-30610 remove outdated main upgrade code 2011-12-23 10:38:13 +01:00
Petr Skoda
17510ff0fe MDL-30610 remove outdated workshop upgrade code 2011-12-23 10:38:12 +01:00
Petr Skoda
7c58c19fa3 MDL-30610 remove outdated admin tool upgrade code 2011-12-23 10:38:12 +01:00
Petr Skoda
ce5e39e6c7 MDL-30610 remove outdated report upgrade code 2011-12-23 10:38:12 +01:00
Petr Skoda
40e4cd435b MDL-30610 remove outdated mod upgrade code 2011-12-23 10:38:11 +01:00
Petr Skoda
8ef9da055a MDL-30610 standardise empty upgrade script content 2011-12-23 10:38:11 +01:00
Petr Skoda
c5fb8b27b8 MDL-30610 remove outdated filter upgrade code 2011-12-23 10:38:11 +01:00
Petr Skoda
3751e28f1c MDL-30610 remove outdated enrol upgrade code 2011-12-23 10:38:11 +01:00
Petr Skoda
612d65d037 MDL-30610 remove outdated block upgrade code 2011-12-23 10:38:10 +01:00