Dan Poltawski
f186ad1f90
Merge branch 'wip-MDL-35339-master' of git://github.com/marinaglancy/moodle
2012-10-15 17:19:44 +08:00
Marina Glancy
44aa854e93
MDL-35339 coding style corrections
2012-10-15 16:57:25 +08:00
Aparup Banerjee
dd55ec309b
MDL-35418 fixed up whitespaces
2012-10-15 16:36:45 +08:00
Aparup Banerjee
43d333cb58
Merge branch 'master_MDL-35418' of git://github.com/danmarsden/moodle
2012-10-15 16:36:38 +08:00
Marina Glancy
2e4c0d05e1
MDL-35339 Fixing rebase with MDL-35634
2012-10-15 16:18:55 +08:00
Dan Poltawski
317db10e5d
Merge branch 'wip-MDL-35895-master' of git://github.com/marinaglancy/moodle
2012-10-15 16:07:24 +08:00
Dan Poltawski
348be850c9
Merge branch 'w42_MDL-35854_m24_usergenerator' of git://github.com/skodak/moodle
2012-10-15 16:03:53 +08:00
Dan Poltawski
a146ac13c1
Merge branch 'w42_MDL-35917_m24_cohortdoc' of git://github.com/skodak/moodle
2012-10-15 15:59:08 +08:00
Aparup Banerjee
353d6457b7
Merge branch 'MDL-31010-master' of git://github.com/ankitagarwal/moodle
2012-10-15 15:53:22 +08:00
Marina Glancy
dddbbac3f7
MDL-35661 Check that plugin is installed before including settings.php
2012-10-15 15:47:41 +08:00
Aparup Banerjee
8cbd15a761
Merge branch 'MDL-28965-master' of git://github.com/ankitagarwal/moodle
2012-10-15 15:17:44 +08:00
Aparup Banerjee
de5a44eb3a
Merge branch 'w42_MDL-36031_m24_messagesink' of git://github.com/skodak/moodle
2012-10-15 14:36:02 +08:00
Dan Marsden
d83566565c
MDL-35418 SCORM: always set children param even if empty. Always set incomplete param
2012-10-15 19:25:01 +13:00
Dan Marsden
995e322e75
MDL-35418 SCORM: remove dumb function, include sequencinglib.php as scorm_13lib.php still calls some of the functions.
2012-10-15 19:25:01 +13:00
Dan Marsden
92be6fa471
MDL-35418 SCORM: coding guideline tidy - removes a few unused vars as well.
2012-10-15 19:25:01 +13:00
Mayank Gupa
41e205cd8e
MDL-35418 SCORM: Improve SCORM 2004 support
...
GSOC project to improve SCORM 2004 support, includes MDL-32835 rewrite scorm_get_toc
2012-10-15 19:25:01 +13:00
Aparup Banerjee
af6b7edaee
Merge branch 'MDL-30845-master' of git://github.com/ankitagarwal/moodle
2012-10-15 14:21:11 +08:00
Marina Glancy
7f4550529a
MDL-35895 Correctly build return to course link in book module
2012-10-15 14:17:36 +08:00
Marina Glancy
b46be6adf4
MDL-35339 Better cache reset for get_fast_modinfo(), allow exec get_fast_modinfo($courseid)
2012-10-15 14:08:15 +08:00
Marina Glancy
38b19bbca1
MDL-35339 call rebuild_course_cache() always (and only) after changing course modules or sections
2012-10-15 14:08:14 +08:00
Marina Glancy
384c3510a9
MDL-35339 Course functions unit tests
2012-10-15 14:08:14 +08:00
Marina Glancy
4ede27b253
MDL-35339 deprecate get_course_section() replace with course_create_sections_if_missing()
...
By passing course object instead of course id we ensure proper cache reset"
2012-10-15 14:08:14 +08:00
Marina Glancy
9796014660
MDL-35339 added deprecated information in upgrade.txt
2012-10-15 14:08:14 +08:00
Marina Glancy
eda43c7d10
MDL-35339 Use get_fast_modinfo() in course sections display functions
...
- Avoid using field course_sections.sequence for retrieving the modules list, use functionality from
get_fast_modinfo() instead;
- In the following functions/methods mark arguments $mod, $modnames, $modnamesused and $sections as
not used because they can be taken any time from get_fast_modinfo():
- function print_section()
- protected function format_section_renderer_base::section_summary()
- private function format_section_renderer_base::section_activity_summary
- public function format_section_renderer_base::print_single_section_page
- public function format_section_renderer_base::print_multiple_section_page
2012-10-15 14:08:13 +08:00
Marina Glancy
d57aa283f7
MDL-35339 Deprecate get_all_mods() add get_module_types_names()
...
- added function get_module_types_names() returning the list of localised strings used for module names;
- added function cm_info::get_used_module_names();
- added magic properties cm_info:: and cm_info:: returning human readable module name;
- replaced usage of function get_all_mods() with get_fast_modinfo() and get_module_types_names();
- function print_section_add_menus() may now retrieve the modules names list itself;
- deprecated function get_all_mods()
2012-10-15 14:08:13 +08:00
Marina Glancy
722e6ba947
MDL-35339 Deprecate add_mod_to_section(), create new function course_add_cm_to_section()
...
Function add_mod_to_section() has very confusing arguments when object looks like record from
table course_modules but field ->section refers to relative section number (course_sections.section).
In table course_modules the field section refers to course_sections.id.
Also add_mod_to_section() does not update table course_modules and does not call rebuild_course_cache()
which developer can forget to do afterwards.
- Added function course_add_cm_to_section()
- In the core code add_mod_to_section() is replaced with course_add_cm_to_section()
- Function add_mod_to_section() is deprecated
2012-10-15 14:08:13 +08:00
Marina Glancy
99e9f9a69d
MDL-35339 deprecate function get_all_sections()
2012-10-15 14:08:13 +08:00
Marina Glancy
71a56e08c8
MDL-35339 avoid using get_all_sections(), get_all_mods() and field section.sequence directly
2012-10-15 14:08:13 +08:00
Ankit Agarwal
76b4a3d118
MDL-30845 formslib: Removing persistant true as its not needed anymore
2012-10-15 14:01:47 +08:00
Ankit Agarwal
83e9b8f9de
MDL-30845 formslib: Freeze should always be with persistantfreeze set to false since Frozen text fields are now rendered as input fields
2012-10-15 14:01:46 +08:00
Ankit Agarwal
3ec55b9e0a
MDL-30845 accessibility: changing the way input fields are rendered when they are not-editable
2012-10-15 14:01:46 +08:00
Dan Poltawski
6bea7da1ab
Merge branch 'wip-MDL-35661-master' of git://github.com/marinaglancy/moodle
2012-10-15 13:31:10 +08:00
Dan Poltawski
ecfe814e0f
on-demand release 2.4dev
2012-10-15 13:24:09 +08:00
Sam Hemelryk
d4797177b5
MDL-36047 cache: Fixed up issues with PHP 5.3.2 and 5.3.7
2012-10-15 12:35:23 +08:00
Eloy Lafuente (stronk7)
61bfc2c13b
weekly release 2.4dev
2012-10-15 00:21:38 +02:00
Eloy Lafuente (stronk7)
535c3e874f
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
2012-10-15 00:07:26 +02:00
Eloy Lafuente (stronk7)
990853afbe
Merge branch 'wip-MDL-25290-m24-compact' of git://github.com/samhemelryk/moodle
2012-10-14 23:32:40 +02:00
Petr Škoda
f763b33dba
MDL-36031 add unit tests for expiry notifications of manual enrolments
2012-10-13 21:21:53 +02:00
Petr Škoda
4c9e03f0ac
MDL-36031 implement message redirection for unit testing
2012-10-13 20:00:54 +02:00
Petr Škoda
e0db105bab
MDL-35917 fix cohort phpdocs
...
Credit goes to Brian Kremer, thanks!
2012-10-13 17:54:30 +02:00
Petr Škoda
fe67134eaa
MDL-35854 fix username generator
...
This eliminates infinite loop and also fixes potentially invalid email derived from usernames created from unicode first/last name.
2012-10-13 09:57:35 +02:00
Eloy Lafuente (stronk7)
2105f57590
Merge branch 'MDL-35858-master' of git://github.com/FMCorz/moodle
2012-10-12 02:15:34 +02:00
Ankit Agarwal
89eee2f36d
MDL-28965 administration: Updating description string for the setting navshowallcourses
2012-10-11 14:22:34 +08:00
Ankit Agarwal
b512b9dee2
MDL-31010 comments: setup_course should update if passed courseid is different from the cached one
2012-10-11 10:55:37 +08:00
Eloy Lafuente (stronk7)
28990bbef4
Merge branch 'MDL-35715-master' of git://git.luns.net.uk/moodle
2012-10-11 01:48:53 +02:00
Eloy Lafuente (stronk7)
566682e8e5
Merge branch 'w41_MDL-28980_m24_expirywarning' of git://github.com/skodak/moodle
2012-10-10 11:22:22 +02:00
Petr Škoda
9f4a3c73cd
MDL-28980 fix notification defaults to use new expirynotify combo logic
2012-10-10 11:19:10 +02:00
Eloy Lafuente (stronk7)
05c301a109
Merge branch 'w41_MDL-35691_m24_intsizes' of git://github.com/skodak/moodle
2012-10-10 10:58:22 +02:00
Petr Škoda
633f324896
MDL-35691 fix bogus mysql integer size detection
2012-10-10 10:33:18 +02:00
Eloy Lafuente (stronk7)
f6bfcaf6b3
Merge branch 'master_MDL-34848' of git://github.com/danmarsden/moodle
2012-10-10 09:57:00 +02:00