mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 09:30:17 +01:00
Code Issues Projects Releases Wiki Activity
53,324 Commits 36 Branches 527 Tags
Commit Graph

11233 Commits

Author SHA1 Message Date
Aparup Banerjee
ffa7d1cda0 Merge branch 'MDL-32087' of git://github.com/timhunt/moodle 2012-05-17 17:17:37 +08:00
Dan Poltawski
5a0a64661c Merge branch 'w20_MDL-32967_m23_sqlsrvstrings' of git://github.com/skodak/moodle 2012-05-17 14:30:30 +08:00
Dan Poltawski
12ba24a8f8 Merge branch 'MDL-24419' of git://github.com/stronk7/moodle 2012-05-17 11:19:02 +08:00
Sam Hemelryk
2bdafb867a Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle 2012-05-17 14:55:21 +12:00
Sam Hemelryk
7b06151288 Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle 
Conflicts:
	course/lib.php
	theme/base/style/course.css
 2012-05-17 10:55:35 +12:00
Eloy Lafuente (stronk7)
dd420abadf Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	lib/db/upgrade.php
	lib/phpunit/lib.php
	version.php

Fixed:
    lib/db/upgrade.php - duplicate course->sectioncache add code
    lib/db/install.xml - cleanup needed because xmldb editor was not used
    lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset
 2012-05-16 23:53:47 +02:00
Davo Smith
33b24bdd99 MDL-22504 Course drag and drop upload - moved file locations 2012-05-16 08:25:22 +01:00
Aparup Banerjee
e7ebfb8058 Merge branch 'MDL-32005-master-10' of git://git.luns.net.uk/moodle 
- fixed up comments (was phpdoc blocks)
 2012-05-16 10:39:48 +08:00
Sam Hemelryk
a5bf3c520f Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle 
Conflicts:
	course/lib.php
 2012-05-16 09:59:45 +12:00
David Mudrak
cb1c329186 MDL-32337 admin notifications page checks for the recent updates fetch timestamp 
Now the message 'Your Moodle code is up-to-date!' is displayed only if
the fetch was done within the last hour. Otherwise, just the button
'Check for available updates' is displayed.
 2012-05-15 16:59:45 +02:00
Aparup Banerjee
154128a50f Merge branch 'wip-mdl-32770' of git://github.com/rajeshtaneja/moodle 2012-05-15 16:41:54 +08:00
Andrew Robert Nicols
74b714df7e MDL-32005 Add idnumber field to groups and groupings 2012-05-15 09:38:51 +01:00
Tim Hunt
18056cd8dd MDL-32087 question preview: add a help icon to the technical info. 2012-05-14 19:26:06 +01:00
Tim Hunt
a2b4d8968c MDL-32087 question preview: add a Save button. 
Without this, there are some interactions with the question that could
only be tested by adding the question to a quiz, which was a pain.
 2012-05-14 19:26:04 +01:00
Tim Hunt
802f8d2af4 MDL-32087 question preview: make more technical info available. 
... but hide it in a collapsible region.
 2012-05-14 19:26:04 +01:00
Andrew Robert Nicols
7a9a07d24a MDL-31215 Add the ability to change activity titles using AJAX calls 2012-05-14 14:22:02 +01:00
sam marshall
ce4dfd2703 MDL-24419 (4): Add conditional availability support to sections; section cache 
Credit: original version done by Kirill Astashov of NetSpot (netspot.com.au),
finished and tweaked by sam.

This change adds conditional availability support for sections analagous to
that already available for activities. (Backend, UI, backup/restore.)

In order that this feature does not reduce performance, section cacheing has
also been added using a new course 'sectioncache' field analagous to modinfo.

The new feature integrates with activity availability so that activities
inside sections which are not available are automatically not available
themselves (meaning it works to restrict access).
 2012-05-14 11:19:25 +01:00
Dan Poltawski
225097f75a Merge branch 'MDL-31719_master' of git://github.com/lazydaisy/moodle 2012-05-14 15:53:19 +08:00
Dan Poltawski
85c85b8102 Merge branch 'MDL-27322_export' of git://github.com/andyjdavis/moodle 2012-05-14 10:22:21 +08:00
Mary Evans
b87ac3867e MDL-31719 lang/en/admin.php: changed text in $string['configallowthemechangeonurl'] to make less ambiguous 2012-05-13 14:40:30 +01:00
Petr Skoda
0739e690ee MDL-32967 add diagnostic strings for missing Microsoft drivers for SQL Server 2012-05-13 12:21:04 +02:00
Rajesh Taneja
36be7e1453 MDL-32770 course: fixed section title and footer 2012-05-10 16:23:17 +08:00
Aparup Banerjee
e1e3fa217f Merge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle 2012-05-10 10:52:32 +08:00
Andrew Davis
78ab98bc5e MDL-27322 grade: added the ability to not have suspended students included in a grade export 2012-05-10 08:34:51 +07:00
sam marshall
daefd6eb97 MDL-29624 Media embedding system, part 1: new API and filter changes 
Includes new API in medialib.php and core_media_renderer in outputrenderers.php.
Enable/disable settings moved from filter to systemwide appearance page.
Filter changed to use new API.

AMOS BEGIN
 MOV [flashanimation,filter_mediaplugin],[flashanimation,core_media]
 MOV [flashanimation_help,filter_mediaplugin],[flashanimation_desc,core_media]
 MOV [flashvideo,filter_mediaplugin],[flashvideo,core_media]
 MOV [flashvideo_help,filter_mediaplugin],[flashvideo_desc,core_media]
 MOV [html5audio,filter_mediaplugin],[html5audio,core_media]
 MOV [html5audio_help,filter_mediaplugin],[html5audio_desc,core_media]
 MOV [html5video,filter_mediaplugin],[html5video,core_media]
 MOV [html5video_help,filter_mediaplugin],[html5video_desc,core_media]
 MOV [mp3audio,filter_mediaplugin],[mp3audio,core_media]
 MOV [mp3audio_help,filter_mediaplugin],[mp3audio_desc,core_media]
 MOV [legacyquicktime,filter_mediaplugin],[legacyquicktime,core_media]
 MOV [legacyquicktime_help,filter_mediaplugin],[legacyquicktime_desc,core_media]
 MOV [legacyreal,filter_mediaplugin],[legacyreal,core_media]
 MOV [legacyreal_help,filter_mediaplugin],[legacyreal_desc,core_media]
 MOV [legacywmp,filter_mediaplugin],[legacywmp,core_media]
 MOV [legacywmp_help,filter_mediaplugin],[legacywmp_desc,core_media]
 MOV [legacyheading,filter_mediaplugin],[legacyheading,core_media]
 MOV [legacyheading_help,filter_mediaplugin],[legacyheading_desc,core_media]
 MOV [sitevimeo,filter_mediaplugin],[sitevimeo,core_media]
 MOV [sitevimeo_help,filter_mediaplugin],[sitevimeo_desc,core_media]
 MOV [siteyoutube,filter_mediaplugin],[siteyoutube,core_media]
 MOV [siteyoutube_help,filter_mediaplugin],[siteyoutube_desc,core_media]
AMOS END
 2012-05-09 18:29:29 +01:00
Davo Smith
abed5d655f MDL-22504 Fixed issues raised by Sam Hemelryk 2012-05-04 12:12:52 +01:00
Andrew Robert Nicols
0c053c5368 MDL-32508 Add error when trying to access an unknown course section 2012-05-04 13:41:59 +08:00
Dan Poltawski
1abf12532d MDL-32508 course: Add basic 'add a section' button at the bottom of the course page 
With thanks to LUNS who provided this code from when I did it working
there.
 2012-05-04 10:53:01 +08:00
Dan Poltawski
1804b7c1bc MDL-32508 course/formats: Respect single page course display mode 
Topics and weeks have been converted to use a shared renderer to output
their content.

Note, I started with good intentions but this renderer has mixed
paradgims due to fast and cheap winning out on the trinity.

AMOS BEGIN
   MOV [currenttopic,access],[currentsection,format_topics]
   MOV [currentweek,access],[currentsection,format_weeks]
AMOS END
 2012-05-04 10:53:01 +08:00
Dan Poltawski
3fe600aacf MDL-32505 course formats: zooming feature be gone! 2012-05-04 10:52:57 +08:00
Dan Poltawski
b9bcdb54da MDL-32505 course: drop course_display table and settings 2012-05-04 10:52:56 +08:00
Dan Poltawski
1156d38d94 MDL-32504 course: Add coursedisplay setting to course table 
This will replace the course_display database table
 2012-05-04 10:49:52 +08:00
Dan Poltawski
e5214ea13b Merge branch 'w19_MDL-32793_m23_iplookup' of git://github.com/skodak/moodle 2012-05-09 10:17:50 +08:00
Petr Skoda
8c6136a879 MDL-32793 use geoLookup for IP address lookup by default 2012-05-08 23:45:28 +02:00
Sam Hemelryk
b34e00c197 Merge branch 'MDL-32771-2' of git://github.com/danpoltawski/moodle 2012-05-09 09:14:20 +12:00
Dan Poltawski
3a35a9ff8b MDL-32771 - course: add ability to increase/reduce number of sections 
* addsection.php is renamed to changenumsections.php to reflect new purpose
* The add button is changed to a +- toggle rahter than big 'add section'
 2012-05-08 15:00:46 +08:00
Sam Hemelryk
bbb0a6eb02 Merge branch 'MDL-32509' of git://github.com/danpoltawski/moodle 2012-05-08 18:12:28 +12:00
Sam Hemelryk
8e8de15f6c MDL-28967 navigation: Several navigation fixes 
* Fixed implementation of navigation settings navshowcategories, navshowallcourses, and navcourselimit
    * Improved performance associated with loading all, or a collection of courses
    * Fixed duplicate calls to loading functions when we had the information required to know it had already occurred
 2012-05-07 12:42:24 +12:00
Dan Poltawski
7aaed66901 MDL-32509 course: remove enablecourseajax setting 
We just have the single enableajax setting
 2012-05-05 10:56:06 +08:00
Aparup Banerjee
648baa788c Merge branch 'MDL-28657-master' of https://github.com/mackensen/moodle 2012-05-02 13:55:39 +08:00
Sam Hemelryk
1470c0f46e Merge branch 'MDL-26275_large_grader' of git://github.com/andyjdavis/moodle 2012-05-02 17:44:35 +12:00
Dan Poltawski
a4c9412b15 Merge branch 'w18_MDL-19071_m23_unicode' of git://github.com/skodak/moodle 2012-05-01 10:19:17 +08:00
Ruslan Kabalin
c9e34994cb MDL-32009 messaging: Fix using message processor term inconsistency. 2012-04-30 10:34:39 +01:00
Ruslan Kabalin
3f9d9e2856 MDL-32009 messaging: Add message processor uninstall functionality 2012-04-30 10:34:39 +01:00
Davo Smith
32528f94e4 MDL-22504 Drag and drop upload course - enables upload of files, text and urls to a course page 2012-04-30 09:53:25 +01:00
Andrew Davis
a740a0ad98 MDL-26257 grade: fixed the grader report edit mode ajax and fixed a spot in the grader report that should be using get_students_per_page() 2012-04-30 08:56:27 +07:00
Andrew Davis
d3b698a46e MDL-26275 grade: added a safety check to avoid hitting PHP's max_input_var by reducing the number of students per page if necessary 2012-04-30 08:56:26 +07:00
Petr Skoda
6c0e5cd193 MDL-19071 test PCRE compatibility with unicode characters 2012-04-27 13:37:54 +02:00
Eloy Lafuente (stronk7)
291e168894 Revert "MDL-32249 completion: Round course grades and remove hardcoded string" 
This reverts commit 412cecc32bd33b108008791090f420b6892b4cac.
 2012-04-27 12:03:26 +02:00
Eloy Lafuente (stronk7)
7c0d3f4c1d Merge branch 'wip-MDL-26014-master' of git://github.com/phalacee/moodle 2012-04-27 03:15:51 +02:00