mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-15 13:24:56 +01:00
Code Issues Projects Releases Wiki Activity
53,145 Commits 36 Branches 523 Tags
Commit Graph

3796 Commits

Author SHA1 Message Date
Dan Poltawski
702cb399b2 Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle 2012-05-10 16:51:12 +08:00
Aparup Banerjee
ad394588db MDL-28134 General : fixed CFG->branch notice during web/cli installation 2012-05-10 15:43:52 +08:00
Dan Poltawski
3388649065 Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle 2012-05-10 13:44:03 +08:00
Aparup Banerjee
e1e3fa217f Merge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle 2012-05-10 10:52:32 +08:00
Sam Hemelryk
3c611a360e Merge branch 'MDL-32780-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-10 14:04:14 +12: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
Damyon Wiese
5d81b754be MDL-32780: Use Moodle functions for building SQL in assignment upgrade tool 
Fixed functions:
tool_assignmentupgrade_load_all_upgradable_assignmentids() and
tool_assignmentupgrade_any_upgradable_assignments()
 2012-05-07 10:54:24 +08:00
Dan Poltawski
b9bcdb54da MDL-32505 course: drop course_display table and settings 2012-05-04 10:52:56 +08:00
Dan Poltawski
0dda790c05 Merge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle 
Conflicts:
    lib/db/upgrade.php
	version.php
 2012-05-04 09:28:41 +08:00
Eloy Lafuente (stronk7)
97101a0397 Merge branch 'MDL-32693' of git://github.com/danpoltawski/moodle 2012-05-03 18:22:05 +02:00
Dan Poltawski
e6236edebf MDL-31270 mod_assign: version dump 
Introduce depdency from assignmentupgrade to mod_assign
 2012-05-03 16:46:06 +08:00
Aparup Banerjee
ed01233ace MDL-28134 General : added branch variable to version.php for reliable docs versioned links. 2012-05-03 16:30:20 +08:00
Damyon Wiese
bbd0e548c3 MDL-31270 mod_assign: introducing the assignment module 
* Includes an assignment upgrade tool to convert from the old mod_assignment.
* Hides mod_assignment on new installs
 2012-05-03 14:44:06 +08:00
Sam Hemelryk
bbb0a6eb02 Merge branch 'MDL-32509' of git://github.com/danpoltawski/moodle 2012-05-08 18:12:28 +12:00
Dan Poltawski
9af52f493a Merge branch 'MDL-32786' of git://github.com/stronk7/moodle 2012-05-07 12:44:19 +08:00
Dan Poltawski
7e6d3880b4 Merge branch 'MDL-32774-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 12:28:34 +08:00
Dan Poltawski
b2344ab366 Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle 2012-05-07 11:07:28 +08:00
Damyon Wiese
ee225061dc MDL-32774: Require sesskey for all actions in the assignment upgrade tool 2012-05-07 10:51:05 +08:00
Dan Poltawski
dafea445db Merge branch 'MDL-32782' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 10:20:46 +08: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
Eloy Lafuente (stronk7)
75c386d4b2 MDL-32786 E_STRICT: fix warning when creating a new service. 2012-05-04 12:44:10 +02:00
Damyon Wiese
01e5ce8781 MDL-32782: Remove unused source file from assignment upgrade tool (lib.php) 2012-05-04 16:01:41 +08:00
Ruslan Kabalin
0872ee1dd0 MDL-32717: Fix strict standards warning on uninstall 2012-05-02 11:58:37 +01:00
Aparup Banerjee
648baa788c Merge branch 'MDL-28657-master' of https://github.com/mackensen/moodle 2012-05-02 13:55:39 +08:00
Dan Poltawski
1cba46c793 MDL-32693 webservice: fix typo in URL 2012-05-01 12:27:43 +08:00
Dan Poltawski
6b445cb17a Merge branch 'w18_MDL-30686_m23_guessurl' of git://github.com/skodak/moodle 2012-05-01 11:27:16 +08: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
Sam Hemelryk
7c30505be8 Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle 2012-05-01 13:43:07 +12:00
Petr Skoda
4d254790c4 MDL-32628 add revision for user avatar images 
This should finally resolve all avatar caching issues and should also help with performance.
 2012-04-30 23:36:47 +02:00
Ruslan Kabalin
3f9d9e2856 MDL-32009 messaging: Add message processor uninstall functionality 2012-04-30 10:34:39 +01:00
Petr Skoda
8e5c963e6b MDL-32587 improve component phpunit config building and make the util.php help fit 80char screens 2012-04-27 13:42:18 +02:00
Eloy Lafuente (stronk7)
cb48174266 MDL-32587 phpunit: new option to create distributed phpunit.xml files 2012-04-27 13:42:17 +02:00
Petr Skoda
f0202ae9a2 MDL-30686 improve accuracy of qualified_me() by trying PAGE->url first 
This should help SSL proxies and returning to current page after require_login().
 2012-04-27 13:39:18 +02:00
Petr Skoda
6c0e5cd193 MDL-19071 test PCRE compatibility with unicode characters 2012-04-27 13:37:54 +02:00
Dan Poltawski
1e77ca296d Merge branch 'w17_MDL-25407_m23_innodb' of git://github.com/skodak/moodle 2012-04-24 10:23:14 +08:00
Eloy Lafuente (stronk7)
434fc13dbe Merge branch 'MDL-32454-master-1' of git://git.luns.net.uk/moodle 2012-04-24 01:47:14 +02:00
Eloy Lafuente (stronk7)
5989454498 Merge branch 'MDL-19549' of git://github.com/danpoltawski/moodle 2012-04-24 01:00:16 +02:00
Petr Skoda
e498621a95 MDL-25407 ignore errors in CLI mysql engine conversion script 2012-04-23 19:19:19 +02: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
fb1b14299a Merge branch 'w17_MDL-25407_m23_innodb' of git://github.com/skodak/moodle 2012-04-23 12:24:39 +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
d88b0f9c29 MDL-32569 remove unittestprefix from config-dist.php, do not link other pages from old UI 2012-04-21 17:50:40 +02:00
Petr Skoda
05d531a5fb MDL-32569 drop old functional DB tests 2012-04-21 16:32:14 +02:00
Petr Skoda
10156165ae MDL-32569 hide old SimpleTest UI 2012-04-21 16:13:38 +02:00
Petr Skoda
b38d2ce7f8 MDL-32569 move other test related files to new tests directory 2012-04-21 16:11:36 +02:00
Petr Skoda
f2c648edc3 MDL-25407 ignore errors when converting to InnoDB and ignore timeout 
This should help resolve problems with table views and other unsupported stuff.
 2012-04-21 11:50:43 +02:00
Charles Fulton
66150286b5 MDL-28657 backup: make automated backup filenames site admin-configurable 2012-04-20 08:52:56 -07:00
Dan Poltawski
ec0a11285d MDL-19549 lang: make a string less scary 2012-04-17 17:14:25 +08:00
Andrew Robert Nicols
8219502369 MDL-32454 Fix issues highlighted by strict warnings in MNet code 2012-04-16 09:34:41 +01:00
Dan Poltawski
54e4d1b3a1 Merge branch 'w16_MDL-32400_m23_phpunit4' of git://github.com/skodak/moodle 2012-04-16 16:12:35 +08:00