Commit graph

58321 commits

Author SHA1 Message Date
Dan Poltawski
b4272e0005 Merge branch 'wip-MDL-36066-master' of git://github.com/marinaglancy/moodle 2012-11-26 11:42:35 +08:00
Marina Glancy
d9c91ffc9e MDL-36066 Removed accidentally added image file causing wrong filemanager display 2012-11-26 10:32:08 +08:00
Damyon Wiese
63f57b2b3c MDL-36728: Assignment - submission statement default - Add a langstring fix 2012-11-26 10:30:37 +08:00
Damyon Wiese
a2d5581730 MDL-36728: Assignment - Improve usability of require submission statement setting.
This change will hide the setting "Require that students accept the submission statement" at
the assignment level if no submission statement has been configured for a site. It also includes a
change to the help text to separate the assignment level setting from the site level setting. This
change also sets a default assignment submission statement.

AMOS BEGIN
 CPY [requiresubmissionstatement,mod_assign],[requiresubmissionstatementassignment,mod_assign]
AMOS END
2012-11-26 15:06:22 +13:00
Sam Hemelryk
8a423efda9 Merge branch 'MDL-36609_master' of git://github.com/markn86/moodle 2012-11-26 14:58:13 +13:00
Adam Olley
8f27b77b26 MDL-33125: core_backup: Prevent import/activity duplication from duplicating manual grade items 2012-11-26 12:19:44 +10:30
Sam Hemelryk
4d9e8469e1 Merge branch 'MDL-35569-master' of git://git.luns.net.uk/moodle 2012-11-26 14:46:25 +13:00
Sam Hemelryk
1762071194 Merge branch 'wip-MDL-36551-master' of git://github.com/abgreeve/moodle 2012-11-26 14:44:40 +13:00
Eloy Lafuente (stronk7)
155bd5d54a Merge branch 'wip-MDL-36819-m24-rb' of git://github.com/samhemelryk/moodle 2012-11-26 02:29:58 +01:00
Eloy Lafuente (stronk7)
f725158ea6 Merge branch 'wip-MDL-36768-m24-r2' of git://github.com/samhemelryk/moodle 2012-11-26 02:28:12 +01:00
Sam Hemelryk
2b274ad001 MDL-36819 cache: implemented cache_is_configurable interface 2012-11-26 14:27:44 +13:00
Sam Hemelryk
75cde6b9ac MDL-36768 cache: replaced cache_store interface with abstract class 2012-11-26 14:11:01 +13:00
Sam Hemelryk
93e490613e Merge branch 'MDL-36763-master' of git://git.luns.net.uk/moodle 2012-11-26 11:42:28 +13:00
Sam Hemelryk
c7efe8b783 Merge branch 'MDL-36400-master' of git://github.com/ankitagarwal/moodle 2012-11-26 11:01:15 +13:00
Sam Hemelryk
6254d1d2ee Merge branch 'MDL-35963-master' of git://github.com/damyon/moodle 2012-11-26 10:40:58 +13:00
Sam Hemelryk
f1a90cc4fe Merge branch 'master_MDL-36772' of git://github.com/danmarsden/moodle 2012-11-26 10:24:42 +13:00
Sam Hemelryk
bd188851f2 MDL-36768 cache: Implemented abstract cache store base class 2012-11-26 08:12:45 +13:00
Sam Hemelryk
94ef67cf5f MDL-36466 cache: tidy up after review 2012-11-26 08:12:00 +13:00
Sam Hemelryk
3308259062 MDL-36466 cache: disabled caching during installation and upgrade 2012-11-26 08:12:00 +13:00
Sam Hemelryk
3680c61a3c MDL-36466 cache: implemented functionality to disable the bulk of the cache API 2012-11-26 08:12:00 +13:00
Sam Hemelryk
82afd05c35 MDL-36466 cache: renamed disable to disable_stores and added tests 2012-11-26 08:12:00 +13:00
Sam Hemelryk
c9f40e77b7 MDL-36466 cache: renamed define NO_CACHE_STORES to CACHE_DISABLE_STORES 2012-11-26 08:12:00 +13:00
Sam Hemelryk
7383a7e2a0 MDL-36466 cache: improved handling of exceptions during initialisation. 2012-11-26 08:11:59 +13:00
Nadav Kavalerchik
2bfdd57619 MDL-36812 - Enabling grade_report_fixedstudents, shows the user's list on the left side of the page, in RTL mode (theme/standard) 2012-11-24 23:12:45 +02:00
AMOS bot
2d1a0caa7d Automatically generated installer lang files 2012-11-24 00:42:50 +00:00
Tim Hunt
97f1137a61 MDL-36806 question files: fix unnecessary require_login call.
quiz_question_pluginfile later does the correct check. Doing this
other check first means you get an error about changing $PAGE->context.
2012-11-23 15:54:58 +00:00
Andrew Robert Nicols
ff56ecd315 MDL-36805 Correct docs for workshop_grade_item_update in mod_workshop
The documentation suggested that the modname field should be present on the
$workshop parameter when this is not required. It is not used in any point
in the function and the $workshop variable is never passed to another
function which may use it.
2012-11-23 15:49:17 +00:00
Tim Hunt
5f137dcbe2 MDL-36760 formslib: fix frozen elements with [] in name.
This was a regression caused by MDL-30845 or, to be precise, the related
issue MDL-32785.

Form elements with names like multipier[0] require special handling,
such as is present in HTML_QuickForm_element::_prepareValue. I have
added equivalent handling to MoodleQuickForm::exportValues. I am afraid
that I could not think of a way to do this reliably without duplicating
code.
2012-11-23 10:53:14 +00:00
Mark Nelson
5fe65fd438 MDL-36741 mod_forum: fixed SQL that was generated when either timed posts or groups were enabled 2012-11-23 17:01:50 +08:00
Frederic Massart
baf41e4b99 MDL-36802 usability: New icons used for LTI settings 2012-11-23 16:58:36 +08:00
Dan Poltawski
f42c34a38a On demand release 2.4beta+ 2012-11-23 16:07:34 +08:00
Dan Poltawski
ff3f0a2f43 MDL-36436 - fix ie9 svg compatibility 2012-11-23 16:06:30 +08:00
Dan Poltawski
eb48b61abb On demand release 2.4beta+ 2012-11-23 15:21:00 +08:00
Dan Marsden
ca9ee2d0eb MDL-36772 SCORM add boilerplate and remove <!-- as it cause jscache to crash and burn. 2012-11-23 20:20:46 +13:00
Dan Poltawski
62022cb553 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-11-23 15:11:14 +08:00
Jason Fowler
9e7d097926 MDL-35842 - Glossary, Blocks - Joseph Rézeau's patch for setting the Random Glossary block to progress alphabetically 2012-11-23 15:06:27 +08:00
Aparup Banerjee
9735135db7 Merge branch 'w47_MDL-36780_m24_redirect' of git://github.com/skodak/moodle 2012-11-23 14:47:25 +08:00
Frederic Massart
857c5f90e7 MDL-36775 usability: Code update following new calendar icons 2012-11-23 14:45:29 +08:00
Barbara Ramiro
5326675e20 MDL-36775 usability: New icons for calendar events 2012-11-23 14:11:07 +08:00
Frederic Massart
f2bba619b3 MDL-36631 usability: Core edit for new messaging icons 2012-11-23 12:16:35 +08:00
Barbara Ramiro
00a398fbc6 MDL-36631 usability: New icons for messaging 2012-11-23 12:14:06 +08:00
Petr Škoda
cbf99010bc MDL-36779 fix undefined NO_MOODLE_COOKIE after failed db connect 2012-11-23 12:05:49 +08:00
Frederic Massart
79ba32c607 MDL-36784 usability: CSS adjustments for Glossary print icon 2012-11-23 12:02:46 +08:00
Barbara Ramiro
40fb0a9e26 MDL-36784 usability: New print icon for glossary 2012-11-23 12:00:35 +08:00
Frederic Massart
bdb66a4635 MDL-36628 usability: CSS adjustments for book module 2012-11-23 11:30:05 +08:00
Barbara Ramiro
2da6e51e9c MDL-36628 usability: New icons for book module 2012-11-23 11:30:02 +08:00
Dan Poltawski
9a27ce00b8 Merge branch 'MDL-36204-files-with-spaces' of git://github.com/mudrd8mz/moodle 2012-11-23 11:28:51 +08:00
David Mudrák
2c9689ed21 MDL-36204 Improve moodle1 conversion of embedded files
URL of files referenced in HTML fields via $@FILEPHP$@ are usually
encoded if they were linked using the HTML editor. So if they contain
spaces or plus signs in the name, their URL is encoded to use %20 and
%2B respectively.

Sometimes, for example when the HTML was edited manually in 1.9 without
the editor, non-encoded file names may be put into the HTML text. Such a
link used to work in 1.9 so we add an explicit support for it, too.

However, we do not support partially encoded URLs (e.g. only spaces are
encoded while plus signs are not). Such links are unmodified and will
rely on Legacy files support.
2012-11-23 03:39:17 +01:00
Paul Nicholls
c931551acb MDL-32880: Add moodle1 backup converter for rss_client block.
Creates a shell rss_client.xml file, which contains no feeds.  This makes it behave the same as restoring a Moodle 1.9 backup into a different 1.9 site - the block is created, its title is as per the original course, but it has no feeds selected (and none are added to the site's feed list).
2012-11-23 09:29:29 +13:00
Paul Nicholls
14bb973bfa MDL-32880: Add moodle1 backup converter for html block.
This converter processes the HTML block's content, migrating any referenced files.
2012-11-23 09:29:10 +13:00