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
58,415 Commits 36 Branches 519 Tags
Commit Graph

58415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
37f3f3ac73 Merge branch 'wip-MDL-30316-master' of git://github.com/phalacee/moodle 2013-01-15 12:46:44 +08:00
Dan Poltawski
b1be977406 Merge branch 'w02_MDL-29596_m25_editauth' of git://github.com/skodak/moodle 2013-01-15 12:43:59 +08:00
Dan Poltawski
aa452f97e3 Merge branch 'MDL-29835_master' of git://github.com/pauln/moodle 2013-01-15 12:41:13 +08:00
Dan Poltawski
97f236e747 Merge branch 'MDL-32341-master' of git://github.com/ankitagarwal/moodle 2013-01-15 12:38:22 +08:00
Dan Poltawski
28cfdfe180 Merge branch 'MDL-37366-master' of git://github.com/andrewnicols/moodle 2013-01-15 12:10:10 +08:00
Dan Poltawski
fb8585521a Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle 2013-01-15 11:56:12 +08:00
Dan Poltawski
4a489ba465 Merge branch 'MDL-36616-master' of git://github.com/FMCorz/moodle 2013-01-15 11:48:11 +08:00
Dan Poltawski
33919cca60 MDL-37085 - fix trailing whitespace 2013-01-15 11:42:30 +08:00
Sam Hemelryk
c8d3475e17 Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle 2013-01-15 16:30:36 +13:00
Dan Poltawski
0a9b944a15 Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/locallib.php
 2013-01-15 11:19:40 +08:00
Dan Poltawski
a0ea4d9fe1 Merge branch 'MDL-37415-m' of git://github.com/andrewnicols/moodle 2013-01-15 11:09:27 +08:00
Dan Poltawski
121d7a3f7d Merge branch 'MDL-37413-m' of git://github.com/andrewnicols/moodle 2013-01-15 10:58:31 +08:00
Dan Poltawski
2254fb2764 Merge branch 'MDL-37194-master' of git://github.com/mouneyrac/moodle 2013-01-15 10:42:31 +08:00
Marina Glancy
54258889f2 MDL-37085 added missing get_renderer call 2013-01-15 12:14:31 +11:00
Eloy Lafuente (stronk7)
ca2dfd0070 Merge branch 'MDL-37431' of git://github.com/timhunt/moodle 2013-01-15 00:16:18 +01:00
Eloy Lafuente (stronk7)
eaa00a071c Merge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle 2013-01-15 00:06:06 +01:00
Eloy Lafuente (stronk7)
fe25b31d44 Merge branch 'MDL-37456' of git://github.com/danpoltawski/moodle 2013-01-14 23:32:39 +01:00
Eloy Lafuente (stronk7)
f38ac3510a Merge branch 'w02_MDL-37483_m25_redirect' of git://github.com/skodak/moodle 2013-01-14 23:29:55 +01:00
Eloy Lafuente (stronk7)
b9bbc2a356 Merge branch 'MDL-37485' of git://github.com/timhunt/moodle 2013-01-14 23:21:38 +01:00
Sam Hemelryk
5a3d98c26d Merge branch 'wip-MDL-37206-master' of git://github.com/marinaglancy/moodle 2013-01-15 10:48:53 +13:00
Sam Hemelryk
2a6dbdcaee Merge branch 'MDL-37378' of git://github.com/timhunt/moodle 2013-01-15 10:43:08 +13:00
Sam Hemelryk
0fe5a201c0 Merge branch 'MDL-37030-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/locallib.php
	mod/assign/submission/onlinetext/locallib.php
 2013-01-15 10:37:54 +13:00
Sam Hemelryk
2d971403e6 MDL-31682 mod_assign: fixed since version on new service. 2013-01-15 10:27:40 +13:00
Sam Hemelryk
ddca5610d3 Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle 
Conflicts:
	mod/assign/version.php
 2013-01-15 10:21:20 +13:00
Sam Hemelryk
ccc89b8235 Merge branch 'w02_MDL-36514_m25_enableself' of git://github.com/skodak/moodle 2013-01-15 10:12:44 +13:00
Dan Poltawski
5c2aacc21c Merge branch 'MDL-37143-master' of git://github.com/mouneyrac/moodle 2013-01-14 15:34:29 +08:00
Dan Poltawski
9695b2a596 Merge branch 'wip-MDL-30797-master' of git://github.com/abgreeve/moodle 2013-01-14 15:26:09 +08:00
Dan Poltawski
b75d99239d Merge branch 'w02_MDL-37151_m25_mimetex' of git://github.com/skodak/moodle 2013-01-14 15:24:10 +08:00
Dan Poltawski
5590e85e1a Merge branch 'w02_MDL-37286_m25_tracebuffer' of git://github.com/skodak/moodle 2013-01-14 15:11:42 +08:00
Dan Poltawski
2e55217173 MDL-36297 - increment version no 2013-01-14 15:06:20 +08:00
Dan Poltawski
ddaf0983b2 Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle 2013-01-14 15:05:15 +08:00
Dan Poltawski
bf5f8a4f60 Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle 2013-01-14 14:59:22 +08:00
Marina Glancy
8afb1cc8f8 MDL-37206 preload course format renderer in course/view.php 
Also fixed bug with hardcoded default 'weeks' format
 2013-01-14 15:14:08 +11:00
Marina Glancy
7b59f5b32a MDL-37453 fixing regression from MDL-36550 - label show/hide in AJAX works incorrectly 2013-01-14 15:13:14 +11:00
Marina Glancy
9a36be7361 MDL-37085 Properly deprecated functions print_xxx() from course/lib.php 
- get_print_section_cm_text()
- print_section_add_menus()
- print_section()
- make_editing_buttons()
 2013-01-14 15:01:28 +11:00
Marina Glancy
c58a25d6eb MDL-37085 Move print_section() to the course renderer 
Added two functions in the renderer:
- core_course_renderer::course_section_cm_list()
- core_course_renderer::course_section_cm()
 2013-01-14 15:01:27 +11:00
Marina Glancy
ed513fad52 MDL-37085 partly moved code from print_section() to renderer 
- added function core_course_renderer::course_section_cm_name()
- added function core_course_renderer::course_section_cm_text()
- added function core_course_renderer::course_section_cm_availability()
 2013-01-14 15:01:26 +11:00
Marina Glancy
5c016ab30d MDL-37085 fixed mess with code overwriting cm_info properties 
In case when groupmode is forced by the course we should take it from the
course and not overwrite cm_info::groupmode externally
 2013-01-14 15:01:25 +11:00
Marina Glancy
7e29340f7c MDL-37085 Moved completion info box rendering code to renderer 
Was part of function print_section(), now it is
new function core_course_renderer::course_section_cm_completion()
 2013-01-14 15:01:24 +11:00
Marina Glancy
9a6aa5c17d MDL-37085 Substitute function print_section_add_menus() with core_course_renderer::course_section_add_cm_controls() 2013-01-14 15:01:23 +11:00
Marina Glancy
697ff99997 MDL-37085 Load modchooser only when needed 2013-01-14 15:01:23 +11:00
Marina Glancy
170793359a MDL-37085 get_module_metadata() now returns link as moodle_url instead of string 2013-01-14 15:01:22 +11:00
Marina Glancy
f89c53f679 MDL-37085 Substitute get_print_section_cm_text() with cm_info functions 2013-01-14 15:01:21 +11:00
Marina Glancy
f558b291c1 MDL-37085 separated logic and html in make_editing_buttons() 
- added function course_get_cm_edit_actions()
- added function core_course_renderer::course_section_cm_edit_actions()
- removed completely presently not working moveup/movedown controls
- removed not working duplicate controls from front page
 2013-01-14 15:01:20 +11:00
Marina Glancy
49aa038b4e MDL-37085 Minor UI and code improvements in print_section() 2013-01-14 15:01:19 +11:00
Adrian Greeve
51e8d287f9 MDL-30797 - backup groups: Added a parameter to the groups_assign_grouping function. 
$timeadded has now been included so that the backup / restore functions can now use
this API rather than duplicating the code.
 2013-01-14 10:24:37 +08:00
Adam Olley
fdcf4a5f37 MDL-30797 backup: Use correct API call for mapping groups to groupings on import/restore 2013-01-14 10:24:37 +08:00
Ankit Agarwal
af5d990b59 MDL-32341 calendar: calendar custom date range export 
Adding support to export calendar events for a custom date range based on admin settings
 2013-01-14 10:15:09 +08:00
Sam Hemelryk
110178c5c2 Merge branch 'MDL-37048-master' of git://github.com/ankitagarwal/moodle 2013-01-14 14:08:56 +13:00
Sam Hemelryk
f5c51a6d64 Merge branch 'MDL-35568_dndupload_hidden' of git://github.com/davosmith/moodle 2013-01-14 13:51:48 +13:00