Commit graph

11025 commits

Author SHA1 Message Date
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
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
David Mudrak
71d1751c53 Improved the information display about a non-standard backup file 2011-05-18 12:19:57 +02:00
David Mudrak
f666f14930 The first attempt to include backup conversion in the restore process
With this initial implementation, we do not display any information
about the backup contents yet. The non-standard backup file is just
silently converted at the beginning of the settings stage, as soon as
the restore controller is available.

In the future we will probably want to display the information about the
contents of the converted file as if we were restoring from standard
MBZ format. However this includes more work in the restore UI machinery
and I leave it open for now.
2011-05-18 01:55:27 +02:00
Tim Hunt
a2ac234956 MDL-20636 Merge remote-tracking branch 'moodle/master' into upgrade
Conflicts:
	lib/filestorage/file_storage.php
	mod/quiz/attemptlib.php
	mod/quiz/lib.php
	mod/quiz/mod_form.php
	mod/quiz/report/overview/overview_table.php
	mod/quiz/report/overview/report.php
	mod/quiz/report/responses/report.php
	mod/quiz/report/responses/responses_table.php
	mod/quiz/report/statistics/db/install.xml
	mod/quiz/report/statistics/qstats.php
	mod/quiz/report/statistics/report.php
	mod/quiz/report/statistics/statistics_question_table.php
	mod/quiz/report/statistics/statistics_table.php
	mod/quiz/report/statistics/version.php
	mod/quiz/review.php
	mod/quiz/reviewquestion.php
	mod/quiz/startattempt.php
	mod/quiz/styles.css
	mod/quiz/view.php
	question/type/essay/questiontype.php
	question/type/match/backup/moodle2/backup_qtype_match_plugin.class.php
	question/type/match/backup/moodle2/restore_qtype_match_plugin.class.php
	question/type/numerical/display.html
	question/type/numerical/questiontype.php
	question/type/questiontype.php
	question/type/random/questiontype.php
	question/type/shortanswer/questiontype.php
	theme/base/style/question.css
2011-05-11 20:29:49 +01:00
Sam Hemelryk
644b14c552 Merge branch 'MDL-27367-HEAD' of git://github.com/srynot4sale/moodle 2011-05-09 10:20:15 +08:00
Sam Hemelryk
d045b479f4 Merge branch 's9_MDL-26854_spam_comments_master_2' of git://github.com/dongsheng/moodle 2011-05-05 10:41:53 +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
Dongsheng Cai
c1951ea953 MDL-26854 COMMENT
1. added pluginname_comment_validate callback to comments api
2. change permission callback defaults to false
3. Tidied up serveal areas of comments and implemented callback to
ignore system permissions for view (credits to Sam Hemelryk)

AMOS BEGIN
    MOV [modulerejectcomment,error],[callbackrejectcomment,error]
AMOS END
2011-05-04 17:23:46 +08:00
Sam Hemelryk
f4c7c735f5 Merge branch 's10_MDL-27330_dropbox_authorization_url_master' of github.com:dongsheng/moodle 2011-05-04 13:53:47 +08:00
Aaron Barnes
0e5e1daaee MDL-26190 completion blocks: Completion blocks shouldn't ever be blank 2011-05-04 12:55:26 +12:00
Dongsheng Cai
810aea11df MDL-27330 repository dropbox plugin
Dropbox changed authorization URL, and added a few error check code
2011-05-03 17:41:03 +08:00
Sam Hemelryk
c8ad2c12ba Merged MDL-26388 Fixed whitespace 2011-05-03 16:27:31 +08:00
Sam Hemelryk
5f1c825dfa Merged MDL-27251 Fixed up whitespace, Fixed broken string, reworded new strings 2011-05-03 10:51:06 +08:00
Dongsheng Cai
f392caba15 MDL-26388, pop up a dialog when attaching a file already being used in draft area. 2011-05-02 10:11:19 +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
Aparup Banerjee
60b5a2fec7 MDL-27251 Files API - added timeout re-calculation as an optional argument. added setting for minimum Kbps for large files fetched from internet where the passed in timeout maybe too low.
allowed turning off the http HEAD request timeout calculation with zero (or negative) bitrate

	This was added in to allow servers that have a problem with
	HEAD requests to carry on with the given timeout without re-calculations.
	See PULL-651 for the discussion.

	the optional argument to force recalculation of timeout has been forced within scorm/locallib.php

	timeout re-calculation only increments timeout.
2011-04-27 10:49:40 +08:00
Eloy Lafuente (stronk7)
0540e39af9 Merge branch 'w17_MDL-27263_m21_loggedintypo' of git://github.com/skodak/moodle 2011-04-26 11:04:39 +02:00
Petr Skoda
3c2fffbaa7 MDL-27263 fix already logged in error message typo 2011-04-21 20:35:16 +02:00
Sam Hemelryk
75ee207b81 MDL-26770 enrol - Added support for bulk operations by enrol plugins 2011-04-21 10:13:13 +08:00
Sam Hemelryk
12a52d7c6e MDL-23532 enrol - removed general handling of user enrolment editing/unenrolment plugins are now responsible for this 2011-04-21 10:02:55 +08:00
Andrew Davis (andyjdavis)
3aafffc043 MDL-26835 gradebook: grader report now marks suspended students 2011-04-18 14:29:13 +08:00
David Mudrak
a95682b2b3 MDL-27053 Code maturity info added to admin notifications page
The patch introduces a new string to be displayed at admin notifications
page. The maturity level message for upgrade/install reworded as
requested in the tracker.

The patch also adds a new core call to purge all caches at the beginning
of the upgrade. This must be done before the upgrade starts so that the
strings are re-fetched from the updated source and not from the on-disk
cache.
2011-04-13 15:03:25 +02:00
Tim Hunt
6160bdb1f3 MDL-20636 Move question lang strings to the right place. 2011-04-12 15:20:29 +01:00
Petr Skoda
d2e360a95b Merge branch 'MDL-25718_recover_grades_master' of git://github.com/andyjdavis/moodle 2011-04-12 09:50:20 +02:00
Eloy Lafuente (stronk7)
af58cf7d40 Merge branch 'w15_MDL-26805_m21_userpol' of git://github.com/skodak/moodle 2011-04-11 15:15:40 +02:00
Petr Skoda
82053cb192 MDL-26805 cleanup default role selections
Frontpage role selection now allows only guest and frontpage roles. Default forntpage role is selected duuring install. Unused nodefaultuserrolelists option was removed completely. Coding style improvements.
2011-04-11 13:10:50 +02:00
Eloy Lafuente (stronk7)
920234498e Merge branch 's9_MDL-27098_filemanager_strings_master' of git://github.com/dongsheng/moodle 2011-04-11 11:18:23 +02:00
Dongsheng Cai
6d30723e41 MDL-27098
1. Fixed add file language string
2. Fixed hard-coded 'moving' string
3. Fixed hard-coded 'Files' string
2011-04-11 17:09:15 +08:00
Petr Skoda
b7e96b0ac0 MDL-27056 update location of GeoLite City file 2011-04-10 15:28:44 +02:00
Andrew Davis (andyjdavis)
13ba903634 enrol MDL-25718 added ability to recover user grades from grade history 2011-04-08 15:06:27 +08:00
Eloy Lafuente (stronk7)
b76070db70 Merge branch 'wip-MDL-26858' of git://github.com/samhemelryk/moodle 2011-04-04 21:53:17 +02:00
Eloy Lafuente (stronk7)
a7174151db Merge branch 'MDL-11288-course-module-cloning' of git://github.com/mudrd8mz/moodle 2011-04-04 12:35:04 +02:00
Petr Skoda
33620e1772 Merge branch 'MDL-26784-plugin-manager' of git://github.com/mudrd8mz/moodle 2011-04-04 11:55:39 +02:00
Sam Hemelryk
af8851282e enrolments MDL-26858 Added finish user enrolments button to JS dialogue 2011-04-04 14:37:35 +08:00
David Mudrak
91dedc324f MDL-26784 Strings for the new plugin manager
The new strings file core_plugin defines names of all plugin types
supported by Moodle. Some strings have already been defined elsewhere
and we use AMOS script here to copy their translation, if it is
available.

AMOS BEGIN
 CPY [settings,core],[settings,core_plugin]
 CPY [status,core],[status,core_plugin]
 CPY [missingfromdisk,core],[status_missing,core_plugin]
 CPY [nodatabase,core_admin],[status_nodb,core_plugin]
 CPY [authenticationplugins,core],[type_auth_plural,core_plugin]
 CPY [block,core],[type_block,core_plugin]
 CPY [blocks,core],[type_block_plural,core_plugin]
 CPY [coursereport,core],[type_coursereport,core_plugin]
 CPY [coursereports,core],[type_coursereport_plural,core_plugin]
 CPY [filter,core],[type_filter,core_plugin]
 CPY [courseformats,core],[type_format_plural,core_plugin]
 CPY [activitymodule,core],[type_mod,core_plugin]
 CPY [activitymodules,core],[type_mod_plural,core_plugin]
 CPY [plagiarism,core_plagiarism],[type_plagiarism,core_plugin]
 CPY [portfolio,core_portfolio],[type_portfolio,core_plugin]
 CPY [portfolios,core_portfolio],[type_portfolio_plural,core_plugin]
 CPY [questiontype,core_admin],[type_qtype,core_plugin]
 CPY [questiontypes,core_admin],[type_qtype_plural,core_plugin]
 CPY [repository,core_repository],[type_repository,core_plugin]
 CPY [theme,core],[type_theme,core_plugin]
 CPY [themes,core],[type_theme_plural,core_plugin]
 CPY [uninstallplugin,core_admin],[uninstall,core_plugin]
 CPY [version,core],[version,core_plugin]
 CPY [assignmenttype,mod_assignment],[subplugintype_assignment,mod_assignment]
 CPY [presets,mod_data],[subplugintype_datapreset_plural,mod_data]
 CPY [evaluationmethod,mod_workshop],[subplugintype_workshopeval,mod_workshop]
 CPY [strategy,mod_workshop],[subplugintype_workshopform,mod_workshop]
AMOS END
2011-03-31 13:59:05 +02:00
David Mudrak
b9934a173a MDL-26784 Improved plugins check screen and the new plugins management screen
This patch introduces new lib/pluginlib.php library that provides
unified access meta-information about all present plugin types. The
library defines plugin_manager singleton that in turn gathers
information about all present plugins and their status. The list of
plugins can be rendered either as plugins check table or plugins control
panel.

This makes print_plugins_table() function obsolete and because it is not
expected to be called by any contrib plugin, the function is removed.
CSS for the legacy table generated by print_plugins_table() is cleaned
up.
2011-03-31 13:59:05 +02:00
David Mudrak
fa82056328 MDL-11288 Added ability to duplicate module in the course
Internally, the new script modduplicate.php performs a single activity
backup and restore and then moves the newly created copy right below the
original.
2011-03-31 13:39:05 +02:00
David Mudrak
74a4c9a9ee MDL-26914 When installing a lang pack, install all the grandparents too
All places where a language pack is installed now use the new language
package installer that takes case of the parental dependencies.
2011-03-31 12:21:05 +02:00
Eloy Lafuente (stronk7)
df8248b035 Merge branch 'MDL-26804-langlistcache_master' of git://github.com/mudrd8mz/moodle 2011-03-28 14:48:38 +02:00
Petr Skoda
c6a074f867 MDL-26795 fix incorrect location of email change strings
AMOS BEGIN
 MOV [auth_emailchangecancel,auth_email],[emailchangecancel,core_auth]
 MOV [auth_emailchangepending,auth_email],[emailchangepending,core_auth]
 MOV [auth_emailupdate,auth_email],[emailupdate,core_auth]
 MOV [auth_emailnowexists,auth_email],[emailnowexists,core_auth]
 MOV [auth_emailupdatemessage,auth_email],[emailupdatemessage,core_auth]
 MOV [auth_emailupdatesuccess,auth_email],[emailupdatesuccess,core_auth]
 MOV [auth_emailupdatetitle,auth_email],[emailupdatetitle,core_auth]
 CPY [auth_emailnoemail,auth_email],[noemail,auth_ldap]
AMOS END
2011-03-27 17:19:23 +02:00
David Mudrak
a9cbd19bff MDL-26804 core_string_manager::get_list_of_translations() can use a cache again
This patch reimplements the internal cache that was used to store the
list of available translations in Moodle 1.x. By default, the method
get_list_of_translations() still uses the file
moodledata/cache/languages to store the list of available translations.
The location of that file can be redefined in config.php. The internal
format of the cache file is JSON now (used to be a plain text list).

The patch also fixes a usage of the global $CFG in translation_exists()
methods where the internal property should be used instead.
2011-03-24 21:51:30 +01:00
Tim Hunt
c73c98365b MDL-20636 Question import, support for files in hints.
Also fix some minor bugs and unit tests.
2011-03-23 14:27:22 +00:00
Dongsheng Cai
2848b97948 MDL-24877, do not display all courses in course category tree if there are too many courses in moodle 2011-03-14 17:04:06 +08:00
David Mudrak
1a4d6a5b60 MDL-26609 Display information about the current version during the upgrade
As Eloy Lafuente noticed in the tracker discussion, we display the
information about the current version in the browser window title but
not at the screen itself. The patch fixes that by displaying the
information in the page heading instead of the page title.

Eloy's original idea to put the information into the grey message box
would require a change of [upgradesure,core_admin] string because
unfortunately it does not expect $a as an object but as a plain string.
2011-03-04 05:59:08 +01:00
David Mudrak
3d673fc474 MDL-26609 Admins are warned if they try to install or upgrade to unstable version
The commit introduces four new constants that can be used to declare a
maturity level of Moodle core and, in the future, of extension plugins.
If the administrator is about to install or upgrade Moodle to a version
that is not considered as production-ready yet, a warning is displayed
before any change in the database.
2011-03-04 05:59:08 +01:00
Tim Hunt
42663bb78e MDL-20636 Fix a bunch of missing strings caused by separating question from quiz. 2011-03-02 17:42:53 +00:00
Tim Hunt
e2cba246b7 MDL-20636 Merge vle/master into ouqe2
Conflicts:
	mod/quiz/locallib.php
	mod/quiz/report/overview/overview_table.php
	mod/quiz/report/overview/report.php
	mod/quiz/report/responses/report.php
	question/type/random/questiontype.php
2011-03-02 17:34:18 +00:00
Petr Skoda
431ac39634 MDL-26623 fix file permissions
The permissions are now going to be verified as part of the weekly release process.
2011-03-01 12:26:49 +01:00
Eloy Lafuente (stronk7)
8cf42d248e Merge branch 'w09_MDL-26564_20_uploadusers' of git://github.com/skodak/moodle 2011-03-01 12:05:52 +01:00