mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-06 16:59:56 +01:00
Code Issues Projects Releases Wiki Activity
49,287 Commits 36 Branches 523 Tags
Commit Graph

1842 Commits

Author SHA1 Message Date
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 marshall
3e4c243500 MDL-27001 'Show description' feature part 3: Implementation for all modules 
For modules that still used the 'old' generic object return from _get_coursemodule_info instead of returning a cached_cm_info object, I changed them to use the new format as part of this. This made a few areas of code regarding onclick links slightly nicer.
 2011-09-06 11:03:06 +01:00
Petr Skoda
11ec4ed51d MDL-28981 fix forum_user_can_post() call params 2011-08-21 15:50:23 +02:00
James Brisland
a8b2690bff MDL-28620 - Removed admin/generator.php include as it causes issues if this script is included from any other script that is running in the command line 2011-08-05 16:09:30 +01:00
Petr Skoda
7856cd8b8c Merge branch 'wip-MDL-27305-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:13:44 +02:00
Chris Follin
84b2b9aa77 MDL-27305 forum: Added missing item to forum_get_view_actions 2011-07-13 14:22:18 +08:00
Rossiani Wijaya
0d3780a1e8 MDL-27741 forum subscribe link: Removed 'no' string in social course format to display a subscribe link if user is not enrolled 2011-07-11 17:07:55 +08:00
Eloy Lafuente (stronk7)
26635fd7f9 Merge branch 'MDL-28169' of git://github.com/nebgor/moodle 2011-07-07 10:21:32 +02:00
Aparup Banerjee
c5a8abfedd MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts. 2011-07-07 11:40:38 +08:00
Sam Hemelryk
b8d3c3f76e MDL-28172 forum: Fixed up overzealous check for portfolio enabled. 2011-07-04 15:04:16 +08:00
Eloy Lafuente (stronk7)
715a5bb732 MDL-27829 blocks - lang string fixes. Credit goes to Helen! 2011-07-01 20:38:06 +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)
b38e2e28a1 MDL-27829 blocks: altered the algorithm used to find plugin page types 2011-06-27 12:27:41 +08:00
Sam Hemelryk
6708a1f525 MDL-27810 portfolio: Added ->portfolioenabled checks before creating portfolio buttons to avoid initialising portfolio requirements 2011-06-21 10:35:53 +08:00
Eloy Lafuente (stronk7)
84a5f2d26e Merge branch 'MDL-27820' of git://github.com/stronk7/moodle 2011-06-15 11:59:52 +02:00
Eloy Lafuente (stronk7)
5edac71d16 MDL-27820 backup - fix backup of ratings 2011-06-15 11:01:41 +02:00
Eloy Lafuente (stronk7)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02:00
Sam Hemelryk
46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
David Mudrak
b61cf3ff8a MDL-22414 Merge branch 'master' into backup-convert 
Conflicts:
	theme/base/style/core.css
 2011-06-09 13:04:49 +02: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
David Mudrak
c5c315e2a7 MDL-27718 Migrate files embedded in the activity intro fields 
Contains various fixed spotted through the way, too.
 2011-06-05 17:37:58 +02:00
Ruslan Kabalin
e710658d89 MDL-27171 forum: refactor forum settings 
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
 2011-05-27 13:49:28 +01:00
Ruslan Kabalin
2f2137fca4 MDL-27171 messages: admin settings reordering 
This includes:
 * most email settings go from general admin setings to email plugin settings
 * digestmailtime goes to mod/forum/settings.php
 * supportname, supportemail and supportpage go to Support contact page
 * all jabber settings go from general admin setings to jabber plugin settings

AMOS BEGIN
 MOV [jabberhost,admin],[jabberhost,message_jabber]
 MOV [configjabberhost,admin],[configjabberhost,message_jabber]
 MOV [jabberserver,admin],[jabberserver,message_jabber]
 MOV [configjabberserver,admin],[configjabberserver,message_jabber]
 MOV [jabberusername,admin],[jabberusername,message_jabber]
 MOV [configjabberusername,admin],[configjabberusername,message_jabber]
 MOV [jabberpassword,admin],[jabberpassword,message_jabber]
 MOV [configjabberpassword,admin],[configjabberpassword,message_jabber]
 MOV [jabberport,admin],[jabberport,message_jabber]
 MOV [configjabberport,admin],[configjabberport,message_jabber]
 MOV [digestmailtime,admin],[digestmailtime,forum]
 MOV [configdigestmailtime,admin],[configdigestmailtime,forum]
 MOV [allowusermailcharset,admin],[allowusermailcharset,message_email]
 MOV [configallowusermailcharset,admin],[configallowusermailcharset,message_email]
 MOV [mailnewline,admin],[mailnewline,message_email]
 MOV [configmailnewline,admin],[configmailnewline,message_email]
 MOV [noreplyaddress,admin],[noreplyaddress,message_email]
 MOV [confignoreplyaddress,admin],[confignoreplyaddress,message_email]
 MOV [sitemailcharset,admin],[sitemailcharset,message_email]
 MOV [configsitemailcharset,admin],[configsitemailcharset,message_email]
 MOV [smtphosts,admin],[smtphosts,message_email]
 MOV [configsmtphosts,admin],[configsmtphosts,message_email]
 MOV [smtpmaxbulk,admin],[smtpmaxbulk,message_email]
 MOV [configsmtpmaxbulk,admin],[configsmtpmaxbulk,message_email]
 MOV [smtpuser,admin],[smtpuser,message_email]
 MOV [configsmtpuser,admin],[configsmtpuser,message_email]
 MOV [smtppass,admin],[smtppass,message_email]
AMOS END

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
 2011-05-27 13:49:28 +01:00
David Mudrak
f6f7a7266c Merge branch 'master' into backup-convert 
Conflicts:
	backup/util/xml/parser/processors/simplified_parser_processor.class.php
	backup/util/xml/parser/simpletest/testparser.php
 2011-05-26 17:30:27 +02:00
Eloy Lafuente (stronk7)
c4cee99c7b MDL-27625 rating - fix one merging problem 2011-05-25 22:34:51 +02:00
Eloy Lafuente (stronk7)
f2e725930b MDL-27471 rating - whitespace cleanup 2011-05-25 16:54:51 +02:00
Eloy Lafuente (stronk7)
5b52ce19c5 Merge branch 'MDL-27625_master' of git://github.com/stronk7/moodle 
Conflicts:
	mod/forum/lib.php
 2011-05-25 16:37:43 +02:00
Eloy Lafuente (stronk7)
5693d56cd8 MDL-27625 rating - consider RATING_UNSET_RATING a valid rating value 2011-05-25 12:00:16 +02:00
David Mudrak
8bcefb3254 Activity module handler get_moduleid() replaced with get_cminfo() 2011-05-24 16:01:00 +02:00
Sam Hemelryk
2b04c41c58 MDL-27471 Adding mandatory component & ratingarea to the ratings API + other fixes 
* Added the component and ratingarea fields and implemented it throughout
  the rating API as mandatory fields
* Cleanup rating indexes
* Upgrade forum/data/glossary ratings
* Moved the logic in the render_rating method to methods of the rating object.
* Added new callback for checking ratingareas
* Cleaned comments here and there
* Mark the xxx_get_participants methods as deprecated
* Refactor rate_ajax and ratingsuser_can_view_aggregate methods
* Cleaned up rating/index.php to use html_table object and moved inline styles to CSS.
* Added missing properties of the rating object that were being set throughout the rating
  API.
 2011-05-23 12:35:39 +02:00
Andrew Davis (andyjdavis)
ab1da2675d MDL-27442 forum: allow forum to be restored into 2.1 from a 1.9 backup 2011-05-19 13:41:01 +02:00
David Mudrak
c18f90f22f Merge remote branch 'github/master' into backup-convert 2011-05-18 16:08:15 +02:00
Sam Hemelryk
74cf2d0015 MDL-26704 Fixed up variable typo 2011-05-18 15:32:40 +08:00
Eloy Lafuente (stronk7)
94a74f549a MDL-26704 gradebook: adding TODO comment to avoid forgetting 2011-05-17 11:58:22 +02:00
Eloy Lafuente (stronk7)
dcc26efb70 Merge branch 'MDL-26704_user_outline_report_master' of git://github.com/andyjdavis/moodle 2011-05-17 11:55:04 +02:00
David Mudrak
baa6f6a848 Improved course module info conversion 2011-05-13 02:41:47 +02:00
Andrew Davis (andyjdavis)
6ac149dce3 MDL-27387 rating: prevent the submission of ratings outside of the range allowed by the current scale 2011-05-11 11:29:31 +08:00
David Mudrak
1e2c735111 MDL-27376 MDL-27377 MDL-27378 Backup converters refactoring - work in progress 
These are David's changes of Mark's code that replace the
plan/tasks/steps infrastructure with a bit simpler one. The changes will
be described in the next commit that will actually finish the
conversion.

TODO: refactor backup/converter/moodle1/stepslib.php into conversion
handlers.
 2011-05-10 17:58:00 +02:00
David Mudrak
0164592b8c MDL-27376 MDL-27377 Backup converters API refactored 
* Several base_converter methods made protected when there was no obvious
reason why they should be public (subject of eventual change still).
* The conversion chain now constructed in advance before any converter
class is instantiated, using Dijkstra's algorithm.
 2011-05-10 17:57:59 +02:00
David Mudrak
e48477d94f MDL-22414 Fixed standard copyright file headers (R0417) 2011-05-10 17:57:59 +02:00
Mark Nielsen
5aee1af3f1 Adding plugin abstract class and adding a step to activities to generate their module.xml 2011-05-10 17:57:57 +02:00
Mark Nielsen
72c089f117 Adding in activity support and adding base forum classes as proof of concept 2011-05-10 17:57:57 +02:00
Andrew Davis (andyjdavis)
4433f871f2 MDL-26704 gradebook: added some intelligence to the dates displayed on the user outline activity report 2011-05-10 11:14:16 +08:00
Sam Hemelryk
2c82d0eeb0 Merge branch 'MDL-26838_ratings_bad_data_master4' of git://github.com/andyjdavis/moodle 2011-05-05 10:18:39 +08:00
Andrew Davis (andyjdavis)
778361c330 MDL-26838 rating: multiple fixes after a review of rating validation code 2011-05-04 15:43:30 +08:00
Sam Hemelryk
870815faed Merged MDL-25805 Renamed property and function to be a little more descriptive 2011-05-03 15:41:34 +08:00
Aparup Banerjee
b9bcad24db MDL-25805 Roles propagated ugly hack for parent seeing child activities into navigation lib to display nav node. 2011-05-02 20:08:08 +08:00
Andrew Davis (andyjdavis)
2c2ff8d5fc MDL-26838 rating: remove logged in users ability to sidestep rating validity checks 2011-05-01 18:50:13 +08:00
Petr Skoda
cf717dc26b MDL-27148 use new get_in_or_equal() param prefix instead of start 2011-04-14 15:15:01 +02:00
sam marshall
6553cda7c9 MDL-26778 Change to completion should immediately affect nav block 
Includes change so that updating completion resets the cache, and a debugging
warning if any module calls the completion viewed thing after it's already
printed navigation (which will mean navigation obviously doesn't update right
away). All existing modules that currently update after printing navigation
were updated.
 2011-04-11 12:40:13 +01:00