Commit Graph

56029 Commits

Author SHA1 Message Date
Rajesh Taneja bcf7175f4e MDL-33027 theme: Hidden section link will be displayed dimmed in section navigation 2012-05-22 11:31:35 +08:00
Rajesh Taneja c129f430bb MDL-33027 themes: Modified heading to be displayed for section in all themes 2012-05-22 11:31:34 +08:00
Dan Poltawski 3e832fe3e5 Merge branch 'MDL-32981-master' of github.com:FMCorz/moodle 2012-05-22 11:14:12 +08:00
Frederic Massart c598ea55fe MDL-32981 Filepicker: my private files uses edit page instead of view 2012-05-22 10:56:11 +08:00
Sam Hemelryk cba59b3d83 Merge branch 'MDL-32204-mnet-auth' of git://github.com/mudrd8mz/moodle 2012-05-22 14:49:35 +12:00
Sam Hemelryk 0b02faa076 Merge branch 'MDL-33051' of git://github.com/danpoltawski/moodle 2012-05-22 14:40:31 +12:00
Sam Hemelryk 4f4476081f Merge branch 'MDL-33055_master' of git://github.com/kordan/moodle 2012-05-22 14:31:59 +12:00
Dan Poltawski c8f0f2cd85 Merge branch 'wip-MDL-33066-m23' of git://github.com/samhemelryk/moodle 2012-05-22 10:30:36 +08:00
Sam Hemelryk 2a4fbc327c MDL-32932 mod_assign: Coding style clean up and security improvement 2012-05-22 14:21:47 +12:00
Sam Hemelryk c5b8ae0eb7 Merge branch 'MDL-32932' of git://github.com/netspotau/moodle-mod_assign
Conflicts:
	mod/assign/gradingtable.php
2012-05-22 14:21:41 +12:00
Dan Poltawski 5d6e603e1f Merge branch 'MDL-33167' of git://github.com/lazydaisy/moodle 2012-05-22 10:18:45 +08:00
Mary Evans 228408475c MDL-33167 theme_afterburner: added z-index to fix issue with yui3-widget when adding activity or resourse using new feature dialogue box 2012-05-22 03:05:42 +01:00
Rajesh Taneja 2b1b897271 MDL-33102 blogs: userid will be added during blog visibility upgrade 2012-05-22 09:49:27 +08:00
Frederic Massart 50fb4c8fd9 MDL-33153 Resource: rename submit button to 'save changes' in folder resource 2012-05-22 09:36:29 +08:00
Andrew Davis 4be0947bbe MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php 2012-05-22 08:30:39 +07:00
Sam Hemelryk ad5d189c93 Merge branch 'MDL-33118' of git://github.com/lazydaisy/moodle 2012-05-22 11:38:03 +12:00
Sam Hemelryk ac12e3b42e MDL-33122 Coding style cleanup during integration 2012-05-22 11:33:52 +12:00
Sam Hemelryk 4c32b79957 Merge branch 'MDL-33122-master' of git://github.com/ankitagarwal/moodle 2012-05-22 10:54:48 +12:00
Sam Hemelryk 25bea62d33 Merge branch 'MDL-33137-master-2' of git://git.luns.net.uk/moodle 2012-05-22 10:49:59 +12:00
Matteo Scaramuccia 8ac8aae4f4 MDL-33053 AICC: Incorrect Table Of Content hierarchy using "structured" AICC
courses
[Fix] 'scorm_scoes' doesn't contain all the entries described in the DES file
[Fix] HTMLizing the parent relationship, described in the CST file,
      fails: it considers 'index = 0' (found) equals to 'false' (not found)
2012-05-22 00:47:01 +02:00
Davo Smith 82d2a84002 MDL-33074 Course drag and drop upload - fixed incorrect group mode button 2012-05-21 22:11:38 +01:00
Andrew Robert Nicols 35e1abcde7 MDL-33137 Add styling to activity chooser buttons 2012-05-21 17:02:13 +01:00
Andrew Robert Nicols d9bd472bee MDL-33135 Prevent duplicate form submission on the course activity chooser 2012-05-21 16:55:47 +01:00
sam marshall a3c17aed9f MDL-33116 Media filter broken with slasharguments off 2012-05-21 14:24:42 +01:00
Ruslan Kabalin 243e9bf984 MDL-32752: Drag-drop: Follow the ghost note if the drop target is missed.
Simulate drop_hit and substitute target of where ghost node was dropped last
time.
2012-05-21 13:59:44 +01:00
sam marshall 52e9dfc58f MDL-33133 Conditional section: restore to existing course fix 2012-05-21 13:59:00 +01:00
Ruslan Kabalin 405eaac272 MDL-32744: Maintain format specific CSS selectors in the format configuration.
This updates existing core formats and introduce a configuration function.
2012-05-21 13:53:04 +01:00
Dan Poltawski f7290156ad Merge branch 'MDL-33126-master' of git://github.com/sammarshallou/moodle 2012-05-21 20:17:12 +08:00
Dan Poltawski b99065be04 MDL-33032 - dont require repository/lib.php until necessary
This is an ugly fix to a broken installer only.
2012-05-21 20:04:42 +08:00
Dan Poltawski 1082e7daf7 MDL-31901: Fix trailing whitespace 2012-05-21 19:18:44 +08:00
sam marshall 57a42a24ad MDL-33126 Fix error on first view of new course page 2012-05-21 12:05:30 +01:00
Dan Poltawski 6a0d7194f7 MDL-31901: filemanager/picker.js - match coding style
* No inline ifs
* Spacing between ternary operators
* Missing ;'s
2012-05-21 18:25:56 +08:00
Dan Poltawski 7d44f9c2a2 MDL-28666: filelib - remove unusused globals 2012-05-21 18:21:36 +08:00
Dan Poltawski f8e74b20f9 MDL-28666 repository - Switch usefilereference to PARAM_BOOL 2012-05-21 18:21:31 +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
Marina Glancy 55711b0a0d Merge pull request #4 from mudrd8mz/wip-files23-fixes
Changing the tinyicon size to 24x24
2012-05-21 03:17:25 -07:00
Andrew Robert Nicols 48a5e55ee2 MDL-33128 Swap Activities and Resources in the module chooser 2012-05-21 11:08:32 +01:00
David Mudrak 10f0978bff MDL-32471 redefining the tinyicon thumbnail size to 24x24
As requested by the Files 2.3 UI team.
2012-05-21 11:37:29 +02:00
Fábio Souto 90e30b965f Allow admin to consult user email address
Currently the admin user cannot check the user email using this function. This fix allows the admin user to retrieve the email in any situation.
2012-05-21 10:32:21 +01: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
Marina Glancy a8d6dda4f2 MDL-32247 fixed bug with displaying icon for unknown filetype, fixed merge mistakes 2012-05-21 17:12:55 +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
Kordan e201eff9cc MDL-32380 theme_formal_white: just a new style class for wrong config parameters 2012-05-21 10:41:26 +02:00
Dongsheng Cai 70c1bc843a MDL-33127 stored_file::update should use get_content_file_location because it tried to update file_record 2012-05-21 16:37:53 +08:00
Barbara Ramiro 0f1bdd0d2c MDL-32900 Change Icons to FileTypesIcons 2012-05-21 16:37:14 +08: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
Kordan c19d6d1b97 collapsed margin around header logo a increased the margin around header menu 2012-05-21 09:57:29 +02: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
Kordan 5ac3b1c0ba MDL-33055 theme_formal_white: changed "general" to "standard" in $theme->layouts array index 2012-05-21 09:26:52 +02:00