Sam Hemelryk
b874637025
MDL-25870 enrol-manual: Fixed pagination of AJAX search results for users when changing search
2011-07-13 14:02:30 +08:00
Sam Hemelryk
f50243edef
MDL-28137 unit tests: Fixed up problem with block manager tests when running unit tests after turning editing on
2011-07-13 13:44:45 +08:00
Sam Hemelryk
112c7f05b5
MDL-28205 RSS: Fixed up notice and set better pagelayout type on manage feeds page
2011-07-13 10:32:38 +08:00
Sam Hemelryk
c103eba85f
MDL-27696 datalib Fixed up misused params in get_logs_usercourse
2011-07-13 10:30:35 +08:00
Sam Hemelryk
c4afcf84d9
MDL-28040 navigation: Fixed up error with navigation when dealing with categories that have a lower sort order than the parent.
2011-07-13 09:58:42 +08:00
Eloy Lafuente (stronk7)
e62a947eec
Merge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle
2011-07-12 16:57:54 +02:00
Eloy Lafuente (stronk7)
dd8f2538b6
Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle
...
Conflicts:
mod/scorm/version.php
2011-07-12 16:28:36 +02:00
Eloy Lafuente (stronk7)
d703e3816f
MDL-28210 messaging: all includes but config.php must use $CFG-based abosolute paths
2011-07-12 12:17:34 +02:00
Eloy Lafuente (stronk7)
8654b65619
Merge branch 'MDL-28210_messaging_constants2' of git://github.com/andyjdavis/moodle
2011-07-12 12:16:16 +02:00
Andrew Davis (andyjdavis)
6366fdcc6c
MDL-28210 messaging: Fixed requires problems in /message/discussion.php
2011-07-12 10:46:59 +08:00
AMOS bot
84a4374683
Automatically generated installer lang files
2011-07-12 00:55:19 +00:00
Dan Marsden
59cdcb9770
MDL-28017 - SCORM unset old config var
2011-07-12 09:46:23 +12:00
David Mudrak
47f5964381
MDL-28221 Legacy resource URL pointing to the course itself are migrated as File module
...
This patch replays the logic of resource_20_migrate() function. If a
file is referred via URL to the course files of the course being
backed up, then such a resource is converted to the File module
(mod/resource) rather than URL module.
2011-07-11 23:30:28 +02:00
David Mudrak
498c722d0f
MDL-28221 resource: improved file not found handling
...
When the referenced file is not found, do not rely on the record in
resource_old as the resource can be actually restored from a 1.9 backup.
2011-07-11 23:30:28 +02:00
David Mudrak
c6c9a3bcdb
MDL-28221 resource: fixed a typo in variable names
2011-07-11 23:30:28 +02:00
Eloy Lafuente (stronk7)
d253e3cc90
Merge branch 'w27_MDL-28270_m22_cohortfilter' of git://github.com/skodak/moodle
2011-07-11 20:22:42 +02:00
Eloy Lafuente (stronk7)
701570b5e4
Merge branch 'master_MDL-26942' of git://github.com/danmarsden/moodle
2011-07-11 19:47:14 +02:00
Eloy Lafuente (stronk7)
8746aab856
Merge branch 'MDL-27755' of git://github.com/rwijaya/moodle
2011-07-11 19:41:00 +02:00
Eloy Lafuente (stronk7)
7660f09ee6
Merge branch 'MDL-27741' of git://github.com/rwijaya/moodle
2011-07-11 19:35:41 +02:00
Eloy Lafuente (stronk7)
fc75965b63
Merge branch 'w27_MDL-23344_m22_loginfocus' of git://github.com/skodak/moodle
2011-07-11 17:01:58 +02:00
Eloy Lafuente (stronk7)
2af4d0a27f
Merge branch 'MDL-23580' of git://git.luns.net.uk/moodle
2011-07-11 16:46:35 +02:00
Eloy Lafuente (stronk7)
3fe120a6c6
Merge branch 'MDL-26165' of git://github.com/timhunt/moodle
2011-07-11 16:32:17 +02:00
Eloy Lafuente (stronk7)
cf5b3dad05
Merge branch 'MDL-27483' of git://github.com/timhunt/moodle
2011-07-11 16:25:42 +02:00
Eloy Lafuente (stronk7)
97c5f85f37
Merge branch 'MDL-27931' of git://github.com/rwijaya/moodle
2011-07-11 15:56:22 +02:00
Eloy Lafuente (stronk7)
d5497dcc86
MDL-28109 scorm - new settings => version bump
2011-07-11 15:54:11 +02:00
Eloy Lafuente (stronk7)
2abfc1c630
Merge branch 'master_MDL-28109' of git://github.com/danmarsden/moodle
2011-07-11 15:42:21 +02:00
Eloy Lafuente (stronk7)
21ba26e814
Merge branch 'w27_MDL-28158_m22_cookies' of git://github.com/skodak/moodle
2011-07-11 15:33:03 +02:00
Eloy Lafuente (stronk7)
f046f96f05
Merge branch 'MDL-28186' of git://git.luns.net.uk/moodle
2011-07-11 15:20:56 +02:00
Eloy Lafuente (stronk7)
75853bc5a5
Merge branch 'w27_MDL-28279_m22_flash' of git://github.com/skodak/moodle
2011-07-11 12:06:22 +02:00
Eloy Lafuente (stronk7)
23e90aa5b8
Merge branch 'w27_MDL-28280_m22_usesid' of git://github.com/skodak/moodle
2011-07-11 12:01:34 +02:00
Rossiani Wijaya
0d3780a1e8
MDL-27741 forum subscribe link: Removed 'no' string in social course format to display a subscribe link if user is not enrolled
2011-07-11 17:07:55 +08:00
Sam Hemelryk
9c52c8a4b0
Merge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle
2011-07-11 16:20:03 +08:00
Sam Hemelryk
e2d1b25a5a
Merge branch 'w27_MDL-26965_m22_cohortuploaduser' of git://github.com/skodak/moodle
2011-07-11 16:11:50 +08:00
Sam Hemelryk
59772e4749
Merge branch 'wip-mdl-27954' of git://github.com/rajeshtaneja/moodle
2011-07-11 16:01:26 +08:00
Sam Hemelryk
9dae5179cb
Merge branch 'w27_MDL-22404_m22_cohortbulk' of git://github.com/skodak/moodle
2011-07-11 15:40:12 +08:00
Petr Skoda
56284322ea
MDL-22404 bulk user add to cohort
2011-07-11 09:20:45 +02:00
Sam Hemelryk
c430467ca8
Merge branch 'MDL-28195' of git://github.com/timhunt/moodle
2011-07-11 15:02:03 +08:00
Sam Hemelryk
48ae99cbaf
Merge branch 'w27_MDL-28273_m22_cohortremove' of git://github.com/skodak/moodle
2011-07-11 14:50:56 +08:00
Sam Hemelryk
3bbc7a0fc5
Merge branch 'w27_MDL-28278_m22_cohorticons' of git://github.com/skodak/moodle
2011-07-11 14:18:54 +08:00
Sam Hemelryk
42afcc172a
Merge branch 'wip-MDL-27429-master' of git://github.com/Beedell/moodle
2011-07-11 13:54:49 +08:00
Sam Hemelryk
c9d0d33174
Merge branch 'MDL-28268' of git://github.com/timhunt/moodle
2011-07-11 13:25:44 +08:00
Sam Hemelryk
ed21851b3c
Merge branch 'MDL-28192' of git://github.com/timhunt/moodle
2011-07-11 13:17:52 +08:00
Dan Marsden
6eca9e1c63
MDL-28017 SCORM - remove admin setting incorrectly added as it was never used.
2011-07-11 15:42:53 +12:00
Sam Hemelryk
7a5c6b98e1
Merge branch 'master_MDL-27947' of git://github.com/danmarsden/moodle
2011-07-11 11:31:13 +08:00
Sam Hemelryk
08d29fb18d
Merge branch 'MDL-27890_master' of git://github.com/stronk7/moodle
2011-07-11 11:25:21 +08:00
Sam Hemelryk
f7776c0fc8
Merge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle
2011-07-11 11:14:44 +08:00
Sam Hemelryk
c75d584dcc
Merge branch 'mod_url_decode_master' of git://github.com/stronk7/moodle
2011-07-11 11:02:41 +08:00
Sam Hemelryk
8b6c283f94
Merge branch 'backup_groups_master' of git://github.com/stronk7/moodle
2011-07-11 10:53:38 +08:00
Rajesh Taneja
ea2052ab8e
MDL-27954 mod_database - fixed search navigation link
2011-07-11 10:09:44 +08:00
Eloy Lafuente (stronk7)
b86f930647
MDL-28048 glossary - fix double ampersand & missing string
2011-07-11 01:36:30 +02:00
