3815 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
754c2deab6 Merge branch 'MDL-32941' of git://github.com/mouneyrac/moodle
Conflicts:
	course/externallib.php
	lib/db/services.php
	version.php
2012-05-17 22:35:57 +02:00
Dan Poltawski
331a8feecf Merge branch 'w20_MDL-29054_m23_sqlsrvdbt' of git://github.com/skodak/moodle 2012-05-17 14:33:42 +08:00
Sam Hemelryk
2bdafb867a Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle 2012-05-17 14:55:21 +12:00
Jerome Mouneyrac
d6ebe011b6 Fix codecheck/moodlechecker errors 2012-05-17 10:35:05 +08:00
Fábio Souto
f2229c6895 MDL-32941 Implement core_course_update_categories, add webform and unittests
Conflicts:

	admin/webservice/testclient_forms.php
	course/externallib.php
	lib/db/services.php
2012-05-17 10:34:59 +08:00
Fábio Souto
2f951d866a MDL-32941 Added service definition and implementation for core_course_delete_categories()
Included is a bug correction to categories_delete_move() which does not
respect showfeedback parameter, printing feedback even when not wanted
(this breaks the webservice output)

Conflicts:

	admin/webservice/testclient_forms.php
	lib/db/services.php
2012-05-17 10:34:03 +08:00
Fábio Souto
be05180890 MDL-32941 complete unit tests and webform 2012-05-17 10:33:56 +08:00
Sam Hemelryk
1220843c02 Merge branch 'MDL-32610-hide-updates' of git://github.com/mudrd8mz/moodle 2012-05-17 12:30:44 +12:00
Sam Hemelryk
ba94f1d503 Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle 2012-05-16 13:09:32 +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
David Mudrak
4db58f5fc7 MDL-32610 available updates info at the admin Notifications page can be hidden 2012-05-15 14:30:47 +02:00
David Mudrak
fa1d403f2e MDL-32610 available updates info at the Plugins check upgrade page can be hidden 2012-05-15 14:23:48 +02:00
David Mudrak
7716057f7d MDL-32610 available updates info at the Plugins overview admin page can be hidden 2012-05-15 13:43:08 +02:00
David Mudrak
4fb3a06821 MDL-32610 site administration > server > update notifications section can be hidden 2012-05-15 11:39:04 +02:00
Dan Poltawski
61bb4184a7 Merge branch 'w20_MDL-25197_m23_innodb' of git://github.com/skodak/moodle 2012-05-15 15:41:46 +08:00
Sam Hemelryk
6669b8e91e MDL-32872 tool_roles: Fixed up navigation on user roles page 2012-05-14 08:54:50 +12:00
Petr Skoda
c1592e514f MDL-25197 add existing InnoDB engine detection in conversion tool 2012-05-13 13:54:35 +02:00
Petr Skoda
99a5cd78ec MDL-29054 add sqlsrv to list dbtransfer targets, remove unfinished sqlite support 2012-05-13 12:28:19 +02:00
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
Charles Fulton
66969d5004 MDL-32889 lib: escape filename in Content-Disposition header 2012-05-09 16:03:33 -04: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