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

11214 Commits

Author SHA1 Message Date
Aparup Banerjee
154128a50f Merge branch 'wip-mdl-32770' of git://github.com/rajeshtaneja/moodle 2012-05-15 16:41:54 +08: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
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
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
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
Andrew Robert Nicols
9d40f585da Revert MDL-31215 Add the ability to change activity titles using AJAX calls 
This *partially* reverts commit 6a14c4ffdd01d6b2069e8c27bb2b7df26dcdbd6a.

Note however parts of that commit were unrelated and haven't been
reverted.
 2012-04-26 17:25:06 +08:00
Jason Fowler
06aad19cc7 MDL-26014 - blog - improving the label for the URL of an external blog feed 2012-04-26 11:09:44 +08:00
Eloy Lafuente (stronk7)
ee5855687e Merge branch 'MDL-31052-js-rewrite' of git://github.com/danpoltawski/moodle 2012-04-26 03:32:08 +02:00
Eloy Lafuente (stronk7)
e69ac1546b Merge branch 'MDL-32192_rename_string' of git://github.com/andyjdavis/moodle 2012-04-25 13:07:48 +02:00
Eloy Lafuente (stronk7)
344c07c3de Merge branch 'wip-MDL-26959-master' of git://github.com/phalacee/moodle 2012-04-25 03:20:23 +02:00
Eloy Lafuente (stronk7)
c833026b24 Merge branch 'MDL-32249' of github.com:srynot4sale/moodle 2012-04-24 12:56:30 +02:00
Andrew Robert Nicols
6a14c4ffdd MDL-31215 Add the ability to change activity titles using AJAX calls 2012-04-24 13:25:49 +08:00
Eloy Lafuente (stronk7)
9614e54bfc Merge branch 'MDL-28176' of git://github.com/danpoltawski/moodle 2012-04-24 00:30:50 +02:00
Eloy Lafuente (stronk7)
f24628a290 Merge branch 'MDL-32134' of git://github.com/danpoltawski/moodle 2012-04-24 00:07:23 +02:00
Andrew Robert Nicols
ebaa29d107 MDL-31096 Convert course resource/section javascript to YUI3 Module 
AMOS BEGIN
  MOV [hideweekfromothers,moodle],[hidefromothers,format_week]
  MOV [showweekfromothers,moodle],[showfromothers,format_week]
  MOV [hidetopicfromothers,moodle],[hidefromothers,format_topics]
  MOV [showtopicfromothers,moodle],[showfromothers,format_topics]
AMOS END
 2012-04-23 21:28:39 +01:00
Dan Poltawski
e0ed91ba39 Merge branch 'MDL-29262' of git://github.com/stronk7/moodle 
Conflicts:
	version.php
 2012-04-23 12:42:16 +08:00
Dan Poltawski
f488088109 Merge branch 'w17_MDL-32569_m23_phpunit5' of git://github.com/skodak/moodle 2012-04-23 11:21:06 +08:00
Aaron Barnes
412cecc32b MDL-32249 completion: Round course grades and remove hardcoded string 2012-04-23 12:18:44 +12:00
Jason Fowler
f77f2406fe MDL-26959 - Blog - changing wording of the entry delete confirmation string to make it more appropriate 2012-04-23 08:01:22 +08:00
Eloy Lafuente (stronk7)
14e2704ad4 MDL-29262 backup: new setting to control the ttl of backup logs 
Add one new backup setting, moving from the general CFG->loglifetime,
to be able to delete backup logged information often.
 2012-04-22 21:23:55 +02:00
Petr Skoda
4ca04fb58b MDL-32569 remove remaining references to simpletest and improve events test 2012-04-21 17:08:30 +02:00
Charles Fulton
66150286b5 MDL-28657 backup: make automated backup filenames site admin-configurable 2012-04-20 08:52:56 -07:00
Tim Hunt
e66c9c077b MDL-32519 completio: Fix spelling of Enrolled. 2012-04-20 09:47:43 +01:00
Andrew Davis
af4f61720d MDL-32191 grade:renamed a mis-spelled string name 
AMOS BEGIN
 MOV [invalidgradeitmeid,error],[invalidgradeitemid,error]
AMOS END
 2012-04-20 12:03:34 +07:00