Eric Merrill
d77731d612
MDL-35127 mod_assign More efficient use of expensive database queries
...
Moving two relatively expensive DB queries so they are only executed when needed
instead of on every function call. They will still only execute once, and not
repeatedly during execution of the loop.
2013-02-27 09:01:25 +08:00
Eloy Lafuente (stronk7)
738b0965a4
Merge branch 'wip-MDL-37356-master' of git://github.com/abgreeve/moodle
2013-02-26 18:12:15 +01:00
Eloy Lafuente (stronk7)
2c4293ce90
Merge branch 'wip-MDL-31885-smartcache' of git://github.com/marinaglancy/moodle
2013-02-26 13:23:34 +01:00
Eloy Lafuente (stronk7)
36650d6f51
Merge branch 'MDL-38076-master' of git://github.com/FMCorz/moodle
2013-02-26 10:14:28 +01:00
Eloy Lafuente (stronk7)
46e120c561
Merge branch 'MDL-37835-master' of git://github.com/damyon/moodle
2013-02-26 10:06:14 +01:00
Eloy Lafuente (stronk7)
9515c34ee6
Merge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle
2013-02-26 09:46:13 +01:00
Dan Poltawski
3a01c45ce9
Merge branch 'MDL-38115-master' of git://github.com/damyon/moodle
2013-02-26 13:36:24 +08:00
Dan Poltawski
d28d214167
Merge branch 'w08_MDL-38154_m25_delperf' of git://github.com/skodak/moodle
2013-02-26 11:08:52 +08:00
Damyon Wiese
be1ef2f35d
MDL-37792 Course - Fix upgrade step and set version number for completion field fix.
2013-02-26 10:49:46 +08:00
Damyon Wiese
b672408a1a
Merge branch 'MDL-37792-master' of git://github.com/sammarshallou/moodle
2013-02-26 10:45:21 +08:00
Sam Hemelryk
07ccb35731
Merge branch 'wip-MDL-38144-master' of git://github.com/marinaglancy/moodle
2013-02-26 15:43:26 +13:00
Dan Poltawski
84f72e28fd
Merge branch 'MDL-38161' of git://github.com/stronk7/moodle
2013-02-26 10:40:51 +08:00
Marina Glancy
96bc647755
MDL-31885 The activity name auto-linking filter should not create links to webpages it was created on
2013-02-26 13:35:24 +11:00
Adrian Greeve
b7d3bb0fc6
MDL-30669 - blocks: Unit tests for course_page_type_list()
2013-02-26 10:21:45 +08:00
Adrian Greeve
3dd204b1e6
MDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays set.
...
Also added a fix to the function course_page_type_list(). It was making a call to
get_context_info_array() which will generate an error if $currentcontext is not set.
2013-02-26 10:21:37 +08:00
Dan Poltawski
e7054f06e3
MDL-37455 - redirect for mod_folder course breaking changes
2013-02-26 10:06:29 +08:00
Damyon Wiese
115277060a
MDL-37835 Assignment unit tests - Do not fail if custom plugins are installed.
2013-02-26 09:09:53 +08:00
Damyon Wiese
9c986ee01d
MDL-38115 Assignment Unit tests : speedup (round 2)
2013-02-26 09:00:06 +08:00
Eloy Lafuente (stronk7)
fd6e1aaadb
Merge branch 'wip-MDL-38162-m25' of git://github.com/samhemelryk/moodle
2013-02-26 01:28:56 +01:00
Eloy Lafuente (stronk7)
64870338c4
Merge branch 'w08_MDL-37963_m25_usergen' of git://github.com/skodak/moodle
2013-02-26 01:25:58 +01:00
Eloy Lafuente (stronk7)
b1ed9f6970
Merge branch 'MDL-38141-m' of git://github.com/andrewnicols/moodle
2013-02-26 01:19:29 +01:00
Eloy Lafuente (stronk7)
c45593c6d8
Merge branch 'wip-MDL-38110-m25' of git://github.com/samhemelryk/moodle
2013-02-26 00:48:22 +01:00
Eloy Lafuente (stronk7)
1e171d4d37
Merge branch 'MDL-38090-m' of git://github.com/andrewnicols/moodle
2013-02-26 00:33:32 +01:00
Eloy Lafuente (stronk7)
2a80528fd6
Merge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle
2013-02-25 23:52:20 +01:00
Eloy Lafuente (stronk7)
8615b484b2
Merge branch 'MDL-38001-master' of git://github.com/mouneyrac/moodle
2013-02-25 23:51:20 +01:00
Eloy Lafuente (stronk7)
05fc7ccc82
Merge branch 'MDL-30098_master' of git://github.com/markn86/moodle
...
Conflicts:
course/tests/externallib_test.php
2013-02-25 23:38:20 +01:00
sam marshall
6fea7a5f02
MDL-37792 Conditions: Interests condition offered but not implemented
2013-02-25 13:19:56 +00:00
Petr Škoda
18fa4f4745
MDL-38154 do not hardcode sha1 hash of empty string
2013-02-25 10:10:57 +01:00
Damyon Wiese
a3e57810c6
Merge branch 'wip-MDL-36287-m25' of git://github.com/samhemelryk/moodle
2013-02-25 15:49:13 +08:00
Damyon Wiese
fffb9bbe64
Merge branch 'wip-MDL-38145-master' of git://github.com/marinaglancy/moodle
2013-02-25 15:42:13 +08:00
Dan Poltawski
2b32b2eea0
Merge branch 'wip-MDL-38163-m25' of git://github.com/samhemelryk/moodle
2013-02-25 15:39:30 +08:00
Damyon Wiese
a4a30222a0
MDL-37641 Version number bump for js changes.
2013-02-25 15:25:01 +08:00
Damyon Wiese
61725199a9
Merge branch 'MDL-37641-master' of git://github.com/FMCorz/moodle
2013-02-25 15:23:19 +08:00
Adrian Greeve
cffc08a63d
MDL-37356 - mod_data: Database activity now uses format_float and unformat_float.
...
The longitude and latitude values were not using format_float and unformat_float.
Changes have been made to the manual entry of records, csv import of records, and the
display of these records.
2013-02-25 14:39:36 +08:00
Dan Poltawski
bbd045b9e6
Merge branch 'w08_MDL-38121_m25_plugincheck' of git://github.com/skodak/moodle
2013-02-25 14:34:07 +08:00
Dan Poltawski
f4e34c5ffb
Merge branch 'MDL-37770-master' of git://github.com/damyon/moodle
2013-02-25 14:32:01 +08:00
Dan Poltawski
e1350c61d1
Merge branch 'MDL-36832-master' of git://github.com/damyon/moodle
2013-02-25 14:19:36 +08:00
Damyon Wiese
44c3f54c92
Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle
2013-02-25 14:09:33 +08:00
Damyon Wiese
713b75916c
MDL-28692 Base theme - Version bump for css change
2013-02-25 13:50:01 +08:00
Damyon Wiese
c7cb130bce
Merge branch 'MDL-28692_master' of git://github.com/lazydaisy/moodle
2013-02-25 13:32:25 +08:00
Damyon Wiese
ac57ce753c
MDL-30072 Notes webservices - Fix one parameter description and bump version.
2013-02-25 13:14:18 +08:00
Damyon Wiese
cc7a1c8916
Merge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle
2013-02-25 12:37:56 +08:00
Damyon Wiese
7e6c674302
MDL-33934 MyMobile theme - Fix white space, indenting and file permissions
2013-02-25 12:24:55 +08:00
Damyon Wiese
23f7fed1e1
Merge branch 'MDL-33934_master' of git://github.com/lazydaisy/moodle
2013-02-25 12:10:06 +08:00
Dan Poltawski
b5457b4def
MDL-37455 lang - fix trailing whitespace
2013-02-25 12:05:16 +08:00
Dan Poltawski
92adcc1cf0
Merge branch 'wip-MDL-37455-master' of git://github.com/marinaglancy/moodle
2013-02-25 11:43:48 +08:00
Damyon Wiese
b625f85949
Merge branch 'MDL-38052_master' of git://github.com/kordan/moodle
2013-02-25 11:38:13 +08:00
Tim Lock
9ecded01cc
MDL-38113: Blind Marking grader email reveals submitters details
2013-02-25 11:13:25 +08:00
Dan Poltawski
24ace4b795
Merge branch 'wip-MDL-38091-master' of git://github.com/marinaglancy/moodle
2013-02-25 11:00:03 +08:00
Damyon Wiese
dbfe8e26ee
Merge branch 'w08_MDL-38042_m25_flatroles' of git://github.com/skodak/moodle
2013-02-25 10:50:38 +08:00