47116 Commits

Author SHA1 Message Date
Sam Hemelryk
a1ead9a478 enrolments MDL-26560 Fixed panel.user bug with role assignments dialogue 2011-04-04 14:49:28 +08:00
Petr Skoda
dae6b38c51 sync version with stable 2011-03-30 18:01:39 +02:00
Petr Skoda
0947b90b98 weekly release 2011-03-30 14:32:49 +02:00
Petr Skoda
3b6d215b91 Merge branch 'MDL-26964-moodle_url-anchor_master' of git://github.com/mudrd8mz/moodle 2011-03-29 09:57:20 +02:00
Helen Foster
4b59f327cd MDL-26744 enrol meta lang string improvement thanks to Ray Lawrence 2011-03-28 23:58:27 +02:00
Eloy Lafuente (stronk7)
a5743e866e Merge branch 'w13_MDL-22733_21_youtubeiframe' of git://github.com/skodak/moodle 2011-03-28 23:33:23 +02:00
Eloy Lafuente (stronk7)
5e44c5c998 Merge branch 'w13_MDL-26909_21_mediatests' of git://github.com/skodak/moodle 2011-03-28 22:08:15 +02:00
Eloy Lafuente (stronk7)
12abf305f8 Merge branch 'w13_MDL-26987_21_sclean' of git://github.com/skodak/moodle 2011-03-28 21:56:25 +02:00
Eloy Lafuente (stronk7)
63d6da51fe Merge branch 'w13_MDL-26913_20_sitecreated' of git://github.com/skodak/moodle 2011-03-28 19:58:49 +02:00
Eloy Lafuente (stronk7)
2326b8d301 Merge branch 'w13_MDL-26951_21_archetypes' of git://github.com/skodak/moodle 2011-03-28 19:38:48 +02:00
Eloy Lafuente (stronk7)
18318237d7 Merge branch 'w13_MDL-26991_21_legacy' of git://github.com/skodak/moodle 2011-03-28 19:25:03 +02:00
Petr Skoda
e1ce68c2f9 MDL-26991 use archetypes instead of deprecated 'legacy' when defining roles in enrol plugins 2011-03-28 19:19:54 +02:00
Eloy Lafuente (stronk7)
0a284930cf Merge branch 'w13_MDL-26966_21_urlparsing' of git://github.com/skodak/moodle 2011-03-28 19:05:07 +02:00
Eloy Lafuente (stronk7)
58937f7e57 Merge branch 'w13_MDL-26985_21_branching' of git://github.com/skodak/moodle 2011-03-28 18:09:29 +02:00
Petr Skoda
b2b9320570 Merge branch 'MDL-26425' of git://github.com/timhunt/moodle 2011-03-28 16:49:49 +02:00
Eloy Lafuente (stronk7)
37c2a8a035 Merge branch 'master' of git.moodle.org:/git/integration 2011-03-28 16:21:11 +02:00
Eloy Lafuente (stronk7)
a226727238 Merge branch 'w13_MDL-26990_21_missingrebuild' of git://github.com/skodak/moodle 2011-03-28 16:07:20 +02:00
Petr Skoda
ce14a7644e Merge branch 'MDL-26335' of github.com:mouneyrac/moodle 2011-03-28 15:15:23 +02:00
Eloy Lafuente (stronk7)
df8248b035 Merge branch 'MDL-26804-langlistcache_master' of git://github.com/mudrd8mz/moodle 2011-03-28 14:48:38 +02:00
Eloy Lafuente (stronk7)
e1feb94cd1 Merge branch 's8_MDL-26213_wiki_rewrite_file_url' of git://github.com/dongsheng/moodle 2011-03-28 11:48:58 +02:00
Dongsheng Cai
cfdac90f2b MOD-WIKI MDL-26213
1. Rewrite the image urls in diff.php and viewdiff.php
2. Fxied image urls in search.php
3. Add modcontext variable to avoid using duplicated
get_context_instance calls
2011-03-28 17:31:01 +08:00
Eloy Lafuente (stronk7)
b431645c89 Merge branch 'MDL-26932' of git://github.com/jennymgray/moodle 2011-03-28 11:03:44 +02:00
Eloy Lafuente (stronk7)
12c6a556b2 Merge branch 'm20_MDL-26939_plagiarism_restore' of git://github.com/danmarsden/moodle 2011-03-28 10:48:45 +02:00
Sam Hemelryk
223680f562 Merge branch 's8_MDL-26916_filepicker_paging' of git://github.com/dongsheng/moodle 2011-03-28 16:12:55 +08:00
Sam Hemelryk
628c600cd9 Merge branch 'm20_MDL-26957_forum_overview' of git://github.com/danmarsden/moodle 2011-03-28 16:10:39 +08:00
Sam Hemelryk
6db981b2ee Merge branch 'MDL-26906-2' of git://github.com/epsd/moodle 2011-03-28 16:03:15 +08:00
Sam Hemelryk
e1a7281ab2 Merge branch 'MDL-26077_message_strip_brackets2' of git://github.com/andyjdavis/moodle 2011-03-28 15:59:25 +08:00
Sam Hemelryk
e1339a6dda Merge branch 's8_MDL-26798_dropbox_repo' of git://github.com/dongsheng/moodle 2011-03-28 15:52:21 +08:00
Sam Hemelryk
bc071c7580 Merge branch 'w13_MDL-26992_21_uploadtemplates' of git://github.com/skodak/moodle 2011-03-28 14:29:50 +08:00
Sam Hemelryk
982e619d2a Merge branch 'w13_MDL-26989_21_enrolroles' of git://github.com/skodak/moodle 2011-03-28 14:10:44 +08:00
Sam Hemelryk
d2c4a97a70 Merge branch 'w13_MDL-26795_21_emailchange' of git://github.com/skodak/moodle 2011-03-28 13:54:39 +08:00
Petr Skoda
43070e6193 MDL-26992 fix broken upload users templates 2011-03-27 23:48:41 +02:00
Tim Hunt
a208aefbc4 MDL-26425 change all table subclasses to use parent::__construct 2011-03-27 20:06:45 +01:00
Tim Hunt
ba9164e575 MDL-26425 tablelib more cleanup, mostly to PHPdocs, following sam's comments. 2011-03-27 20:06:45 +01:00
Tim Hunt
76dc1e2527 MDL-26425 tablelib use html_writer when outputting rows and headers.
This includes refactoring to extract methods like sort_icon and show_hide_link which I think makes the code easier to read.

Note also the change to make_styles_string that makes it usable with html_writer. (Perhpas we need a css_writer classe ;-))
2011-03-27 20:06:44 +01:00
Tim Hunt
6f0d3480c7 MDL-26425 tablelib change print_initials_bar to remove duplication, and to use html_writer. 2011-03-27 20:06:44 +01:00
Tim Hunt
b08fb128c8 MDL-26425 tablelib ability for table_sql to add a class to the row based on the data. 2011-03-27 20:06:43 +01:00
Tim Hunt
abf72969a4 MDL-26425 tablelib change col_username to use html_writer and moodle_url. 2011-03-27 20:06:43 +01:00
Tim Hunt
e81eed542c MDL-26425 tablelib better validation of the sort code, also some cleanup.
You may think that the extra validation is unnecessary, since the sort fields are already validated when the URL parameters are parsed, however that overlooks an important point. There may be other options that affect which columns are in the SQL, for example the quiz show individual question grades setting. These other options can cause a column that was in the table, and being sorted on, to disappear. Therefore, it is necessary to re-validate the sort columns when they are used, to make sure they are still present, otherwise you can get ORDER BY sql that refers to non-existant columns, which then causes DB errors.
2011-03-27 20:06:42 +01:00
Tim Hunt
59f392b3f0 MDL-26425 tablelib clean up setup and URL handling code.
Note that this change removes ->reseturl, This was supposed to be a way to reset all the session stuff relating to a table automatically in some situations, but from using Moodle and reading the code, I don't beleive it was working. The code was horrible and not easily fixible, and has been broken for years, so I just removed it.
2011-03-27 20:06:42 +01:00
Tim Hunt
a49c17b424 MDL-26425 tablelib rename constructors to PHP5 __construct
and add depreacted functions with the old name so that legacy code does not break.
2011-03-27 20:05:55 +01:00
Tim Hunt
4b7079c100 MDL-26425 tablelib clean up constant definitions. 2011-03-27 19:55:10 +01:00
Tim Hunt
9683db71c9 MDL-26425 tablelib mass whitespace clean-up. 2011-03-27 19:55:10 +01:00
Nikhil Gupta
d099348e32 MDL-26989 fix incorrect disabling of assignable roles 2011-03-27 20:34:15 +02:00
Petr Skoda
c4dd3bb86f MDL-26913 set timecreated in fortpage of a newly installed site 2011-03-27 18:22:11 +02:00
Petr Skoda
c6a074f867 MDL-26795 fix incorrect location of email change strings
AMOS BEGIN
 MOV [auth_emailchangecancel,auth_email],[emailchangecancel,core_auth]
 MOV [auth_emailchangepending,auth_email],[emailchangepending,core_auth]
 MOV [auth_emailupdate,auth_email],[emailupdate,core_auth]
 MOV [auth_emailnowexists,auth_email],[emailnowexists,core_auth]
 MOV [auth_emailupdatemessage,auth_email],[emailupdatemessage,core_auth]
 MOV [auth_emailupdatesuccess,auth_email],[emailupdatesuccess,core_auth]
 MOV [auth_emailupdatetitle,auth_email],[emailupdatetitle,core_auth]
 CPY [auth_emailnoemail,auth_email],[noemail,auth_ldap]
AMOS END
2011-03-27 17:19:23 +02:00
Petr Skoda
ce8b66c67f MDL-26881 work around the block context setting problems 2011-03-27 16:39:27 +02:00
Petr Skoda
d38f419d5c MDL-26987 fix invalid DML syntax in spam cleaner tool 2011-03-27 16:14:22 +02:00
Petr Skoda
c102060deb MDL-26951 fix removing of archetype from role 2011-03-27 16:04:33 +02:00
Petr Skoda
0ae36f6638 MDL-26966 improve self URL validation 2011-03-27 12:29:36 +02:00