Commit Graph

953 Commits

Author SHA1 Message Date
Dan Poltawski 1c570f9096 Merge branch 'MDL-36808-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2012-12-11 12:19:46 +08:00
Dan Poltawski 5d1dff532e Merge branch 'wip-MDL-35884-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE 2012-12-11 11:17:43 +08:00
Jason Fowler 2874baa411 MDL-35884 - Course - Fixing bad whitespace/character return 2012-12-11 11:12:17 +08:00
Jason Fowler 4885064053 MDL-35884 - Course - Remove text from ALT attribute for activity chooser 2012-12-11 11:11:49 +08:00
Sam Hemelryk 1f0e0ab503 Merge branch 'MDL-36607_dndBlocks' of https://github.com/moodlerooms/moodle into MOODLE_23_STABLE 2012-12-10 14:12:24 +13:00
Sam Hemelryk 46210e38e8 Merge branch 'MDL-36640-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE 2012-12-10 11:42:35 +13:00
Sam Hemelryk a5af780bce MDL-36878 course: fixed issue with module metadata cache
Credit goes to Sam Chaffee.
2012-11-29 12:57:31 +13:00
sam marshall 8b6aeff8ea MDL-36808 Completion: Incorrect escaping for activity name in completion tickbox 2012-11-27 12:54:23 +00:00
Rajesh Taneja 84e47a8a3b MDL-36707 Course: set conditionalhidden class properly, so it doesn't overlap with dimmed class 2012-11-20 13:45:11 +08:00
Andrew Robert Nicols a0dd5e65b9 MDL-36640 Logging: Correct testing of log->info.
log->info sometimes contains additional information which can be looked up
from other tables. This should only be attempted if the field is numeric,
but the CSV, XLS, and ODS outputs were not making this check.

There is an additional case for the print_mnet_log function which has not
been covered - this is because the mnet logging is currently broken beyond
the scope of this bug rendering this section untestable. These issues are
raised in MDL-36642.
2012-11-16 11:18:05 +00:00
Mark Nielsen c85164da32 MDL-36607: Improve block drag and drop
* Adding support for subpage
* Adding support for regions that do not start with "side-"
2012-11-14 15:35:14 -08:00
Andrew Robert Nicols 37ceb6cbed MDL-36092 Course/AJAX Ensure that dropdown resource pickers are shown when JS is disabled 2012-11-01 07:51:33 +00:00
Sam Hemelryk efd2f83e4a Merge branch 'wip-mdl-36131-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2012-10-30 12:24:19 +13:00
Andrew Robert Nicols 238d0ca1cd MDL-35836 Rewrite doctonewwindow handling to use delegation instead of individual events 2012-10-26 09:10:45 +08:00
Rajesh Taneja 8648334966 MDL-36131 AJAX: Conditional activities will behave same as in non-ajax mode 2012-10-19 17:15:43 +08:00
Aparup Banerjee c116bd70a0 Merge branch '23STABLE-wip-MDL-35694' of git://github.com/jennymgray/moodle into MOODLE_23_STABLE 2012-10-08 17:26:45 +08:00
Jenny Gray 077fde5dc5 MDL-35694 logs: extend course log report downloads with action url 2012-10-05 09:05:18 +01:00
Frederic Massart 1c409bfe80 MDL-35634 course: Restored alt attribute on module icons 2012-10-03 17:04:16 +08:00
Sam Hemelryk 41a5203c2a Merge branch 'wip-MDL-35276-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE 2012-09-26 15:13:33 +12:00
Marina Glancy 583c0cf67f MDL-35276 fix redirect to course/section pages 2012-09-26 10:58:03 +08:00
Frederic Massart 05daea0f6d MDL-31976 Accessbility: Action icons on course page do not need title attributes 2012-09-21 11:30:51 +08:00
Rex Lorenzo 90c510cf9d MDL-34866 - Make "course display" default a site configurable option
* Moved COURSE_DISPLAY_SINGLEPAGE and COURSE_DISPLAY_MULTIPAGE constants from courselib to moodlelib.php
* Using course display constants in course default admin setting page
2012-08-14 12:12:47 -07:00
Tim Hunt e071bc1aa4 MDL-34704 couse, accesslib: improve $CFG->courselistshortnames
1. get_context_name should respect the $CFG->courselistshortnames
setting.

2. When $CFG->courselistshortnames is on, what to display should use a
language string, rather than string concatenation. This makes it
possible for people to configure the display. For example, they might
want 'My first course [M101]' instead of 'M101 My first course'.
2012-08-03 14:43:30 +01:00
Sam Hemelryk 90105eb95a Merge branch 'MDL-34534-MOODLE_23_STABLE' of https://github.com/micaherne/moodle into MOODLE_23_STABLE 2012-08-01 13:21:03 +12:00
Fred Woolard 7ae8f60489 MDL-34440 Site registration failing with mysqli 2012-07-30 20:06:22 +12:00
Michael Aherne a11b507f50 MDL-34534 Backport activity chooser default setting to 2.3 stable 2012-07-25 12:15:21 +01:00
David Monllao e2bf940699 MDL-29563 course Hide duplication button in activities without backup2 support - Credit to Mark Nielsen 2012-07-19 15:35:20 +08:00
Frederic Massart a64fbc87b6 MDL-33767 Course: General section displays its title when required 2012-07-17 22:28:13 +08:00
Frederic Massart 483d768bc0 MDL-33767 Course: The actions on default section redirect to the correct section 2012-07-17 22:28:01 +08:00
Fred Woolard fd626c4109 MDL-34072: Adjust SQL for Oracle. Remove subquery alias altogether. 2012-07-12 10:54:59 -04:00
sam marshall a5f68fb2c2 MDL-33426 Completion: Multilang activity names wrong in alt/title 2012-07-03 16:08:57 +02:00
Eloy Lafuente (stronk7) 926b08ca4b Merge branch 'MDL-33623' of git://github.com/danpoltawski/moodle 2012-06-19 03:05:52 +02:00
Dan Poltawski f715dc3fd5 Merge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle 2012-06-18 15:35:05 +08:00
Frederic Massart a41b1d96b6 MDL-33775 Course: fix redirect to course/section in paged mode 2012-06-18 15:10:33 +08:00
Dan Poltawski 2365213fdb MDL-33623 - course: remove incorrect logic for marker moving 2012-06-11 15:11:10 +08:00
Andrew Robert Nicols 928cc791e6 MDL-33573 Remove anchor from activity chooser link until JS is ready 2012-06-07 10:15:52 +01:00
Sam Hemelryk e5b200cd65 Merge branch 'wip-mdl-33367' of git://github.com/rajeshtaneja/moodle 2012-06-06 15:19:49 +12:00
Dan Poltawski 7f88c42608 MDL-33441 course/lib.php prevent fatal error when no visible categories 2012-06-05 16:40:40 +08:00
Rajesh Taneja ac5f641465 MDL-33367 course: Deprecated message added to move_section, so it can be removed in 2.5 2012-06-05 09:34:36 +08:00
Rajesh Taneja eb01aa2c34 MDL-33367 course: move_section reuse move_section_to function
Conflicts:

	course/lib.php
2012-06-05 09:34:14 +08:00
Dan Poltawski 0ed8a933d6 Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle 2012-05-29 15:08:46 +08:00
sam marshall 540f89d7d4 MDL-33212 Course page: Eye icon should override other conditions 2012-05-28 16:17:39 +01:00
Dan Poltawski 6bea694b6c Revert "MDL-33212 Course page: Eye icon should override other conditions"
This reverts commit 5d0d373733.
2012-05-28 16:57:41 +08:00
Dan Poltawski da5cd8cee8 Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle 2012-05-28 16:03:03 +08:00
Rajesh Taneja 33fcc04082 MDL-33347 course: section move is visible without ajax 2012-05-28 09:59:48 +08:00
Dan Poltawski 5744ea3682 Revert "MDL-33063 course: Reuse get_all_sections()"
This reverts commit 66b494771f.
2012-05-24 20:42:58 +08:00
Dan Poltawski 108526897d Merge branch 'MDL-33063' of git://github.com/srynot4sale/moodle 2012-05-24 20:32:31 +08:00
sam marshall 5d0d373733 MDL-33212 Course page: Eye icon should override other conditions 2012-05-23 13:46:51 +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
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