Sam Hemelryk
e5f6a755e7
Merge branch 'MDL-37378_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2013-01-15 10:42:36 +13:00
Rajesh Taneja
e48cbfc594
MDL-36674 Administration: out_as_local_url will check for both http and https url's
...
out_as_local_url will first check if url passed in wwwroot, if it's not then it will check
if loginhttps is enabled and url is httpswwwroot
2013-01-14 16:02:09 +08:00
Dan Poltawski
a07dccc1c5
Merge branch 'wip-MDL-30797-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
2013-01-14 15:26:25 +08:00
Adrian Greeve
e25a7aa27e
MDL-30797 - backup groups: Added a parameter to the groups_assign_grouping function.
...
$timeadded has now been included so that the backup / restore functions can now use
this API rather than duplicating the code.
2013-01-14 15:15:19 +08:00
Adam Olley
a2bbc96b3e
MDL-30797 backup: Use correct API call for mapping groups to groupings on import/restore
2013-01-14 15:15:05 +08:00
Dan Poltawski
4012fc4994
Merge branch 'wip-mdl-29534-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2013-01-14 14:59:41 +08:00
Anthony Borrow
b31f52340c
MDL-15930 - admin: reorganize logic to allow ->fullnamedisplay to be used as default sort.
2013-01-14 10:39:05 +08:00
Jason Fowler
3c9148d6d1
MDL-35818 - Enrolment - Changing all enrolment method icon alt text attributes to include the name of the course
2013-01-14 09:47:21 +08:00
Sam Hemelryk
0aa5236143
Merge branch 'MDL-37048-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
2013-01-14 14:08:02 +13:00
Davo Smith
bdc678a409
MDL-35568 course dndupload - resources created with the same visibility as the section they are dragged onto
2013-01-14 13:55:55 +13:00
Sam Hemelryk
3434298385
Merge branch 'wip-MDL-35885-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE
2013-01-14 13:39:43 +13:00
Sam Hemelryk
7fa6857c3b
Merge branch 'MDL-36095-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
2013-01-14 12:23:37 +13:00
Sam Hemelryk
39bad86b14
Merge branch 'MDL-36511-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
2013-01-14 12:12:30 +13:00
Sam Hemelryk
e824c58aa8
Merge branch 'wip-MDL-36335-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
2013-01-14 11:43:29 +13:00
Sam Hemelryk
096bb297f7
Merge branch 'MDL-37397-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE
2013-01-14 11:04:28 +13:00
Sam Hemelryk
571c2784d6
Merge branch 'wip-mdl-35780-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2013-01-14 10:59:23 +13:00
Tim Hunt
6fc65ae5c3
MDL-31616 block editing: show in subcontexts does not work on category pages.
...
Thanks to Ian David Wild for pointing to the proper fix.
2013-01-11 22:01:04 +00:00
Eloy Lafuente (stronk7)
2713f92d62
Moodle release 2.3.4
2013-01-11 22:21:52 +01:00
Tim Hunt
d7f4c9c3f5
MDL-37485 plugins overview: require_login before _capability.
2013-01-11 13:03:42 +00:00
Tim Hunt
3daceb9d5c
MDL-37431 question preview: cron performance problem.
...
This query was performing badly. The solution seems to be to add a
redundant JOIN and WHERE to the subquery.
I renamed the table aliases in the subquery to avoid name collisions
elsewhere. I am afraid that makes the diff rather unhelpful. The
AND subq_qu.component = :qubacomponent2
line is new. The other lines have just had subq_ added.
2013-01-11 13:03:28 +00:00
Tim Hunt
df0c2e5fd3
MDL-37378 quiz restore: timecheckstate not in old backups.
...
We need to avoid a notice. If the value is missing, setting it to 0 is
fine. It will get sorted out the next time cron is run.
2013-01-11 13:03:10 +00:00
Tim Hunt
7d9ce8864a
MDL-37374 questions: use property_exists rather than isset
...
$a->field = null; isset($a->field) returns false, which is typical PHP.
I also improve the error handling a bit.
2013-01-11 13:02:55 +00:00
Andrew Robert Nicols
86132c35ad
MDL-37397 Test for a valid select in formautosubmit
...
Ideally we shouldn't get into this situation, but in cases where the
generated select element is incorrectly configured, we should try and
handle it gracefully with a warning.
2013-01-11 11:50:27 +00:00
Eloy Lafuente (stronk7)
dbee98b2e6
weekly release 2.3.3+
2013-01-11 12:33:07 +01:00
Michael Aherne
5a701d1fbe
MDL-27164 groups Do not show multiple instances of the same role as multiple
2013-01-11 11:17:11 +00:00
Eloy Lafuente (stronk7)
039cd4a52a
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
2013-01-11 12:16:51 +01:00
Eloy Lafuente (stronk7)
0eda863c21
MDL-37420 rework pg schema (partial backport take2)
2013-01-11 11:36:48 +01:00
Eloy Lafuente (stronk7)
fa02465c54
MDL-37420 rework pg schema (partial backport of 92b00c3
)
2013-01-11 10:34:19 +01:00
Jean-Michel Vedrine
517f7729ca
MDL-37313 Sample files with images for XML import
2013-01-11 09:44:56 +01:00
Jean-Michel Vedrine
eed2721b71
MDL-37313 Moodle XML import format should use draft file areas, not arrays
2013-01-11 09:44:55 +01:00
Andrew Robert Nicols
0a7c94b3d1
MDL-37413 Use correct variable in chooserdialogue
2013-01-11 08:20:14 +00:00
Ashley Holman
a34209d566
MDL-36616 repository: Fix direct linking to images in Flickr Public.
2013-01-11 15:33:37 +08:00
Jason Fowler
6df2ead050
MDL-35885 - Wiki - add a legend element to the search wikis form
2013-01-11 15:30:13 +08:00
Rossiani Wijaya
7f5290099f
MDL-34050 Lesson Module: improved matching question logic for checking user response. This patch will also resolved MDL-36343.
2013-01-11 13:51:13 +08:00
Rossiani Wijaya
f7109ce6d8
MDL-34050 Lesson module: Fixed undefined variable for $qtype
2013-01-11 13:50:29 +08:00
Joseph Rézeau
0fabd97928
MDL-34050: Lesson module: fixed matching answer format to use text
2013-01-11 13:50:20 +08:00
Damyon Wiese
975b2f7145
MDL-32341 calendar: get_file_by_hash() expects a hash
2013-01-11 11:56:46 +08:00
Rajesh Taneja
a786cf469d
MDL-35780 Administration: email display on user profile view page will respect user capability
2013-01-11 10:22:12 +08:00
Eloy Lafuente (stronk7)
72cb5eda5c
Merge branch 'MDL-37467-blogs_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE
2013-01-10 18:13:27 +01:00
David Mudrák
40440a5847
MDL-37467 Do not provide blog posts via RSS when blogging is disabled
2013-01-10 17:04:23 +01:00
Eloy Lafuente (stronk7)
b15e5d7252
Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
2013-01-10 11:14:07 +01:00
Mark Nelson
6f003159a2
MDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using count_records_sql incorrectly as well as generating RSS content when no data exists
2013-01-10 18:00:16 +08:00
Frederic Massart
ab4cb125e4
MDL-34435 reports: Log category actions
...
Conflicts:
course/lib.php
version.php
2013-01-10 15:14:18 +08:00
Andrew Robert Nicols
6b16846e83
MDL-36600 Add missing sesskey check when previewing the message
2013-01-10 10:20:36 +08:00
Dan Poltawski
8b9929247e
Revert "MDL-xxxx show appropriate instance status on user enrolments page"
...
This was incorrectly integrated
This reverts commit 0431cc0e16
.
2013-01-10 09:40:19 +08:00
Rajesh Taneja
20b556afa1
MDL-29534 Forum: if forum_replytouser is not set then send forum email using noreplyaddress.
2013-01-09 14:54:07 +08:00
Isaac Marco Blancas
3d68b9e954
MDL-29534 Forum: If forum_replytouser is not set then don't display from user email"
2013-01-09 14:54:06 +08:00
Jerome Mouneyrac
96ace848cc
MDL-37354 clean return value for each externallib PHPUnit tests
2013-01-09 14:00:48 +08:00
Aaron Barnes
7de454919b
MDL-36511 course: Save "completion starts on enrolment" disabled state
2013-01-09 15:36:38 +13:00
Dan Poltawski
fdd6de9177
Merge branch 'wip-MDL-36367-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE
2013-01-09 09:50:54 +08:00