Commit graph

3131 commits

Author SHA1 Message Date
Aparup Banerjee
f7dd6bda31 Merge branch 'wip-MDL-29188-master' of git://github.com/samhemelryk/moodle 2011-09-13 11:58:21 +08:00
Aparup Banerjee
5433da6064 Merge branch MDL-29189-master of git://github.com/samhemelryk/moodle
- resolved conflicts.
2011-09-13 11:39:06 +08:00
Sam Hemelryk
62b214d9a6 Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle 2011-09-13 12:45:34 +12:00
Eloy Lafuente (stronk7)
ce9d0673d0 Merge branch 'MDL-29236-master' of git://github.com/sammarshallou/moodle 2011-09-12 20:37:24 +02:00
Sun Zhigang
c5234aa1d9 MDL-29112 trigger event mod_deleted after deleting mod through AJAX 2011-09-12 17:36:02 +12:00
Sam Hemelryk
5da0e7fc03 Merge branch 'w36_MDL-29131_m22_recentsep' of git://github.com/skodak/moodle 2011-09-12 17:08:27 +12:00
Petr Skoda
e7dd4ff575 MDL-29131 fix multiple groups issues on the recent activity report 2011-09-10 13:52:42 +02:00
Petr Skoda
138c76789b MDL-29014 fix a few incorrect uses of strlen and substr 2011-09-10 10:21:31 +02:00
Eloy Lafuente (stronk7)
8645a28f3e MDL-28488 backup - activity duplication requires 2 capabilities in ctx 2011-09-09 15:53:02 +02:00
Sam Hemelryk
91d284c145 MDL-29186 multilang Reviewed the uses of course fullname and ensured things were being formatted consistently 2011-09-08 09:38:46 +12:00
Sam Hemelryk
63390481c4 MDL-29187 multilang Reviewed the uses of category name and ensured things are being formatted correctly 2011-09-08 09:37:07 +12:00
Sam Hemelryk
8ebbb06adf MDL-29189 mutlilang Reviewed the uses of course shortname and ensured things are being formatted consistently 2011-09-08 09:30:27 +12:00
Sam Hemelryk
71e0b3b5c7 MDL-29188 multilang Reviewed the uses of section name and ensured things were being formatted consistently 2011-09-08 09:27:38 +12:00
sam marshall
371fbe1cc1 MDL-29236 Labels (and other content from modules) on course page should use module filter settings
E.g. if you disable smileys for a label, this ought to work (it doesn't previously, as everything is filtered using the course context).
2011-09-07 17:57:12 +01:00
Eloy Lafuente (stronk7)
4a94d2c61f Merge branch 'MDL-27001-master' of git://github.com/sammarshallou/moodle 2011-09-06 15:50:26 +02:00
sam marshall
b3a89232d9 MDL-27001 'Show description' feature part 2 - Automatic support for modules that don't have a get_coursemodule_info function
If a module doesn't have module_get_coursemodule_info function, but it does have 'intro' and 'introformat' fields in its main table, then all it needs to do is return true for FEATURE_SHOW_DESCRIPTIONS and everything is handled automatically.
2011-09-06 11:03:03 +01:00
sam marshall
8c40662e22 MDL-27001 'Show description' feature part 1: infrastructure that allows modules to support feature
The 'Show description' feature is about optionally including module description on the course page. This change include the necessary infrastructure - new database field, new FEATURE constant, changes to forms to display it, new language strings for it, backup and restore, and old course conversion. (I found the places to change by searching for an existing field in course_modules).

Documentation for the field is included in install.xml and in modinfolib.
2011-09-06 11:03:00 +01:00
Sam Hemelryk
d609d96261 MDL-28599 textlib Separated collator to collatorlib with static methods, and added support for locale aware sorting of objects 2011-09-06 15:39:00 +12:00
Eloy Lafuente (stronk7)
0312bf641c Merge branch 'wip-MDL-28596-master' of git://github.com/samhemelryk/moodle 2011-08-29 03:15:25 +02:00
Petr Skoda
0958759dc2 MDL-28554 workaround for http://yuilibrary.com/projects/yui3/ticket/2530999
Do not load io-xdr and io-upload-iframe on the same page.
2011-08-25 11:38:34 +02:00
Sam Hemelryk
7749e187cc MDL-28596 course Improved and modernised the production of module editing icons and added support for renderable content when rendering action_link components 2011-08-25 18:02:35 +12:00
Rajesh Taneja
cec1d81461 MDL-27896 course - Rectified wrong use of itemid for preparing draft file area 2011-08-12 16:41:29 +08:00
Rajesh Taneja
dedb69a2a1 MDL-27896 editor - parent context will be respected by editor in case context is not created. 2011-08-12 11:33:21 +08:00
Rajesh Taneja
e9de1cf49c MDL-27896 context - Fixed editor context to observe filter status 2011-08-12 11:33:21 +08:00
Dan Poltawski
f40bbf7dce MDL-25417 - remove redunant code 2011-08-05 12:06:57 +01:00
Sam Hemelryk
ad4700977a MDL-26477 Added a setting to display course sections as links within the navigation 2011-08-02 15:24:59 +02:00
Sam Hemelryk
39c621f63b Merge branch 'MDL-28107' of git://github.com/rwijaya/moodle 2011-07-25 15:14:12 +08:00
Dan Poltawski
d0cdf8ec72 MDL-28232 - Course log text export is missing a new line 2011-07-25 12:57:39 +08:00
Rossiani Wijaya
e877160d46 MDL-28107 course enrolment icon: Fixed logged in user enrolment icons 2011-07-22 13:23:57 +08:00
Petr Skoda
8aa74f821d MDL-27696 initialise arrays
Credit goes to David Mudrak.
2011-07-19 15:03:58 +02:00
Sam Hemelryk
c1d251e890 Merge branch 'wip-MDL-27756-master' of github.com:marinaglancy/moodle 2011-07-18 22:15:55 +10:00
Petr Skoda
595646d15b MDL-28344 remove the unused $CFG->framename 2011-07-14 21:40:50 +02:00
Marina Glancy
77bf97e300 MDL-27756 Improving move_course() performance 2011-07-14 11:00:09 +08:00
Eloy Lafuente (stronk7)
482b1ea121 Merge branch 'MDL-27329' of git://git.luns.net.uk/moodle 2011-07-07 00:24:19 +02:00
Tim Hunt
c141b05f7d MDL-25357 Allow maximum number of sections to be set by the admin. Also allow 0 sections at an choice.
Also fix one bad <br/> in another lang string.
2011-07-04 15:35:03 +01:00
Dan Poltawski
af27c69e1f MDL-27329 course report - correct use of wrong fullname
We are refering to users in this column of the course report not
course full name.
2011-07-03 22:12:05 +01:00
Eloy Lafuente (stronk7)
e5a863e55c MDL-27829 course report - fix name of "Course completion report". Credit goes to Helen! 2011-07-01 20:38:06 +02:00
Eloy Lafuente (stronk7)
67fcc9989a Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-07-01 11:51:26 +02:00
Andrew Davis (andyjdavis)
346a32a75b MDL-27829 blocks: added some more page types to some _page_type_list() functions 2011-07-01 15:43:26 +08:00
Andrew Davis (andyjdavis)
1fe0ecabf1 MDL-27829 blocks: altered some strings so page type strings match the names of the course reports in the UI 2011-07-01 10:01:38 +08:00
Eloy Lafuente (stronk7)
91dc377b74 Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-06-30 16:39:45 +02:00
Andrew Davis (andyjdavis)
800688bd1e MDL-27829 blocks: added code to make the page type restrictions for blocks on admin setting pages make sense 2011-06-30 15:32:34 +08:00
Eloy Lafuente (stronk7)
c5401e743d Merge branch 'MDL-28072_coursereport_undefined_function' of git://github.com/andyjdavis/moodle 2011-06-29 15:01:50 +02:00
Sam Hemelryk
f86e19b1ee Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-06-29 17:04:13 +08:00
Andrew Davis (andyjdavis)
26a0af08e0 MDL-28072 coursereport: added a missing require_once() 2011-06-29 12:59:44 +08:00
Andrew Davis (andyjdavis)
b38e2e28a1 MDL-27829 blocks: altered the algorithm used to find plugin page types 2011-06-27 12:27:41 +08:00
Sam Hemelryk
e26507b361 MDL-27809 navigation: Reworked the caching within navigation and improved the ordering of events in order to reduce the use of session without serious impact on serverload 2011-06-24 16:42:41 +08:00
Andrew Davis (andyjdavis)
b822fc8511 MDL-27829 blocks: added some brains to generate_page_type_patterns() so that it can handle special cases like course reports 2011-06-22 17:01:21 +08:00
Dongsheng Cai
b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
sam marshall
3fbe0e8a0f MDL-27627 Headers in moodleform_mod should have IDs 2011-05-27 13:40:02 +01:00