Rajesh Taneja
a7a1e05ff9
MDL-29534 Forum: if forum_replytouser is not set then send forum email using noreplyaddress.
2013-01-09 14:50:32 +08:00
Jerome Mouneyrac
fb695f6e3d
MDL-37354 clean return value for each externallib PHPUnit tests
2013-01-09 13:47:01 +08:00
Frederic Massart
1017426c26
MDL-32639 phpunit: Hack not to fail on debugging
2013-01-09 11:48:44 +08:00
Aaron Barnes
16d89d6604
MDL-36511 course: Save "completion starts on enrolment" disabled state
2013-01-09 15:29:57 +13:00
Sam Hemelryk
a0af8cb8c3
Merge branch 'wip-MDL-37404-master' of git://github.com/marinaglancy/moodle
2013-01-09 14:35:09 +13:00
Eloy Lafuente (stronk7)
f9f750cecc
Merge branch 'w51_MDL-37420_m25_pgschema' of git://github.com/skodak/moodle
2013-01-09 01:32:09 +01:00
Eloy Lafuente (stronk7)
8361f557a1
Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle
...
Conflicts:
course/tests/courselib_test.php
2013-01-09 01:31:50 +01:00
Sam Hemelryk
7316589831
MDL-36904 mod_assign: Fixed whitespace issue
2013-01-09 12:33:29 +13:00
Sam Hemelryk
6f51092fbe
Merge branch 'MDL-35413-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assign/locallib.php
2013-01-09 11:59:43 +13:00
Paul Nicholls
0d47afe69d
MDL-37162: Use CSS to make mod show/hide icons not look "clickable" in hidden sections
...
Previously, the resource toolbox initialiser was using JS to find the show/hide icon, then find its section ancestor, then check if the section was hidden - only to pointlessly set pointer:auto if it was. That didn't meet the aim stated in the comments ("Disable" show/hide icons (change cursor to not look clickable) if section is hidden), but this patch meets that goal with a single CSS rule.
2013-01-09 11:44:15 +13:00
Eloy Lafuente (stronk7)
e801c74c54
Merge branch 'w51_MDL-37183_m25_excelcleanup' of git://github.com/skodak/moodle
2013-01-08 23:30:19 +01:00
Eloy Lafuente (stronk7)
c68f339e5e
Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle
2013-01-08 23:25:34 +01:00
Eloy Lafuente (stronk7)
ac4c7aed68
Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle
...
Conflicts:
lib/odslib.class.php
2013-01-08 23:11:54 +01:00
Sam Hemelryk
3913743aa3
Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle
2013-01-09 10:20:46 +13:00
Sam Hemelryk
5ba45e34bb
Merge branch 'wip-MDL-35842-master' of git://github.com/phalacee/moodle
2013-01-09 10:07:16 +13:00
Sam Hemelryk
21117c9d17
Merge branch 'wip-MDL-35891-master' of git://github.com/phalacee/moodle
2013-01-09 09:41:00 +13:00
Sam Hemelryk
086e78da69
MDL-36357 cache: removed double semicolon
2013-01-09 09:37:09 +13:00
Sam Hemelryk
f44e7d0a77
Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
...
Conflicts:
user/view.php
2013-01-09 09:34:22 +13:00
Andrew Robert Nicols
60fb0ef8a9
MDL-36600 user: improve course messaging checks
2013-01-09 09:21:35 +13:00
Eloy Lafuente (stronk7)
4f90540e0c
Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle
2013-01-08 18:01:43 +01:00
Petr Škoda
59706ff6c7
MDL-37420 add support for db schemas in auth test
2013-01-08 17:20:42 +01:00
Petr Škoda
917fddb5e2
MDL-37420 add support for db schemas in enrol test
2013-01-08 17:20:26 +01:00
Petr Škoda
6ad8d762da
MDL-37420 add support for more PostgreSQL schemas
2013-01-08 17:12:31 +01:00
sam marshall
aebe9db07f
MDL-37395 Add .jar filetype so Moodle doesn't incorrectly call it a zip file
2013-01-08 12:49:23 +00:00
Jean-Michel Vedrine
d55399a098
MDL-28183 fix for problem during integration
...
Conflicts:
question/type/multianswer/question.php
2013-01-08 12:03:48 +01:00
Eloy Lafuente (stronk7)
f9ba4fd83b
Merge branch 'MDL-37220_dnd_icon' of git://github.com/davosmith/moodle
2013-01-08 11:54:19 +01:00
Eloy Lafuente (stronk7)
a74c3851f7
Merge branch 'w51_MDL-37284_m25_mysqlutf8' of git://github.com/skodak/moodle
2013-01-08 11:39:23 +01:00
Andrew Robert Nicols
98e1ff5f9f
MDL-37173 Stop attempting to set User-Agent from core JS
...
This leads to some browsers throwing warnings that it is unsafe to set the
User-Agent. It doesn't help us in any way particularly either.
2013-01-08 09:55:44 +00:00
Eloy Lafuente (stronk7)
783a51ba48
Merge branch 'w51_MDL-37291_m25_paypalrestore' of git://github.com/skodak/moodle
2013-01-08 10:51:49 +01:00
Eloy Lafuente (stronk7)
cf78070a63
Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle
2013-01-08 10:34:04 +01:00
Eloy Lafuente (stronk7)
b315a45274
Merge branch 'w51_MDL-37323_m25_dlgstrings' of git://github.com/skodak/moodle
2013-01-08 10:21:50 +01:00
Andrew Robert Nicols
a6d96f27e8
MDL-37415 Fix JSHint issues for moodle-core-chooserdialogue
2013-01-08 08:57:08 +00:00
Dan Poltawski
6c8d7fed66
Merge branch 'w51_MDL-7537_m25_paypalcur' of git://github.com/skodak/moodle
2013-01-08 16:49:47 +08:00
Dan Poltawski
6d0a62bc37
MDL-3941 - version bump for TLS support in ldap
2013-01-08 16:42:47 +08:00
Dan Poltawski
6c74a228f3
Merge branch 'wip_master_mdl-3941_add_support_for_LDAP_TLS' of git://github.com/iarenaza/moodle
2013-01-08 16:40:50 +08:00
Jerome Mouneyrac
c2bc5a7008
MDL-37194 activity chooser displays entire list of default activities/resources
2013-01-08 16:39:55 +08:00
Jerome Mouneyrac
c5f7628d39
MDL-37381 core_external::get_component_strings returns wrong format value
2013-01-08 16:23:24 +08:00
Isaac Marco Blancas
228e09cdd1
MDL-29534 Forum: If forum_replytouser is not set then don't display from user email"
2013-01-08 16:16:02 +08:00
Dan Poltawski
655b566b9e
Merge branch 'w51_MDL-37299_m25_manselfprogress' of git://github.com/skodak/moodle
2013-01-08 15:08:05 +08:00
Dan Poltawski
1a12cbd9df
Merge branch 'w51_MDL-35685_m25_capinit_b' of git://github.com/skodak/moodle
2013-01-08 14:50:29 +08:00
Dan Poltawski
bfb5580f92
Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle
2013-01-08 14:46:14 +08:00
Dan Poltawski
81a38f50fb
Merge branch 'wip_master_mdl-28585_ldap_auth_doesnt_handle_password_expiration' of https://github.com/iarenaza/moodle
2013-01-08 14:40:15 +08:00
Dan Poltawski
c37c9e760d
Merge branch 'w51_MDL-37125_m25_yui380' of git://github.com/skodak/moodle
2013-01-08 14:29:32 +08:00
Dan Poltawski
397e4ecf76
Merge branch 'w51_MDL-37282_m25_tinymce358' of git://github.com/skodak/moodle
2013-01-08 14:26:52 +08:00
Dan Poltawski
df0b14c3b5
Merge branch 'w51_MDL-37303_m25_enrolinstancestatus' of git://github.com/skodak/moodle
2013-01-08 14:22:11 +08:00
Dan Poltawski
7f3e944aa1
Merge branch 'w51_MDL-37304_m25_authdbcleanup' of git://github.com/skodak/moodle
2013-01-08 14:15:22 +08:00
Jason Fowler
21c3b51e27
MDL-36620 - Blog, RSS - Preventing Guests from viewing the RSS of site level blogs
2013-01-08 14:06:32 +08:00
Ankit Agarwal
7a216229ab
MDL-37106 calendar: Proper capability checks should be done before processing an ical request
2013-01-08 14:03:38 +08:00
Jason Fowler
0232fa7b32
MDL-30316 - Libraries - improving pagination output to allow a shifting start page for displays of less than 18 pages -- original code provided by Martha (martha dot morelos at gmail dot com)
2013-01-08 14:02:06 +08:00
Dan Poltawski
d161e37488
Merge branch 'MDL-36738-master' of git://github.com/ankitagarwal/moodle
2013-01-08 13:57:47 +08:00