Eloy Lafuente (stronk7)
d0d5fd36e6
Merge branch 'wip-MDL-30976-master' of git://github.com/abgreeve/moodle
2012-02-29 00:52:51 +01:00
Sam Hemelryk
34223e03e6
MDL-30964 Fixed up phpdocs during integration review
2012-02-28 15:53:59 +01:00
Eloy Lafuente (stronk7)
dde82858b8
Merge branch 'w09_MDL-30964_m23_access' of git://github.com/skodak/moodle
2012-02-28 12:44:03 +01:00
Eloy Lafuente (stronk7)
cee44e2d96
Merge branch 'MDL-31363_grade_constants' of git://github.com/andyjdavis/moodle
...
Conflicts:
lib/grade/constants.php
2012-02-28 12:37:44 +01:00
Aparup Banerjee
20a903c34f
Merge branch 'MDL-31335_mtrace_email' of git://github.com/andyjdavis/moodle
2012-02-28 14:15:28 +08:00
Aparup Banerjee
2ac18d9261
Merge branch 'wip-mdl-22896' of git://github.com/rajeshtaneja/moodle
2012-02-28 13:48:34 +08:00
Eloy Lafuente (stronk7)
9f733c98a1
MDL-29161 weblib: added one more test about un-keyed array params
2012-02-27 22:20:34 +01:00
Eloy Lafuente (stronk7)
6c941fc10f
Merge branch 'MDL-29161' of git://github.com/timhunt/moodle
2012-02-27 22:10:47 +01:00
Davo Smith
9f9c794733
MDL-29147 Quickform fixed insertElementBefore to ignore duplicate unnamed elements
2012-02-27 20:05:39 +00:00
Eloy Lafuente (stronk7)
92f901158f
Merge branch 'MDL-29199-master' of git://github.com/danpoltawski/moodle
2012-02-27 18:47:12 +01:00
Eloy Lafuente (stronk7)
ec1956655a
Merge branch 'MDL-29523-master' of git://github.com/danpoltawski/moodle
2012-02-27 16:51:44 +01:00
Dan Poltawski
5dad45912c
MDL-29592 weblib: prevent warnings when $USER not set
2012-02-27 16:11:36 +01:00
Petr Skoda
f76249cc25
MDL30964 fix core_access API docs
2012-02-27 07:19:03 +01:00
Sun Zhigang
1ab8cd2e1c
MDL-29523 filemanager: Fix a hardcode string
2012-02-27 09:35:11 +08:00
Sam Hemelryk
ef6cf871de
MDl-30985 events: Fixed up phpdocs after review
2012-02-27 14:34:06 +13:00
Sam Hemelryk
1d1719f5dd
MDL-30985 Fixed up event API phpdocs
2012-02-27 14:34:06 +13:00
Adrian Greeve
31fde54fbc
MDL-30976 - navigation - Updating the api block documentation.
2012-02-27 08:14:54 +08:00
Dan Poltawski
6ad22bb164
MDL-29199 dml: fix query logging on Oracle
...
thanks to Jonathon Fowler for the fix
2012-02-24 11:57:18 +08:00
Rajesh Taneja
59c81169ef
MDL-22896 libraries: Updated regular expression in html2text, for replacing unknown/unhandled entities
2012-02-24 10:08:56 +08:00
Tim Hunt
ab82976f92
MDL-29161 weblib: moodle_ulr::out does not cope with array params.
2012-02-23 12:07:28 +00:00
Andrew Davis
0e7f31b42b
MDL-31363 grade: removed 3 constants that are not being used anywhere
2012-02-23 08:51:19 +07:00
Sam Hemelryk
4a3ecbb25e
MDL-30988 ajax: Fixed up phpdocs package in ajax scripts
2012-02-23 14:38:52 +13:00
Eloy Lafuente (stronk7)
202c72c997
Merge branch 'wip-MDL-30997-master' of git://github.com/abgreeve/moodle
2012-02-22 13:09:54 +01:00
Sam Hemelryk
75e4f98c0d
MDL-30987 message: Minor phpdoc fix ups
2012-02-22 11:15:42 +13:00
Sam Hemelryk
a513048a00
Merge branch 'MDL-30987_message_docs2' of git://github.com/andyjdavis/moodle
2012-02-22 10:58:06 +13:00
Andrew Davis
6fbd60ef57
MDL-30987 message: updated phpdocs for /lib/messagelib.php and /message
2012-02-21 10:57:55 +07:00
Adrian Greeve
4d8e241742
MDL-30997 - group - update of the api block documentation.
2012-02-21 11:17:27 +08:00
Sam Hemelryk
58b7d48f9a
MDL-30974 forms: Last minute phpdoc fixes
2012-02-21 12:39:35 +13:00
Sam Hemelryk
ceaad88222
Merge branch 'wip-mdl-30974' of git://github.com/rajeshtaneja/moodle
2012-02-21 12:07:30 +13:00
Sam Hemelryk
56588dfbee
MDL-30988 Fixed phpdocs during integration review
2012-02-21 12:01:00 +13:00
Sam Hemelryk
26aca872ca
Merge branch 'm_MDL-30988_adding_preference_api_phpdocs' of git://github.com/gerrywastaken/moodle
2012-02-21 11:59:48 +13:00
Eloy Lafuente (stronk7)
11ce79b05d
MDL-30999 whitespace fix
2012-02-20 12:17:33 +01:00
Eloy Lafuente (stronk7)
a4d7604977
MDL-30999 grade phpdocs - change some inline @see by correct @link
2012-02-20 12:09:50 +01:00
Eloy Lafuente (stronk7)
2a5fa9e64a
Merge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle
2012-02-20 12:02:18 +01:00
Andrew Robert Nicols
f0a163ed6d
MDL-31656 Open files in a new window when downloading with the filemanager
...
We need to open files in a new window rather than the existing window to
prevent warning messages when files are uploaded and then downloaded
without the form being saved first.
2012-02-20 10:50:16 +00:00
Eloy Lafuente (stronk7)
a0fbb0a270
Merge branch 'wip-MDL-30979-m23' of git://github.com/samhemelryk/moodle
2012-02-20 11:38:20 +01:00
Eloy Lafuente (stronk7)
47e5997851
MDL-30977 page phpdocs: 2 minor fixes in 2 functions
2012-02-20 11:28:08 +01:00
Eloy Lafuente (stronk7)
7dca125be4
Merge branch 'wip-MDL-30977-m23' of git://github.com/samhemelryk/moodle
2012-02-20 11:25:01 +01:00
Eloy Lafuente (stronk7)
ad360e66ae
Merge branch 'MDL-30972_final' of git://github.com/nebgor/moodle
2012-02-20 11:20:21 +01:00
Sam Hemelryk
e76eba8111
Merge branch 'wip-mdl-29967' of git://github.com/rajeshtaneja/moodle
2012-02-20 18:20:37 +13:00
Sam Hemelryk
5f5ee19125
MDL-29254 Fixed whitespace
2012-02-20 18:08:33 +13:00
Sam Hemelryk
fcd6bdd4fa
Merged MDL-29254 with conflict resolution
2012-02-20 18:07:13 +13:00
Andrew Davis
fc28177f4d
MDL-31335 message: wrapped calls to mtrace() in email_to_user() within a check to make sure its a CLI script
2012-02-20 10:30:02 +07:00
Rajesh Taneja
aa803ceba2
MDL-29254 blog: added check in upgrade for summary and content to be null fields
2012-02-20 09:33:20 +08:00
Sam Hemelryk
9fdd4f7dc8
Merge branch 'wip-MDL-30971-master' of git://github.com/phalacee/moodle
2012-02-20 11:37:59 +13:00
Sam Hemelryk
bc5fbbb3cd
Merged branch wip-MDL-30521 with conflict resolutions
2012-02-20 10:32:08 +13:00
sam marshall
d9498b3805
MDL-31514 Lib: Time format to remove unwanted zeros caused errors on Windows servers
2012-02-17 10:33:07 +00:00
Sam Hemelryk
f8129210d2
MDL-30979 output: Further changes are validation
2012-02-17 14:53:11 +13:00
Sam Hemelryk
3d3fae7259
MDL-30979 output: Changes after peer-review
2012-02-17 14:53:10 +13:00
Sam Hemelryk
76be40ccf9
MDL-30979 output: Adjustments to match recent changes in coding style doc
2012-02-17 14:53:10 +13:00
