Sam Hemelryk
2fcd79c043
Merge branch 'MDL-21572-master' of git://github.com/FMCorz/moodle
2012-07-18 09:41:42 +12:00
Frederic Massart
61c8e0d75f
MDL-21572 Gradebook: Do not export fields when missing permissions
2012-07-18 12:56:57 +08:00
Sam Hemelryk
4d9f21a27e
Merge branch 'MDL-33874-master-2' of git://git.luns.net.uk/moodle
2012-07-18 09:33:00 +12:00
Aparup Banerjee
816ac8dfb5
Merge branch 'MDL-33767-master' of git://github.com/FMCorz/moodle
2012-07-17 17:22:48 +08:00
Frederic Massart
5946d376cb
MDL-33767 Course: General section displays its title when required
2012-07-18 17:13:11 +08:00
Sam Hemelryk
c1483c9c6c
Merge branch 'MDL-32919-core_course_import_course' of git://github.com/jleyva/moodle
...
Conflicts:
version.php
2012-07-17 17:38:16 +12:00
Dan Poltawski
239311aaad
Merge branch 'MDL-34083' of git://github.com/jleyva/moodle
2012-07-17 13:11:07 +08:00
Sam Hemelryk
51625c4662
Merge branch 'MDL-33575' of git://github.com/rwijaya/moodle
2012-07-17 15:50:19 +12:00
Rossiani Wijaya
f92547f81c
MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results
2012-07-17 10:18:39 +08:00
David Monllaó
8f80180de6
MDL-30876 filter_mediaplugin Wrapping the style sheets access with try & catch
...
Conflicts:
lib/javascript-static.js
2012-07-17 12:20:35 +12:00
Dan Poltawski
6039dc55fb
MDL-8249 install.xml - fixup use of editor
...
Thanks Andrew
2012-07-17 07:55:38 +08:00
Dan Poltawski
648c1ad194
Merge branch 'MDL-34187' of git://github.com/timhunt/moodle
2012-07-16 15:57:21 +08:00
Dan Poltawski
7e867bb39f
Merge branch 'MDL-26587' of git://github.com/nebgor/moodle
2012-07-16 15:50:44 +08:00
Andrew Robert Nicols
35ee775882
MDL-33874 Don't warn about focussed form fields with the ignoredirty class
2012-07-16 08:08:05 +01:00
Dan Poltawski
0e7dd4f672
Merge branch 'MDL-23219' of git://github.com/timhunt/moodle
2012-07-16 14:32:48 +08:00
Dan Poltawski
2c42d088dd
Merge branch 'wip-mdl-33616' of git://github.com/rajeshtaneja/moodle
2012-07-16 14:28:59 +08:00
Dan Poltawski
0af076a215
Merge branch 'wip-mdl-30798' of git://github.com/rajeshtaneja/moodle
2012-07-16 14:26:01 +08:00
Rajesh Taneja
08d32575e1
MDL-33616 Maths filter: Addded --halt-on-error swtich for latex to stop execution, if any error is encountered
2012-07-16 14:24:34 +08:00
Rajesh Taneja
8450069ad4
MDL-30798 Blog: link param for entries about this course link is fixed
2012-07-16 14:10:27 +08:00
Dan Poltawski
bea8b7454e
Merge branch 'MDL-22259b' of git://github.com/srynot4sale/moodle
2012-07-16 11:57:04 +08:00
Dan Poltawski
3d1b3a87a2
Merge branch 'MDL-31622-master' of git://github.com/FMCorz/moodle
2012-07-16 11:34:16 +08:00
Fred Woolard
ce6ab1b96b
MDL-34211 Use the $table_name argument to check against $metatables key values
2012-07-16 11:16:55 +08:00
Dan Poltawski
30a3059e79
Merge branch 'wip-MDL-34220-m24' of git://github.com/samhemelryk/moodle
2012-07-16 11:11:36 +08:00
Dan Poltawski
3c309ba6a4
Merge branch 'w29_MDL-34271_m24_mysqlcollation' of git://github.com/skodak/moodle
2012-07-16 11:00:48 +08:00
Dan Poltawski
9bc01a164a
Merge branch 'MDL-34164' of git://github.com/timhunt/moodle
2012-07-16 10:05:43 +08:00
Dan Poltawski
3f728cdbbe
Merge branch 'wip-MDL-33720-m24' of git://github.com/samhemelryk/moodle
2012-07-16 10:01:15 +08:00
Dan Poltawski
c9e084dd3a
Merge branch 'wip-MDL-34213-master' of git://github.com/marinaglancy/moodle
2012-07-16 09:54:54 +08:00
Sam Hemelryk
775d977710
Merge branch 'MDL-33624' of git://github.com/danpoltawski/moodle
2012-07-16 13:51:07 +12:00
Sam Hemelryk
ad882e0e41
Merge branch 'master_MDL-34133' of git://github.com/danmarsden/moodle
2012-07-16 13:44:58 +12:00
Kanika Goyal
961f66fbc6
MDL-34133 Plagiarism API - remove stored_file to make it more flexible for content.
2012-07-16 13:27:40 +12:00
Sam Hemelryk
4208d29749
Merge branch 'MDL-34214_dndupload_preview_element' of git://github.com/davosmith/moodle
2012-07-16 12:05:34 +12:00
Sam Hemelryk
5d827a7125
Merge branch 'MDL-26145_master' of git://github.com/dmonllao/moodle
2012-07-16 11:57:48 +12:00
Sam Hemelryk
78f15d33bb
Merge branch 'MDL-28155_master' of git://github.com/dmonllao/moodle
2012-07-16 11:50:35 +12:00
Sam Hemelryk
2ec3484dbe
Merge branch 'MDL-32310' of git://github.com/danpoltawski/moodle
2012-07-16 11:01:09 +12:00
Sam Hemelryk
7bac687d55
Merge branch 'MDL-34153' of git://github.com/danpoltawski/moodle
2012-07-16 10:44:11 +12:00
Sam Hemelryk
b0965de588
Merge branch 'MDL-34240' of git://github.com/danpoltawski/moodle
2012-07-16 10:37:53 +12:00
Sam Hemelryk
cbbdc7db2a
Merge branch 'master_MDL-32228_add_plagiarism_api_support_to_online_assignment_type' of git://github.com/kanikagoyal/moodle
2012-07-16 10:35:34 +12:00
Sam Hemelryk
c9f6b1af5d
Merge branch 'master_MDL-32229_add_plagiarism_api_support_to_forum' of git://github.com/kanikagoyal/moodle
2012-07-16 10:25:36 +12:00
Fred Woolard
b9609850f6
MDL-34072: Adjust SQL for Oracle. Remove subquery alias altogether.
2012-07-16 10:12:20 +12:00
Sam Hemelryk
c6e94095be
Merge branch 'MDL-34258' of git://github.com/netspotau/moodle-mod_assign
2012-07-16 09:57:45 +12:00
Sam Hemelryk
5c4907e987
Merge branch 'MDL-27563-master' of https://github.com/mackensen/moodle
2012-07-16 09:39:22 +12:00
Sam Hemelryk
5b5745daa3
Merge branch 'wip-MDL-33841-master' of https://github.com/barbararamiro/moodle
2012-07-16 09:35:24 +12:00
Ashley Holman
081ebacfe9
MDL-34309: Fix broken postgres unix sockets in core_adodb_testcase::test_read_table
2012-07-16 09:31:10 +12:00
Sam Hemelryk
11f8318ccc
Merge branch 'MDL-33874-master-1' of git://git.luns.net.uk/moodle
2012-07-16 09:25:21 +12:00
Sam Hemelryk
8fcf6d22bd
Merge branch 'MDL-33788b' of git://github.com/srynot4sale/moodle
2012-07-16 09:18:56 +12:00
Tim Hunt
2cdcb90553
MDL-34164 quiz reports: only try to show graphs if GD is installed.
...
if (empty($CFG->gdversion)) { seems to be the common idiom for this.
I refactored the graph output into the renderer, to avoid having to
duplicate that test three times.
2012-07-14 09:20:04 +01:00
Tim Hunt
ddda79ca5f
MDL-34257 quiz 'secure' window: does not close automatically.
2012-07-13 18:02:20 +01:00
Tim Hunt
ab0c7007c5
MDL-23219 check permissions: show relevant role-assignments.
...
Adding this list of role assignments should make it much easier for
admins to work out why, when the permissions shown in the check
permisisons page are now what they expect.
I thought about making the links go more directly to, for example, the
assign roles pages for each context, but because of things like
enrolments in courses that is hard. It is only two clicks to go to the
context, then click the right link in the settings block there.
I also re-orderd some of the code in check.php to try to get all the DB
code before all the output code.
2012-07-13 15:16:57 +01:00
Juan Leyva
3dfc29e194
MDL-34083 Fixing the param type also after deleting the invalid option
2012-07-13 11:31:44 +03:00
Marina Glancy
0c2fe3aac1
MDL-34213 fixed mistype causing wrong link in some browsers
2012-07-13 16:12:17 +08:00