mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
57,070 Commits 36 Branches 519 Tags
Commit Graph

57070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
43c7341b82 Merge branch 'wip-MDL-32184-master' of http://github.com/phalacee/moodle 2012-10-16 10:48:23 +08:00
Aparup Banerjee
cb6b5fb625 Merge branch 'wip-MDL-35265-master' of git://github.com/abgreeve/moodle 
Conflicts:
	version.php
 2012-10-16 10:46:11 +08:00
Sam Hemelryk
a7aa82b3ac Merge branch 'MDL-35664-master' of git://github.com/FMCorz/moodle 2012-10-16 10:42:51 +08:00
Dan Poltawski
0651778e95 Merge branch 'MDL-32294-master' of git://github.com/FMCorz/moodle 2012-10-16 10:41:24 +08:00
Dan Poltawski
5def031e6f Merge branch 'MDL-32092' of git://github.com/rwijaya/moodle 2012-10-16 10:37:52 +08:00
Sam Hemelryk
d6361e618a Merge branch 'MDL-35892-master' of git://github.com/FMCorz/moodle 2012-10-16 10:31:56 +08:00
Dan Poltawski
5f7ac316fb MDL-21801 - mod_lesson: version bump 
To reflect the new (ppt-less) state
 2012-10-16 10:30:45 +08:00
Dan Poltawski
399fd63052 Merge branch 'MDL-21801_b' of git://github.com/rwijaya/moodle 2012-10-16 10:29:49 +08:00
Sam Hemelryk
efd6156e4d Merge branch 'MDL-35726' of git://github.com/netspotau/moodle-mod_assign 2012-10-16 10:16:26 +08:00
Sam Hemelryk
ee17d12db1 Merge branch 'wip-MDL-25275-master' of git://github.com/abgreeve/moodle 2012-10-16 10:11:04 +08:00
Damyon Wiese
f42010d10d MDL-35711: Minor comment formatting fixes. 2012-10-16 10:08:36 +08:00
Ruslan Kabalin
184a5ef9e5 MDL-35711 mod_assign Trigger submission event when submit button click is not requred 2012-10-16 10:08:32 +08:00
Dan Poltawski
eb214fdb4e MDL-35710 - mod_assign: bump version for new events 2012-10-16 10:04:59 +08:00
Dan Poltawski
eed6cd1987 Merge branch 'MDL-35710' of git://github.com/netspotau/moodle-mod_assign 2012-10-16 10:01:46 +08:00
Dan Poltawski
dab6b11914 Merge branch 'w42_MDL-35955_m24_geckospell' of git://github.com/skodak/moodle 2012-10-16 09:57:30 +08:00
Damyon Wiese
e197970021 MDL-36064: Assignment revert to draft causes error with Team assignment changes 2012-10-16 09:49:29 +08:00
Dan Poltawski
e7dcead4de Merge branch 'MDL-35655' of git://github.com/itamart/moodle 2012-10-16 09:49:28 +08:00
AMOS bot
caea6920a1 Merge branch 'master' into install_master 2012-10-16 00:34:54 +00:00
Nadav Kavalerchik
b801e460d9 MDL-35583 - blocks header and footer right align fixes, profile picture right align (update) 2012-10-15 11:20:49 +02:00
Dan Poltawski
f186ad1f90 Merge branch 'wip-MDL-35339-master' of git://github.com/marinaglancy/moodle 2012-10-15 17:19:44 +08:00
Mark Nielsen
ac1f907e77 MDL-34837 backup: Restore does not fail when some courses have the same name 2012-10-15 17:18:34 +08:00
Marina Glancy
44aa854e93 MDL-35339 coding style corrections 2012-10-15 16:57:25 +08:00
Rajesh Taneja
5ad8935f45 MDL-29762 Blocks: Modified checks to show image in html block 2012-10-15 16:53:55 +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
a49e2ea7e6 MDL-35769 Course formats: Added function format_base::default_blocks() to replace format config.php 2012-10-15 14:14:33 +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