Dan Poltawski
1e031a4616
Merge branch 'MDL-40389' of git://github.com/stronk7/moodle
2013-07-02 15:52:58 +08:00
Damyon Wiese
f48f4827d1
Merge branch 'w27_MDL-40299_m26_textlib' of https://github.com/skodak/moodle
2013-07-02 15:23:38 +08:00
Dan Poltawski
fe6d32fcb3
Merge branch 'MDL-40282' of github.com:colchambers/moodle
2013-07-02 15:15:04 +08:00
Rajesh Taneja
38efca2315
MDL-40127 Enrolments: Updated version and update.txt
2013-07-02 14:35:35 +08:00
Rajesh Taneja
94b98dae64
MDL-40127 Enrolments: Added unit test
2013-07-02 14:35:34 +08:00
Rajesh Taneja
cc1b501595
MDL-40127 Enrolments: Added status to instance info and removed displaying of enrolment form with notice
...
get_enrol_info will return status of enrolment instance, to notify webservice if enrolment is possible or not
If enrolment is not possible then don't show enrolment form
show_enrolme_link will use can_self_enrol to varify if enrolment link should be shown or not.
2013-07-02 14:35:33 +08:00
Rajesh Taneja
85d1c53af4
MDL-40127 Enrolments: Abstracted self_enrolment code so as to be used by webservices
2013-07-02 14:35:33 +08:00
Damyon Wiese
1fd351c207
Merge branch 'wip-MDL-40353-master' of git://github.com/marinaglancy/moodle
2013-07-02 14:28:46 +08:00
Dan Poltawski
6e4de30636
Merge branch 'MDL-40039-master' of git://github.com/ankitagarwal/moodle
2013-07-02 14:27:49 +08:00
Dan Poltawski
20cea2c57f
Merge branch 'MDL-40297' of git://github.com/stronk7/moodle
2013-07-02 13:43:40 +08:00
Andreas Grabs
09c2ec4303
MDL-39570 mod_feedback - Missing privilege check
2013-07-02 13:37:10 +08:00
Dan Poltawski
b25cd1f3d5
Merge branch 'w27_MDL-40399_m26_msarrayshift' of https://github.com/skodak/moodle
2013-07-02 13:34:09 +08:00
Dan Marsden
612fdeb24e
MDL-39628 Chat: check mod/chat:chat capability when using daemon.
...
Thanks to Francois Gauthier for report/fix.
2013-07-02 12:20:29 +08:00
Damyon Wiese
021beab522
MDL-26943 Add db/subplugins.php to the local plugin readme.txt
2013-07-02 12:02:33 +08:00
Damyon Wiese
a57885a651
Merge branch 'w27_MDL-26943_m26_localsubplugins' of https://github.com/skodak/moodle
2013-07-02 11:00:33 +08:00
Jason Fowler
e73cb1acb8
MDL-37818 - RSS - Prevent access to blocks while RSS context errors are displayed
2013-07-02 10:03:41 +08:00
Dan Poltawski
ad3ebb8f5f
Merge branch 'w27_MDL-40266_m26_arrayshift' of https://github.com/skodak/moodle
2013-07-02 09:55:20 +08:00
Eloy Lafuente (stronk7)
9a6a2d1ce0
Merge branch 'get_users_by_capability_fix_master' of http://github.com/timgus/moodle
2013-07-02 00:46:30 +02:00
Eloy Lafuente (stronk7)
c6638cd6ce
Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle
2013-07-02 00:43:31 +02:00
Sam Hemelryk
93b2977d9d
Merge branch 'MDL-39733' of git://github.com/stronk7/moodle
2013-07-02 10:31:48 +12:00
Eloy Lafuente (stronk7)
2e746b72be
MDL-39733 xhprof: implement import of runs
2013-07-02 00:28:47 +02:00
Rossiani Wijaya
a4a2ddfbf1
MDL-39546 Lesson module: removed duplicate to decode special characters
2013-07-02 09:37:12 +12:00
Rossiani Wijaya
f6b6cef8c0
MDL-39546 Lesson module: fixed matching question issues.
2013-07-02 09:37:01 +12:00
Eloy Lafuente (stronk7)
dfd851be7c
Merge branch 'w27_MDL-39754_m26_evn26' of https://github.com/skodak/moodle
2013-07-01 23:13:39 +02:00
Eloy Lafuente (stronk7)
e4bb5050a6
Merge branch 'MDL-40370' of git://github.com/timhunt/moodle
2013-07-01 18:01:32 +02:00
Tim Hunt
dc7c9ab222
MDL-40370 qtype_shortanswer: unique index upgrade problem.
...
Eliminate duplicate rows before we try to add a unique index. We
arbitrarily keep the duplicate row with the lowest id.
2013-07-01 11:18:16 +01:00
Petr Škoda
f0fdbc5cc8
MDL-39754 copy 2.5 requirements to Moodle 2.6
...
Optional features and warnings may be added later,
but we need at least required environment for 2.5.1
This includes database family cleanup and more realistic memory requirement.
2013-07-01 09:44:02 +02:00
Petr Škoda
7aed7f46ab
MDL-40266 improve emulate_bound_params() for mssql driver
...
Looping over large numbers of items with array_shift() is expensive.
Reverse the array and fetch items from the top of the pile.
Credit goes to Martin Langhoff for original mysqli fix.
2013-07-01 08:52:03 +02:00
Petr Škoda
b983901d48
MDL-40266 improve emulate_bound_params() for sqlsrv driver
...
Looping over large numbers of items with array_shift() is expensive.
Reverse the array and fetch items from the top of the pile.
Credit goes to Martin Langhoff for original mysqli fix.
2013-07-01 08:51:35 +02:00
Dan Poltawski
91d445db9a
Merge branch 'wip-MDL-39212-m26' of git://github.com/samhemelryk/moodle
2013-07-01 11:55:45 +08:00
Mark Nielsen
aa74cccb06
MDL-40308: Privacy settings do not change
...
Update LTI mod form so checkboxes always submit their value.
2013-07-01 11:27:50 +08:00
Dan Poltawski
536a240891
Merge branch 'wip-MDL-40344-m26' of git://github.com/samhemelryk/moodle
2013-07-01 11:21:47 +08:00
Sam Hemelryk
6ee9989d25
Merge branch 'MDL-40069' of git://github.com/timhunt/moodle
2013-07-01 13:48:05 +12:00
Sam Hemelryk
e4123e7235
NOBUG: fixed whitespace
2013-07-01 13:24:27 +12:00
Sam Hemelryk
e962fe0871
Merge branch 'wip-MDL-39741-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-07-01 13:22:27 +12:00
Sam Hemelryk
88abda50aa
Merge branch 'MDL-35206-email-links' of git://github.com/mudrd8mz/moodle
2013-07-01 13:08:31 +12:00
Sam Hemelryk
4d6f35cefa
MDL-19390 user: fixed typo during integration
2013-07-01 09:16:59 +12:00
Martin Langhoff
4f3e38e745
MDL-40266 improve emulate_bound_params() for mysqli
...
Looping over large numbers of items with array_shift() is expensive.
Reverse the array and fetch items from the top of the pile.
2013-06-30 18:25:14 +02:00
Eloy Lafuente (stronk7)
4aad6f022d
MDL-40389 Test "parent" course/category generators
...
Verify that the category->parent switchers for
course & category behat generators are happening
as expected. Use the manage courses page for that.
2013-06-30 18:07:52 +02:00
Petr Škoda
483b680413
MDL-19390 add new option to send password to new users
2013-06-30 11:10:17 +02:00
Petr Škoda
3601c5f09c
MDL-26943 implement subplugin support for local plugins
2013-06-30 09:18:35 +02:00
Tim Hunt
dc38c5b4e0
MDL-40069 question/type/upgrade.txt editing changes
...
Try to more clearly document what question type authors need to do to
upgrade their question types.
2013-06-28 18:02:26 +01:00
Colin Chambers
e686516759
MDL-40069 Document editing form changes
2013-06-28 18:02:25 +01:00
David Mudrák
a7182af94a
MDL-35206 Fix the links list enumeration in the html2text library
2013-06-28 13:10:10 +02:00
Colin Chambers
4704eda0f0
MDL-40282 Collapsible editor loses border in IE8-9
2013-06-28 11:18:28 +01:00
Sam Hemelryk
1eb2b51703
MDL-39212 css: we now chunk and no longer separate
2013-06-28 16:49:02 +12:00
Ankit Agarwal
57d16acd74
MDL-40039 webservices: Add support for alternate to contextid parameter to core_files_external::upload()
2013-06-28 10:51:01 +08:00
Eloy Lafuente (stronk7)
2e07539699
MDL-39733 profiling: UI for importing runs
2013-06-28 04:46:40 +02:00
Eloy Lafuente (stronk7)
1d3d4d1376
MDL-39733 profiling: UI for exporting runs
2013-06-28 04:46:40 +02:00
Eloy Lafuente (stronk7)
e36a3e3643
MDL-39733 xhprof: implement export of runs
2013-06-28 04:46:39 +02:00