mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
57,450 Commits 36 Branches 519 Tags
Commit Graph

4036 Commits

Author SHA1 Message Date
Dan Poltawski
038c47f6e7 Merge branch 'wip-mdl-33102' of git://github.com/rajeshtaneja/moodle 2012-05-29 16:10:59 +08:00
David Mudrak
2da7fbc0c2 MDL-33382 CLI install and upgrade scripts display hint on --allow-unstable in non-interactive mode 2012-05-28 10:59:22 +02:00
Petr Skoda
716b50dc2c MDL-33001 improve error handling in mysql engine conversion tool and add listing of engines 2012-05-28 10:25:58 +02:00
Vadim Dvorovenko
5e963820a5 MDL-29836 webservices: use individual string 
To allow accurate transalation
 2012-05-25 10:33:02 +08:00
Dan Poltawski
de424071ca MDL-32895 tool_assignmentupgrade: fix trailing whitespace 2012-05-23 11:20:23 +08:00
Dan Poltawski
f310b16d80 Merge branch 'MDL-32895' of git://github.com/netspotau/moodle-mod_assign 2012-05-23 11:13:03 +08:00
Dan Poltawski
afe23ae76a Merge branch 'dev_MDL-33154_sesskey_error' of git://github.com/dongsheng/moodle 2012-05-22 13:57:51 +08:00
Dan Poltawski
d106cf1d7d Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle 2012-05-22 13:34:18 +08:00
Dongsheng Cai
7992b93686 MDL-33154 added missing sesskey to navgation nodes 2012-05-22 12:14:59 +08:00
Rajesh Taneja
2b1b897271 MDL-33102 blogs: userid will be added during blog visibility upgrade 2012-05-22 09:49:27 +08:00
Dan Poltawski
49957d3858 MDL-28666 admin/repository: use PARAM_BOOL for booleans. 2012-05-21 18:21:25 +08:00
Dan Poltawski
2b4f1cbc32 Merge branch 'wip-files23' of git://github.com/marinaglancy/moodle 2012-05-21 18:19:32 +08:00
Dan Poltawski
5c50d45b79 Merge branch 'MDL-22504_drag_and_drop_upload_integration' of git://github.com/davosmith/moodle 2012-05-21 17:22:13 +08:00
Davo Smith
1ddc3d1f4c MDL-22504 Course drag and drop upload - experimental setting is now a checkbox 2012-05-21 10:03:55 +01:00
Marina Glancy
559276b153 MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons 
- function get_mimetypes_array() now contains also information about filetype groups and language strings
- use 'smart' human-readable mimetype description
- never determine filetype group based on filetype icon image! remove function mimeinfo_from_icon()
- get rid of class filetype_parser and file lib/filestorage/file_types.mm, replaced with functions file_get_typegroup(), file_extension_in_typegroup() and file_mimetype_in_typegroup()
- support multiple icon sizes, not only 16 and 32
- retrieve filetype icon only using proper functions file_..._icon() from lib/filelib.php throughout the code
- increase size of repository thumbnails to 90 and icons to 24 (will take effect when new icons exist)
 2012-05-21 16:01:04 +08:00
Davo Smith
f684250bda MDL-22504 Course drag and drop upload - removed browser specific content hacks, made 'text and link' dragging an experimental feature 2012-05-21 08:34:50 +01:00
Petr Skoda
9bd553b7b8 MDL-33015 fix invalid PAGE->url in repo instance config pages 
Conflicts:

	admin/repositoryinstance.php
 2012-05-21 11:57:55 +08:00
Dongsheng Cai
6723372514 MDL-28666 Extends repository to support references 
1. Allow repository to create references to external contents
2. Extends files API to handle file references
3. Generic file caching
4. Backup/restore file references
5. Download external contents if repository uninstalled
6. Allow filepicker to display iframe
7. PHPUnit test suits
 2012-05-21 11:57:51 +08:00
Rex Lorenzo
ae11631886 MDL-33090 - Missing strings in XMLDB editor - added in missing strings 2012-05-19 21:27:38 -07:00
Petr Skoda
fb1ec806c5 MDL-32564 fix admin/timezone.php page setup 2012-05-19 18:52:58 +02:00
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
Damyon Wiese
5b12114476 MDL-32895: Improvements to assignment upgrade tool for large numbers of assignments. 
* Form to control the perpage variable for the upgradable assignments table.
    * Set timeout and increase memory limit for batch upgrades
    * Output/renderer pages to the upgrade progress is progressively displayed
    * Cleanup of relative includes in assignmentupgrade tool
    * More verbose errors reported for failed upgrades
 2012-05-14 12:53:21 +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