4bd74c8ddc
Merge branch 'm22_MDL-31461' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
2012-02-08 10:12:26 +08:00
822790437e
Merge branch 'MDL-31482-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE
2012-02-08 09:59:04 +08:00
c2db2793d2
Merge branch 'MDL-27360-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE
2012-02-07 23:49:19 +01:00
e455406b69
MDL-31482 Lib: IE8/IE7 (even with stupid user agent) should not be 'legacy' device type
2012-02-07 17:42:07 +00:00
3e299e464d
Merge branch 'MDL-31469_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2012-02-07 15:12:26 +08:00
733196d843
MDL-31461 Plagiarism - adjust api functions to allow better support for renderers
2012-02-03 11:38:33 +13:00
e8e2f4f62c
MDL-31469 formslib: fix invalid for="" attributes on optional dates
2012-02-02 18:16:07 +00:00
648cf3397d
MDL-31445 formslib: add a nice id and class to the wrapper div for CSS
2012-02-02 18:15:31 +00:00
28a3a568aa
MDL-27360 Web service tokens are displayed for deleted users
2012-02-02 16:23:56 +08:00
6432e1b4e1
Merge branch 'm22_MDL-31360' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
2012-02-02 11:13:22 +08:00
52453939f2
MDL-31360 use extra param in get_in_or_equal - one less line of code...
2012-02-01 23:09:49 +13:00
acef9e8a7f
Merge branch 'wip-MDL-31197-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE
2012-02-01 00:50:38 +01:00
68e719927e
MDL-31360 Don't use get_in_or_equal if array is empty, tidy up structure of $extracaps array
2012-01-27 19:40:38 +13:00
b292cea475
Merge branch 'MDL-31122-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE
2012-01-25 01:52:36 +01:00
fe3130a07d
Merge branch 'MDL-29896-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE
2012-01-25 01:17:06 +01:00
264189da87
Merge branch 'MDL-31113_multiple_files_file_manager_22' of https://github.com/davosmith/moodle into MOODLE_22_STABLE
2012-01-25 01:06:56 +01:00
9e3824a63d
Merge branch 'w04_MDL-31238_m22_php54' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2012-01-24 23:55:36 +01:00
b7c8fb6610
Merge branch 'wip-MDL-28352-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE
2012-01-24 07:12:31 +08:00
5125c0e332
MDL-31202 do not try sending emails to invalid addresses
...
The use of mtrace() in email_to_user() is most probably incorrect, I am going to use it only in CLI scripts (which includes cron). This should not be considered a security issue because we should be already validating emails when accepting them from untrusted users.
2012-01-23 14:24:43 +08:00
c95efa3936
Merge branch 'MDL-31329_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE
2012-01-23 11:25:42 +08:00
abb58a56f4
MDL-31013 Add iconsmall class to 'Export to portfolio' icon
2012-01-23 11:08:51 +08:00
196eedebb1
MDL-31180 fix coding error in fake_recordset iterator
2012-01-23 01:12:32 +01:00
ed6af81b50
Merge branch 'w04_MDL-31181_m22_fitlertestcfg' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2012-01-23 01:04:17 +01:00
984616805e
MDL-31329 timezones: updated to 2011n
2012-01-22 21:32:07 +01:00
ea5214d534
MDL-31181 fix missing global $CFG that was breaking unit test teardown
2012-01-21 17:08:43 +01:00
caa4912f70
MDL-31208 fix obsolete get_record_sql() parameter
...
Credit goes to Rajesh Taneja.
2012-01-21 11:36:52 +01:00
68d4c5bc1f
MDL-31238 remove now unnecessary null to stdClass conversion for plugin settings
2012-01-21 11:17:18 +01:00
057d39bbc1
MDL-31238 always return object for plugin settings from get_config()
...
This prevents multiple creations of objects from NULL which is note a warnings in php54
2012-01-21 11:17:18 +01:00
125e250a85
MDL-29896 Navigation: Make links, files clickable in nav block
2012-01-20 10:33:05 +00:00
e58dbe0fe8
MDL-28352: Fixed bug in html_writer::select_time causing not autoselecting month
2012-01-20 16:27:39 +08:00
135de8d007
MDL-31197 navigation: Fixed issue withing require_login for courses that are hidden or unavailable
2012-01-20 12:51:48 +08:00
6d3c3b02a6
MDL-31113 filemanager element - refresh file list from server on load
2012-01-19 19:50:05 +00:00
54b1dc4950
MDL-31122 Navigation: Do not show week in navigation if it contains only labels
2012-01-19 14:46:34 +00:00
4416991914
MDL-31006 revert partially @ get_config()
...
The change from null to stdClass() in get_config() was leading to:
1) unit tests not passing.
2) non-equivalent evaluation in conditions (null evals false,
stdClassi() evals true)
2012-01-18 02:11:53 +01:00
a1317d1b99
MDL-31006 some more PHP54 notices
...
PHP54 compatibility - PhpStorm IDE is the best tool for this kind of work!!
2012-01-18 01:17:09 +01:00
88e2bbae6d
MDL-31006 fix various notices in PHP54
...
PHP54 compatibility
2012-01-18 01:04:45 +01:00
2aa4f06a88
Merge branch 'w03_MDL-31213_m22_attributesmess' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2012-01-17 12:37:28 +01:00
fc0a71999e
MDL-31213 fix incorrect modifications of quickforms attributes
2012-01-17 11:21:10 +01:00
14a49d6d28
Merge branch 'w03_MDL-31053_m22_contextpreloading' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2012-01-17 02:26:25 +01:00
b837c9e84d
Merge branch 'w03_MDL-31127_m22_switchaccessinit' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2012-01-17 02:11:36 +01:00
87be88ad2f
Merge branch 'w03_MDL-31142_m22_slowiconv' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2012-01-17 01:39:07 +01:00
27dd6a7c57
Merge branch 'w03_MDL-31171_m22_blogattachment' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2012-01-17 01:32:17 +01:00
9690f66447
Merge branch 'w03_MDL-31170_m22_blogblocks' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2012-01-17 00:55:45 +01:00
76917f764f
MDL-31142 fix textlib::substr() performance, invalid length in iconv_substr; use mbstring by default
2012-01-16 09:17:36 +01:00
735d8ce2ce
Merge remote-tracking branch 'skodak/w03_MDL-30958_m22_yuissl' into MOODLE_22_STABLE
2012-01-16 14:56:06 +08:00
7b3dae9096
Merge branch 'w03_MDL-21992_m22_customscripts' of https://github.com/skodak/moodle into MOODLE_22_STABLE
2012-01-16 14:48:16 +08:00
6f960202e7
Merge remote-tracking branch 'skodak/w03_MDL-31035_m22_identitynotice' into MOODLE_22_STABLE
2012-01-16 14:38:36 +08:00
6bf567100a
Merge branch 'MDL-31040-MOODLE_22_STABLE-3' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE
2012-01-16 10:59:41 +08:00
5274209ac1
MDL-31171 fix blog attachment serving in BLOG_USER_LEVEL
2012-01-15 19:11:41 +01:00
7e6f69b9af
MDL-31035 fix showuseridentity notice before settings upgrade
2012-01-15 17:13:11 +01:00
Aparup Banerjee