moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58916 commits 37 branches 540 tags 1.3 GiB
Commit graph

58916 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tim Hunt
5574862063 MDL-36534 question editing: clean up lang strings. 
There were a number of lang strings in suboptimal places.
This commit fixes that, and also removed some unused strings.

AMOS BEGIN
 MOV [addmorechoiceblanks,qtype_multichoice],[addmorechoiceblanks,question]
 MOV [youmustenteramultiplierhere,qtype_calculated],[youmustenteramultiplierhere,qtype_numerical]
AMOS END
 2013-01-14 14:52:49 +00:00
Colin Chambers
c4b2600d4b MDL-36534 Quiz: Group question type unit fields 2013-01-14 14:37:37 +00:00
Rajesh Taneja
72b181ba59 MDL-36674 Administration: out_as_local_url will check for both http and https url's 
out_as_local_url will first check if url passed in wwwroot, if it's not then it will check
if loginhttps is enabled and url is httpswwwroot
 2013-01-14 15:59:06 +08: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
5dc1ca87b1 MDL-30998 added missing phpdocs 2013-01-14 15:14:54 +11:00
Marina Glancy
d22e9e32e4 MDL-30998: updated docblocks for advanced grading 2013-01-14 15:14:54 +11:00
Marina Glancy
fa4c60c1fe MDL-30998: updated docblocks for backup of advanced grading 2013-01-14 15:14:54 +11: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
a03dfb7dbe MDL-37207 Add modchoosertoggle in renderer to allow themes to override 2013-01-14 15:10:07 +11:00
Marina Glancy
ff233851a0 MDL-36967 Deprecate function print_overview() 2013-01-14 15:05:31 +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
Anthony Borrow
1a19194121 MDL-15930 - admin: reorganize logic to allow ->fullnamedisplay to be used as default sort. 2013-01-14 10:28:41 +08: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
Rossiani Wijaya
2e48a42419 MDL-34050 Lesson Module: improved matching question logic for checking user response. This patch will also resolved MDL-36343. 2013-01-14 10:16:35 +08:00
Rossiani Wijaya
fcb88d7d6d MDL-34050 Lesson module: Fixed undefined variable for $qtype 2013-01-14 10:16:35 +08:00
Joseph Rézeau
58b72abc6a MDL-34050: Lesson module: fixed matching answer format to use text 2013-01-14 10:16:34 +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
Rossiani Wijaya
6fc61f2d08 MDL-36554 Admin settings: make tables class consistent throughout admin settings 2013-01-14 10:10:54 +08:00
Rossiani Wijaya
f0e3fbb5dd MDL-36553 admin settings: removed commented out code and add generaltable class to frontpage filter settings 2013-01-14 10:09:52 +08:00
Rossiani Wijaya
8be244b2e2 MDL-36553 Admin settings: make tables class consistent throughout admin plugins setting 2013-01-14 10:09:51 +08:00
Jason Fowler
b4a7ce9e71 MDL-35818 - Enrolment - Changing all enrolment method icon alt text attributes to include the name of the course 2013-01-14 09:46:04 +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
Sam Hemelryk
8b2d3f1bef Merge branch 'wip-MDL-35885-master' of git://github.com/phalacee/moodle 2013-01-14 13:40:06 +13:00
Andrew Robert Nicols
699a13e1a6 MDL-37366 Fix JS Lint issues with moodle-core-formautosubmit 2013-01-13 23:58:04 +00:00
Sam Hemelryk
469749706a Merge branch 'MDL-36095-master' of git://github.com/sammarshallou/moodle 2013-01-14 12:24:06 +13:00