Dan Poltawski [Mon, 18 Feb 2013 03:55:29 +0000 (11:55 +0800)]
MDL-35622 - fix crazy character causing upgrade problems
Can you see it?!
Dan Poltawski [Mon, 18 Feb 2013 03:31:07 +0000 (11:31 +0800)]
Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/db/upgrade.php
version.php
Dan Poltawski [Mon, 18 Feb 2013 03:07:28 +0000 (11:07 +0800)]
Merge branch 'MDL-34800_ajax_submit' of git://github.com/andyjdavis/moodle
Damyon Wiese [Mon, 18 Feb 2013 02:34:30 +0000 (10:34 +0800)]
MDL-37683 cache: - Comments cleanup and remove ;;
Damyon Wiese [Mon, 18 Feb 2013 01:30:47 +0000 (09:30 +0800)]
Merge branch 'wip-MDL-37683-m25' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Sun, 17 Feb 2013 21:20:02 +0000 (10:20 +1300)]
MDL-37683 cache: improved indentifier collection and storage
Sam Hemelryk [Wed, 6 Feb 2013 00:45:17 +0000 (13:45 +1300)]
MDL-37683 cache: siteidentifier is now included in the keys
Eloy Lafuente (stronk7) [Fri, 15 Feb 2013 01:13:32 +0000 (02:13 +0100)]
MDL-38040 Clean core from CRLFs
Damyon Wiese [Thu, 14 Feb 2013 05:46:04 +0000 (13:46 +0800)]
weekly release 2.5dev
Damyon Wiese [Thu, 14 Feb 2013 05:43:58 +0000 (13:43 +0800)]
Fix permissions
Damyon Wiese [Thu, 14 Feb 2013 05:37:48 +0000 (13:37 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
AMOS bot [Thu, 14 Feb 2013 00:49:54 +0000 (00:49 +0000)]
Automatically generated installer lang files
Dan Poltawski [Wed, 13 Feb 2013 07:47:27 +0000 (15:47 +0800)]
Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 13 Feb 2013 06:54:24 +0000 (14:54 +0800)]
MDL-37883 Assignment Grade import/export. Additional fix to prevent different grade rounding on export.
Damyon Wiese [Wed, 13 Feb 2013 07:04:51 +0000 (15:04 +0800)]
Merge branch 'MDL-37750_master-add-seconds' of git://github.com/dmonllao/moodle
David Monllao [Wed, 13 Feb 2013 05:19:56 +0000 (13:19 +0800)]
MDL-37750 behat: More time for AJAX-related actions
When we want to assert against data coming
from an AJAX request with 1 second we don't
have enough time to ensure the elements are
loaded
Dan Poltawski [Wed, 13 Feb 2013 03:43:36 +0000 (11:43 +0800)]
MDL-30637 - fix padding on show/collapse arrow
AMOS bot [Wed, 13 Feb 2013 00:45:39 +0000 (00:45 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 21:49:05 +0000 (22:49 +0100)]
Merge branch 'MDL-37598-abort-after-config' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 09:12:01 +0000 (10:12 +0100)]
Merge branch 'MDL-37953_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 09:07:58 +0000 (10:07 +0100)]
Merge branch 'MDL-37787_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 09:03:29 +0000 (10:03 +0100)]
MDL-37893 Take rid of old comment.
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 09:02:23 +0000 (10:02 +0100)]
Merge branch 'MDL-37893-grouped-empty' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 12 Feb 2013 08:13:48 +0000 (16:13 +0800)]
Merge branch 'wip-MDL-37976-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 12 Feb 2013 07:48:33 +0000 (15:48 +0800)]
Merge branch 'wip-mdl-37633' of git://github.com/rajeshtaneja/moodle
Conflicts:
mod/forum/db/upgrade.php
mod/forum/version.php
Dan Poltawski [Tue, 12 Feb 2013 07:44:17 +0000 (15:44 +0800)]
Merge branch 'MDL-37768_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 12 Feb 2013 07:08:53 +0000 (15:08 +0800)]
Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle
Rajesh Taneja [Thu, 31 Jan 2013 06:01:41 +0000 (14:01 +0800)]
MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default
Damyon Wiese [Tue, 12 Feb 2013 06:48:40 +0000 (14:48 +0800)]
Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle
Conflicts:
course/tests/behat/add_activities.feature
Damyon Wiese [Tue, 12 Feb 2013 06:47:50 +0000 (14:47 +0800)]
Merge branch 'MDL-37750_master-fix' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 12 Feb 2013 06:39:20 +0000 (14:39 +0800)]
Merge branch 'MDL-37012-master' of git://github.com/mouneyrac/moodle
Damyon Wiese [Tue, 12 Feb 2013 06:15:29 +0000 (14:15 +0800)]
Merge branch 'wip-mdl-20131' of git://github.com/rajeshtaneja/moodle
David Monllao [Tue, 12 Feb 2013 06:06:51 +0000 (14:06 +0800)]
MDL-37750 behat: Removing (now) collapsed elements
Dan Poltawski [Tue, 12 Feb 2013 05:47:37 +0000 (13:47 +0800)]
Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 12 Feb 2013 05:39:07 +0000 (13:39 +0800)]
Merge branch 'MDL-37074-master' of git://github.com/damyon/moodle
Tim Hunt [Thu, 7 Feb 2013 17:46:55 +0000 (17:46 +0000)]
MDL-37924 quiz settings: change wrong 'fix' => 'adv'.
Damyon Wiese [Tue, 12 Feb 2013 05:09:18 +0000 (13:09 +0800)]
Merge branch 'MDL-37654_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 12 Feb 2013 04:12:44 +0000 (12:12 +0800)]
Merge branch 'MDL-37164_message_self' of git://github.com/andyjdavis/moodle
Damyon Wiese [Tue, 12 Feb 2013 03:40:40 +0000 (11:40 +0800)]
Merge branch 'MDL-37828_master' of git://github.com/lazydaisy/moodle
Rajesh Taneja [Tue, 12 Feb 2013 02:11:32 +0000 (10:11 +0800)]
MDL-20131 Glossary: Fixed courseid typo
Dan Poltawski [Tue, 12 Feb 2013 02:34:07 +0000 (10:34 +0800)]
Merge branch 'wip-MDL-34798_master-2' of git://github.com/gjb2048/moodle
Mark Nelson [Mon, 11 Feb 2013 03:51:41 +0000 (11:51 +0800)]
MDL-37953 mod_forum: using named parameters to build SQL statement
Damyon Wiese [Tue, 12 Feb 2013 02:09:26 +0000 (10:09 +0800)]
Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle
Conflicts:
version.php
Marina Glancy [Tue, 12 Feb 2013 01:53:47 +0000 (12:53 +1100)]
MDL-37976 fixed missing global
Dan Poltawski [Tue, 12 Feb 2013 01:45:38 +0000 (09:45 +0800)]
Merge branch 'MDL-37952' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 12 Feb 2013 01:43:50 +0000 (09:43 +0800)]
Merge branch 'MDL-37886_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 12 Feb 2013 01:33:13 +0000 (09:33 +0800)]
MDL-37831: Version bump for js changes.
Damyon Wiese [Tue, 12 Feb 2013 01:15:23 +0000 (09:15 +0800)]
Merge branch 'MDL-37831_filepicker_buttons' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 00:20:56 +0000 (01:20 +0100)]
Merge branch 'MDL-37943' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 00:16:48 +0000 (01:16 +0100)]
Merge branch 'MDL-37686-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 00:13:18 +0000 (01:13 +0100)]
Merge branch 'MDL-37896' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 00:07:43 +0000 (01:07 +0100)]
Merge branch 'MDL-37919-phpunit-exception' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 11 Feb 2013 23:59:39 +0000 (00:59 +0100)]
Merge branch 'MDL-35037' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 11 Feb 2013 23:43:38 +0000 (00:43 +0100)]
Merge branch 'MDL-37961-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 11 Feb 2013 22:31:38 +0000 (23:31 +0100)]
Merge branch 'wip-MDL-35832-master' of git://github.com/phalacee/moodle
David Mudrák [Thu, 24 Jan 2013 17:39:24 +0000 (18:39 +0100)]
MDL-37598 Proceed full setup in YUI serving files if needed
When serving Moodle YUI files, including just moodlelib.php is not enough
any more. We need the full setup in order to use MUC.
Please note that cookies are disabled in these two scripts. This may make
cache_store::MODE_SESSION caches unavailable. We do not expect they will
be needed here.
Gareth J Barnard [Mon, 11 Feb 2013 13:43:42 +0000 (13:43 +0000)]
MDL_34798 format_topics and format_weeks: Adjust section names when moving up.
Dan Poltawski [Mon, 11 Feb 2013 08:43:34 +0000 (16:43 +0800)]
Merge branch 'master_MDL-35332' of git://github.com/totara/moodle
Simon Coggins [Mon, 11 Feb 2013 08:38:07 +0000 (21:38 +1300)]
MDL-35332: Use fast hash when generating hashes during tests
Matt Oquist [Sat, 9 Feb 2013 20:50:51 +0000 (15:50 -0500)]
MDL-37953 mod_forum: replace hard-coded numbers with defined values
mod/forum/lib.php sets forum_posts.mailed to 0, 1, and 2. What do these numbers
mean? This patch creates defined values for these otherwise-mysterious
numbers.
Damyon Wiese [Mon, 11 Feb 2013 07:18:12 +0000 (15:18 +0800)]
MDL-37122 core get_max_upload_sizes: Removed unit test for no limit as it is depends on settings in php.ini
Dan Poltawski [Mon, 11 Feb 2013 06:55:13 +0000 (14:55 +0800)]
Merge branch 'MDL-34137_label_dndupload' of git://github.com/davosmith/moodle
Damyon Wiese [Mon, 11 Feb 2013 06:51:11 +0000 (14:51 +0800)]
Merge branch 'master_MDL-35332' of git://github.com/totara/moodle
Conflicts:
lib/tests/moodlelib_test.php
version.php
Frederic Massart [Mon, 11 Feb 2013 06:37:19 +0000 (14:37 +0800)]
MDL-37961 webservice: PARAM_BOOL with PARAM_DEFAULT accepts boolean default
Dan Poltawski [Mon, 11 Feb 2013 06:32:53 +0000 (14:32 +0800)]
Merge branch 'MDL-37039-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 11 Feb 2013 06:24:04 +0000 (14:24 +0800)]
Merge branch 'MDL-37122-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 11 Feb 2013 05:58:36 +0000 (13:58 +0800)]
Merge branch 'MDL-37797' of git://github.com/rwijaya/moodle
Andrew Davis [Fri, 26 Oct 2012 02:43:39 +0000 (10:43 +0800)]
MDL-36091 added debugging() calls in blocks of code marked as "should never happen"
Frederic Massart [Tue, 29 Jan 2013 09:46:02 +0000 (17:46 +0800)]
MDL-5875 forum: Option to display post word count
Rajesh Taneja [Fri, 1 Feb 2013 09:02:39 +0000 (17:02 +0800)]
MDL-20131 Glossary: Global glossary can be added in Random glossary entry block.
Dan Poltawski [Mon, 11 Feb 2013 02:56:36 +0000 (10:56 +0800)]
MDL-35819 - version bump for various JS changes
Dan Poltawski [Mon, 11 Feb 2013 02:56:07 +0000 (10:56 +0800)]
Merge branch 'MDL-35819-m' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 11 Feb 2013 02:11:20 +0000 (10:11 +0800)]
MDL-30637 Formslib - Cleanup for shortforms implementation (mostly comments)
Also added deprecated functions for the functions that were removed from MoodleQuickForm.
Damyon Wiese [Mon, 11 Feb 2013 02:37:03 +0000 (10:37 +0800)]
Merge branch 'MDL-30637-master' of git://github.com/lucisgit/moodle
Frederic Massart [Sat, 29 Sep 2012 06:33:49 +0000 (08:33 +0200)]
MDL-35622 files: Add support for SMART Notebook MIME types
- The MIME type for Notebook files is: application/x-smarttech-notebook
- The MIME type for Gallery files is also: application/x-smarttech-notebook
Refs: http://exchange-forum.smarttech.com/forums/p/5152/11945.aspx#11945
Original author: Matteo Scaramuccia <moodle@matteoscaramuccia.com>
Fixed by: Paul Holden <pholden@greenhead.ac.uk>
Andrew Davis [Sat, 26 Jan 2013 01:39:48 +0000 (09:39 +0800)]
MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests
Andrew Davis [Mon, 14 Jan 2013 01:08:22 +0000 (09:08 +0800)]
MDL-37164 core_message: prevent users from interacting with themself
Andrew Robert Nicols [Wed, 10 Oct 2012 10:03:00 +0000 (11:03 +0100)]
MDL-35819 AJAX Rewrite Moodle popup help to be more friendly and more efficient
AMOS bot [Sun, 10 Feb 2013 00:41:38 +0000 (00:41 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Sat, 9 Feb 2013 15:19:15 +0000 (16:19 +0100)]
MDL-37952 make helper descendants abstract
Davo Smith [Fri, 8 Feb 2013 20:37:19 +0000 (20:37 +0000)]
MDL-37831 filepicker - icons / details / tree selector buttons now work more reliably
Simon Coggins [Sun, 30 Sep 2012 07:58:13 +0000 (20:58 +1300)]
MDL-35332 lib: Improve security of hashed passwords
Tim Hunt [Wed, 6 Feb 2013 17:45:58 +0000 (17:45 +0000)]
MDL-37896 qtype_essay: correct PARAM_CLEANHTML -> PARAM_RAW.
It turns out that you should almost never use PARAM_CLEANHTML.
Tim Hunt [Fri, 8 Feb 2013 12:40:49 +0000 (12:40 +0000)]
MDL-37943 upgrade: logic error in upgrade_plugins_blocks.
Derek Woolhead tracked down the problem and what needed to be fixed. I
just made the patch.
The problem was that if $plugin->cron had changed in version.php, then
the version number in the database could end up wrong after the upgrade,
and so the upgrade would immediately run a second time.
David Mudrák [Fri, 8 Feb 2013 11:05:44 +0000 (12:05 +0100)]
MDL-37774 Do not pass trailing slash if the method does not want it
David Mudrák [Fri, 8 Feb 2013 10:45:24 +0000 (11:45 +0100)]
MDL-37774 Make moodle1_file_manager::migrate_directory() support trailing slash in rootpath
As the $rootpath is concatenated with the $relpath, we would end with a
path like course_files//file.txt. Such a path is detected as not-valid
later and an error would be thrown.
So the patch makes sure that the trailing slash is cut off and a
debugging for the developer is displayed.
David Mudrák [Fri, 8 Feb 2013 10:41:38 +0000 (11:41 +0100)]
MDL-37774 Add unit test to illustrate the problem with the trailing slash
The patch introduces two new tests for moodle1_file_manager::migrate_directory().
The second test with the trailing slash reveals the trouble here.
The expected behaviour is that the method would deal with the trailing
slash. Debugging message for the developer should be displayed though.
David Monllao [Thu, 31 Jan 2013 07:41:58 +0000 (15:41 +0800)]
MDL-37787 behat: Using progress format by default
David Monllao [Thu, 31 Jan 2013 08:47:41 +0000 (16:47 +0800)]
MDL-37768 behat: Checking test site version before running tests
David Monllao [Tue, 5 Feb 2013 08:59:17 +0000 (16:59 +0800)]
MDL-37873 behat: Fixing CSS-based assertions arguments
David Monllao [Tue, 5 Feb 2013 08:49:47 +0000 (16:49 +0800)]
MDL-37750 behat: Adding tests for the rest of the steps definitions
David Monllao [Mon, 4 Feb 2013 08:39:53 +0000 (16:39 +0800)]
MDL-37750 behat: Using base find* methods
David Monllao [Mon, 4 Feb 2013 08:38:08 +0000 (16:38 +0800)]
MDL-37750 behat: Waiting for DOM ready
David Monllao [Mon, 4 Feb 2013 08:37:10 +0000 (16:37 +0800)]
MDL-37750 behat: Elements finders at base level
Set of DOM elements finders to
avoid false fails.
Davo Smith [Mon, 28 Jan 2013 09:18:31 +0000 (09:18 +0000)]
MDL-34137 mod_label - resize images when uploaded via drag & drop
Davo Smith [Fri, 4 Jan 2013 15:39:14 +0000 (15:39 +0000)]
MDL-32456 mod_label - support course drag and drop upload images to create labels
Damyon Wiese [Fri, 8 Feb 2013 07:44:18 +0000 (15:44 +0800)]
MDL-37039 Assignment - Do not apply filters to grading table for offline assignments
Because the filters do not make sense for offline assignments, they are hidden. But if the active filter
prevents you from seeing any assignments you cannot change it. This change makes it so the filters are
also not applied when the assignment is an offline assignment.
Damyon Wiese [Fri, 8 Feb 2013 07:16:47 +0000 (15:16 +0800)]
MDL-37074 Assign theming: Use addClass/removeClass instead of setAttribute to preserve existing classes
Damyon Wiese [Fri, 8 Feb 2013 03:13:54 +0000 (11:13 +0800)]
weekly release 2.5dev
Damyon Wiese [Fri, 8 Feb 2013 03:05:09 +0000 (11:05 +0800)]
ie9 svg compatibility fixes