moodle.git
8 years agoMerge branch 'MDL-38570-master' of https://github.com/timgus/moodle
Dan Poltawski [Tue, 10 Sep 2013 03:13:29 +0000 (11:13 +0800)]
Merge branch 'MDL-38570-master' of https://github.com/timgus/moodle

8 years agoMerge branch 'MDL-41147-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 10 Sep 2013 02:27:59 +0000 (10:27 +0800)]
Merge branch 'MDL-41147-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'wip-MDL-40347-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 10 Sep 2013 01:39:06 +0000 (09:39 +0800)]
Merge branch 'wip-MDL-40347-master' of git://github.com/marinaglancy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/upgrade.txt

8 years agoMerge branch 'MDL-41626-master' of github.com:StudiUM/moodle
Damyon Wiese [Tue, 10 Sep 2013 01:30:56 +0000 (09:30 +0800)]
Merge branch 'MDL-41626-master' of github.com:StudiUM/moodle

8 years agoMerge branch 'MDL-41600' of git://github.com/aolley/moodle
Sam Hemelryk [Tue, 10 Sep 2013 01:12:13 +0000 (13:12 +1200)]
Merge branch 'MDL-41600' of git://github.com/aolley/moodle

8 years agoMerge branch 'wip-MDL-41556-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 10 Sep 2013 01:07:37 +0000 (13:07 +1200)]
Merge branch 'wip-MDL-41556-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'MDL-41253-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Tue, 10 Sep 2013 01:03:42 +0000 (09:03 +0800)]
Merge branch 'MDL-41253-master' of git://github.com/sammarshallou/moodle

8 years agoNOBUG: fixed whitespace
Sam Hemelryk [Tue, 10 Sep 2013 01:02:35 +0000 (13:02 +1200)]
NOBUG: fixed whitespace

8 years agoMDL-41600: qformat_blackboard_six Fix test_import_match fail w/ddmatch
Adam Olley [Thu, 5 Sep 2013 04:13:32 +0000 (13:43 +0930)]
MDL-41600: qformat_blackboard_six Fix test_import_match fail w/ddmatch

With qtype_ddmatch installed, the unit tests for qformat_blackboard_six
fail as they generate ddmatch questions instead of match ones. This
patch checks for ddmatch and changes the test to expect that instead if
its installed.

8 years agoMerge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 9 Sep 2013 23:22:04 +0000 (11:22 +1200)]
Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'MDL-41558-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 9 Sep 2013 23:16:30 +0000 (11:16 +1200)]
Merge branch 'MDL-41558-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-32862 backup: fixed missing global
Sam Hemelryk [Mon, 9 Sep 2013 22:40:11 +0000 (10:40 +1200)]
MDL-32862 backup: fixed missing global

8 years agoMerge branch 'MDL-41167-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 9 Sep 2013 22:31:59 +0000 (10:31 +1200)]
Merge branch 'MDL-41167-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'wip-MDL-32862-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 9 Sep 2013 21:38:46 +0000 (09:38 +1200)]
Merge branch 'wip-MDL-32862-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 9 Sep 2013 21:36:24 +0000 (09:36 +1200)]
Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle

8 years agoMDL-41253 Restore: Mechanism to display progress during UI stages
sam marshall [Fri, 16 Aug 2013 16:26:26 +0000 (17:26 +0100)]
MDL-41253 Restore: Mechanism to display progress during UI stages

8 years agoMerge branch 'MDL-41254-m' of git://github.com/micaherne/moodle
Dan Poltawski [Mon, 9 Sep 2013 10:04:05 +0000 (18:04 +0800)]
Merge branch 'MDL-41254-m' of git://github.com/micaherne/moodle

8 years agoMerge branch 'MDL-29069' of https://github.com/bostelm/moodle
Dan Poltawski [Mon, 9 Sep 2013 09:37:49 +0000 (17:37 +0800)]
Merge branch 'MDL-29069' of https://github.com/bostelm/moodle

8 years agoMDL-40734 mod_glossary: cleaned up some headings
Andrew Davis [Mon, 26 Aug 2013 04:57:50 +0000 (11:57 +0700)]
MDL-40734 mod_glossary: cleaned up some headings

8 years agoMDL-29378 Fix the recent string modification
David Mudrák [Mon, 9 Sep 2013 09:19:48 +0000 (11:19 +0200)]
MDL-29378 Fix the recent string modification

But accident, I have modified the string 'collesaintro' in the previous patch.
The correct string to be amended is 'collesapintro'.

8 years agoMerge branch 'MDL-37804' of github.com:recreate/moodle
Dan Poltawski [Mon, 9 Sep 2013 09:13:22 +0000 (17:13 +0800)]
Merge branch 'MDL-37804' of github.com:recreate/moodle

8 years agoMDL-40575 theme_bootstrapbase: Unable to scroll language menu in theme/clean.
Mary Evans [Sun, 8 Sep 2013 15:23:14 +0000 (16:23 +0100)]
MDL-40575 theme_bootstrapbase: Unable to scroll language menu in theme/clean.

8 years agoMerge branch 'MDL-41163-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 9 Sep 2013 07:29:48 +0000 (15:29 +0800)]
Merge branch 'MDL-41163-master' of git://github.com/sammarshallou/moodle

8 years agoMDL-41438 version bump
Dan Poltawski [Mon, 9 Sep 2013 06:25:07 +0000 (14:25 +0800)]
MDL-41438 version bump

8 years agoMerge branch 'MDL-41438' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 9 Sep 2013 06:23:41 +0000 (14:23 +0800)]
Merge branch 'MDL-41438' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'wip-MDL-41517-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 9 Sep 2013 04:43:32 +0000 (12:43 +0800)]
Merge branch 'wip-MDL-41517-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-18275 Calendar types: Add a major version + redirect for ci server fail.
Damyon Wiese [Mon, 9 Sep 2013 03:25:02 +0000 (11:25 +0800)]
MDL-18275 Calendar types: Add a major version + redirect for ci server fail.

8 years agoMerge branch 'master_MDL-41290' of git://github.com/danmarsden/moodle
Damyon Wiese [Mon, 9 Sep 2013 02:46:59 +0000 (10:46 +0800)]
Merge branch 'master_MDL-41290' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-18375_master' of git://github.com/markn86/moodle
Damyon Wiese [Mon, 9 Sep 2013 02:41:12 +0000 (10:41 +0800)]
Merge branch 'MDL-18375_master' of git://github.com/markn86/moodle

8 years agoMerge branch 'MDL-41151-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 9 Sep 2013 02:22:02 +0000 (10:22 +0800)]
Merge branch 'MDL-41151-master' of git://github.com/sammarshallou/moodle

8 years agoMDL-41438 core renderer: additional patch to remove .main definition from all core...
Rossiani Wijaya [Mon, 2 Sep 2013 06:39:04 +0000 (14:39 +0800)]
MDL-41438 core renderer: additional patch to remove .main definition from all core themes

8 years agoMDL-41438 core_renderer: Update the parameters for heading() and heading_with_help().
Rossiani Wijaya [Thu, 29 Aug 2013 02:30:02 +0000 (10:30 +0800)]
MDL-41438 core_renderer: Update the parameters for heading() and heading_with_help().
heading(), change the default value for classes from 'main' to null.
heading_with_help(), add 2 additional parameters for level and classnames. Default value of level is set to 2 and classnames is set to null.

With the changes for heading_with_help(), icon image vertical alignment needs to be adjusted, so it display in the middle of the heading.

Also added some notes in theme/upgrade.txt file.

8 years agoMerge branch 'MDL-38794' of https://github.com/prateeksachan/moodle
Sam Hemelryk [Sun, 8 Sep 2013 23:12:56 +0000 (11:12 +1200)]
Merge branch 'MDL-38794' of https://github.com/prateeksachan/moodle

8 years agoMerge branch 'MDL-41417_master' of https://github.com/markn86/moodle
Sam Hemelryk [Sun, 8 Sep 2013 22:54:11 +0000 (10:54 +1200)]
Merge branch 'MDL-41417_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 8 Sep 2013 22:48:13 +0000 (10:48 +1200)]
Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 8 Sep 2013 22:19:00 +0000 (10:19 +1200)]
Merge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-41460-master' of https://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 8 Sep 2013 20:58:44 +0000 (08:58 +1200)]
Merge branch 'MDL-41460-master' of https://github.com/FMCorz/moodle

8 years agoMDL-40347 Corrections to upgrade text
Marina Glancy [Mon, 2 Sep 2013 00:03:02 +0000 (10:03 +1000)]
MDL-40347 Corrections to upgrade text

8 years agoMDL-40347 grade/report/grader: cleaned up grade/report/grader/styles.css.
Mary Evans [Sun, 8 Sep 2013 13:16:15 +0000 (23:16 +1000)]
MDL-40347 grade/report/grader: cleaned up grade/report/grader/styles.css.

8 years agoMDL-40347 grade/report/grader: Fixes: Grade report does not highlight some cells...
Mary Evans [Tue, 20 Aug 2013 12:21:40 +0000 (13:21 +0100)]
MDL-40347 grade/report/grader: Fixes: Grade report does not highlight some cells properly.

Squashed commit of the following:

commit 2c2164a7e27bd2b81102251420892386e39edecc
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 20 12:59:47 2013 +0100

    MDL-40347 theme: Modified upgrade.txt and created bootstrapbase/upgrade.txt.

commit 4449975a0f9249785ed152f63786bf7974c1776e
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 13 18:42:20 2013 +0100

    MDL-40347 grade/report/grader: added RTL css previously in bootstrapbase/less/moodle/grade.less to styles.css

commit b0af8f05a411b3dbb1d9c162a0d65c7f9c069c0f
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 13 12:42:02 2013 +0100

    MDL-40347_M26 grade/report/grader: cleaned up grade/report/grader/styles.css.

commit 52627137dc662d47cbfdf023d056baf102f29d8a
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Jul 6 17:15:12 2013 +0100

    MDL-40347 grade/report/grader: Grade report does not highlight some cells properly.

    Merged/squashed original commit by Marina Glancy who:
    - added class 'i123' to each cell in the column
    - changed JS to highlight the cells with this class instead that cells with the column number
    - changed grade report css so the .vmarked and .hmarked classes have higher priority for all rows
    - made cells in 'average range' row td instead of th
    - little corrections to css: removed background image for some cells with .header css class
    - MyMobile theme disabled cells highlighting, make sure it disables it in all cases

    Merged/squashed original commit Mary Evans who:
    - removed theme/bootstrapbase/less/moodle/grade.less
    - removed @import "moodle/grade"; from bootstrapbase/less/moodle.less
    - removed reference to plugins_exclude_sheets for grader in both bootstrapbase/config.php and clean themes/config.php
    - commented out .hidden from bootstrapbase/less/bootstrap/responsive_utilities.less
    - made minor changes to grader/style.css

8 years agoweekly release 2.6dev
Eloy Lafuente (stronk7) [Sat, 7 Sep 2013 12:20:07 +0000 (14:20 +0200)]
weekly release 2.6dev

8 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Eloy Lafuente (stronk7) [Sat, 7 Sep 2013 12:13:55 +0000 (14:13 +0200)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

8 years agoMDL-28094 fix subdirs support in module intro editor
Petr Škoda [Sun, 25 Aug 2013 13:24:19 +0000 (15:24 +0200)]
MDL-28094 fix subdirs support in module intro editor

8 years agoMDL-28094 keep subdirs in content upgraded from 1.x
Petr Škoda [Sun, 25 Aug 2013 13:10:27 +0000 (15:10 +0200)]
MDL-28094 keep subdirs in content upgraded from 1.x

8 years agoMDL-28094 add function that detects if subdirs used and fix subdirs option in form...
Petr Škoda [Sun, 25 Aug 2013 13:09:39 +0000 (15:09 +0200)]
MDL-28094 add function that detects if subdirs used and fix subdirs option in form editor

8 years agoMDL-41623 rss: clean output rss content
Dan Poltawski [Sat, 7 Sep 2013 01:45:07 +0000 (09:45 +0800)]
MDL-41623 rss: clean output rss content

8 years agoMDL-41623 ensure all rss links are valid urls.
Eloy Lafuente (stronk7) [Fri, 6 Sep 2013 00:45:16 +0000 (02:45 +0200)]
MDL-41623 ensure all rss links are valid urls.

8 years agoAutomatically generated installer lang files
AMOS bot [Sat, 7 Sep 2013 00:43:06 +0000 (00:43 +0000)]
Automatically generated installer lang files

8 years agoMDL-41417 course: allow the use of duplicated idnumbers if they existed before fix
Mark Nelson [Fri, 6 Sep 2013 04:40:15 +0000 (12:40 +0800)]
MDL-41417 course: allow the use of duplicated idnumbers if they existed before fix

8 years agoMDL-32862 - Backup: Rewriting resource_old links on backup.
Adrian Greeve [Fri, 6 Sep 2013 06:43:12 +0000 (14:43 +0800)]
MDL-32862 - Backup: Rewriting resource_old links on backup.

8 years agoMDL-41417 course: prevent duplicate idnumbers being used when updating a course
Francis Devine [Wed, 4 Sep 2013 09:21:41 +0000 (21:21 +1200)]
MDL-41417 course: prevent duplicate idnumbers being used when updating a course

8 years agoAutomatically generated installer lang files
AMOS bot [Fri, 6 Sep 2013 00:47:46 +0000 (00:47 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'master' into install_master
AMOS bot [Fri, 6 Sep 2013 00:47:45 +0000 (00:47 +0000)]
Merge branch 'master' into install_master

8 years agoMDL-41626 cas auth: Setting the right url for the multi-authentication page
Jean-Philippe Gaudreau [Thu, 5 Sep 2013 20:45:59 +0000 (16:45 -0400)]
MDL-41626 cas auth: Setting the right url for the multi-authentication page

8 years agoMDL-41167 Restore: Large course times out on Review page
sam marshall [Fri, 16 Aug 2013 16:01:27 +0000 (17:01 +0100)]
MDL-41167 Restore: Large course times out on Review page

8 years agoMDL-41147 Restore: Large course fails due to time limit when unzipping
sam marshall [Fri, 16 Aug 2013 16:27:36 +0000 (17:27 +0100)]
MDL-41147 Restore: Large course fails due to time limit when unzipping

8 years agoMDL-41163 Restore: Large course restore timeout on schema page
sam marshall [Tue, 13 Aug 2013 13:25:13 +0000 (14:25 +0100)]
MDL-41163 Restore: Large course restore timeout on schema page

8 years agoMDL-41151 Files: Zip packer should have way to indicate progress
sam marshall [Tue, 6 Aug 2013 17:17:43 +0000 (18:17 +0100)]
MDL-41151 Files: Zip packer should have way to indicate progress

8 years agoMDL-18375 calendar: fixed issue when resaving the year in the datetime field causing...
Mark Nelson [Sun, 25 Aug 2013 09:38:16 +0000 (17:38 +0800)]
MDL-18375 calendar: fixed issue when resaving the year in the datetime field causing the year to decrease

For example, a user may create a date/time profile field and set the 'Start year'
field to '2012'. Another user, using the Hijri calendar, may edit the name of
this field. They visit the settings page and in this case the date '1/1/2012'
is converted to '7/2/1433' in Hijri. So, the year '1433' is then displayed.
The user then changes the name of this field and saves the form. This is where
the issue occurs, as the date '1/1/1433' is converted into Gregorian, which
converts to the year '26/09/2011', so the year '2011' is saved in the DB, not
'2012'.

8 years agoMDL-18375 calendar: removed usage of the calendar type in the usergetdate function
Mark Nelson [Fri, 23 Aug 2013 06:14:50 +0000 (14:14 +0800)]
MDL-18375 calendar: removed usage of the calendar type in the usergetdate function

The usergetdate function is not only used to display dates, it is also passed
to the function make_timestamp. This means users using another calendar type
other than Gregorian will generate incorrect timestamps which may be saved in
the DB or used to populate the date_selector and date_time_selector elements.
For example, when creating an assignment using another calendar type other
than Gregorian, the mod_form.php file calls $this->apply_admin_defaults()
which uses the function usergetmidnight to set the "Allow submissions from"
date to today's date and the "Due date" field to 7 days in the future. The
usergetmidnight function calls usergetdate which is then passed to
make_timestamp. Since the usergetdate function was using the calendar
type's timestamp_to_date_array function the date being passed to
make_timestamp was not in Gregorian. So, when using the hijri calendar the
year 1434 was being passed which was generating a large negative number as
the timestamp which was then used to populate the date fields.

8 years agoMDL-18375 calendar: changed the name of the function factory to be more descriptive
Mark Nelson [Tue, 20 Aug 2013 08:32:40 +0000 (16:32 +0800)]
MDL-18375 calendar: changed the name of the function factory to be more descriptive

8 years agoMDL-18375 calendar: added condition to ensure calendar type exists before loading
Mark Nelson [Thu, 15 Aug 2013 08:39:22 +0000 (16:39 +0800)]
MDL-18375 calendar: added condition to ensure calendar type exists before loading

8 years agoMDL-18375 calendar: added the Gregorian calendar type to the standard list of plugins
Mark Nelson [Wed, 14 Aug 2013 09:36:42 +0000 (17:36 +0800)]
MDL-18375 calendar: added the Gregorian calendar type to the standard list of plugins

8 years agoMDL-18375 calendar: only display the choice of calendar types if there is more than one
Mark Nelson [Wed, 14 Aug 2013 08:48:23 +0000 (16:48 +0800)]
MDL-18375 calendar: only display the choice of calendar types if there is more than one

8 years agoMDL-18375 calendar: PHPDoc tidy up as well as some other minor changes
Mark Nelson [Wed, 14 Aug 2013 08:02:33 +0000 (16:02 +0800)]
MDL-18375 calendar: PHPDoc tidy up as well as some other minor changes

8 years agoMDL-18375 calendar: renamed the userdate/usergetdate functions and changed them to...
Mark Nelson [Tue, 16 Jul 2013 06:22:45 +0000 (14:22 +0800)]
MDL-18375 calendar: renamed the userdate/usergetdate functions and changed them to abstract

Renamed the userdate/usergetdate functions in the calendar type to be more
descriptive and made them abstract to ensure developers implement this
functionality in their calendar type.

Also tidied up PHPDocs for these functions.

8 years agoMDL-18375 calendar: created a test calendar type to use for PHPUnit tests and added...
Mark Nelson [Wed, 10 Jul 2013 11:10:51 +0000 (19:10 +0800)]
MDL-18375 calendar: created a test calendar type to use for PHPUnit tests and added tests

8 years agoMDL-18375 calendar: implemented the usage of the recently introduced automatic class...
Mark Nelson [Wed, 3 Jul 2013 09:58:14 +0000 (17:58 +0800)]
MDL-18375 calendar: implemented the usage of the recently introduced automatic class loading

8 years agoMDL-18375 calendar: refactored the datetime user field so that it now uses the calend...
Mark Nelson [Tue, 2 Jul 2013 10:09:45 +0000 (18:09 +0800)]
MDL-18375 calendar: refactored the datetime user field so that it now uses the calendar type system

8 years agoMDL-18375 calendar: edited the calendartype column in the install.xml file and create...
Mark Nelson [Mon, 1 Jul 2013 10:25:26 +0000 (18:25 +0800)]
MDL-18375 calendar: edited the calendartype column in the install.xml file and created an upgrade path

8 years agoMDL-18375 calendar: moved the location of the calendar type select box when editing...
Mark Nelson [Mon, 15 Jul 2013 07:40:44 +0000 (15:40 +0800)]
MDL-18375 calendar: moved the location of the calendar type select box when editing a course

8 years agoMDL-18375 calendar: only display the YUI2 calendar when the Gregorian type is used
Mark Nelson [Mon, 17 Jun 2013 05:20:28 +0000 (13:20 +0800)]
MDL-18375 calendar: only display the YUI2 calendar when the Gregorian type is used

8 years agoMDL-18375 calendar: huge refactor of the initial patch
Mark Nelson [Mon, 10 Jun 2013 09:35:55 +0000 (17:35 +0800)]
MDL-18375 calendar: huge refactor of the initial patch

1) Moved the calendar types location to a sub-folder in the calendar directory.
2) Removed/moved language strings.
3) Removed calendar types that should be downloaded as plugins.
4) Removed a Non-English language pack for the Gregorian calendar type that
should be downloaded separately.
5) Removed custom files responsible for checking for updates and uninstalling
calendar types, which should be done by core.
6) Removed JS from the calendar_month block as there is no non-JS alternative
provided and the JS written does not make use of the YUI library to ensure
multiple browser support.
7) Removed code from the base class responsible for creating timestamps that
are saved in the DB.
8) Added PHPDocs.

Note: In the original patch we are editing core functions responsible for saving
time in the database in the calendar base class. This is very dangerous, we do
not want to touch these functions as it could cause a complete fubar of the
database. There are places we are forcing the use of the gregorian calendar as
we are passing dates generated by the PHP date function, where as sometimes
we pass dates from usergetdate (which was being overwritten to return the
date specific to the calendar). We can not expect third party modules to
change the calendar type depending on the format they pass to these functions.

8 years agoMDL-18375 calendar: added multiple calendar support
Shamim Rezaie [Mon, 10 Jun 2013 04:47:43 +0000 (12:47 +0800)]
MDL-18375 calendar: added multiple calendar support

Conflicts:

course/edit_form.php
lib/db/install.xml
lib/form/dateselector.php
lib/form/datetimeselector.php
lib/setup.php

8 years agoMDL-41460 core_component: Validate cache against version.php
Frederic Massart [Tue, 3 Sep 2013 13:26:15 +0000 (21:26 +0800)]
MDL-41460 core_component: Validate cache against version.php

8 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Dan Poltawski [Thu, 5 Sep 2013 06:42:31 +0000 (14:42 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

8 years agoweekly release 2.6dev
Dan Poltawski [Thu, 5 Sep 2013 05:34:14 +0000 (13:34 +0800)]
weekly release 2.6dev

8 years agoMerge branch 'wip-MDL-41369-fix2' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 5 Sep 2013 02:34:11 +0000 (10:34 +0800)]
Merge branch 'wip-MDL-41369-fix2' of git://github.com/marinaglancy/moodle

8 years agoMDL-41369 Behat tests updated because of fixed messaging navigation
Marina Glancy [Thu, 5 Sep 2013 02:29:29 +0000 (12:29 +1000)]
MDL-41369 Behat tests updated because of fixed messaging navigation

8 years agoMDL-40924 badges: added a print_error call to prevent PHP notices when no badges...
Mark Nelson [Wed, 4 Sep 2013 16:37:51 +0000 (00:37 +0800)]
MDL-40924 badges: added a print_error call to prevent PHP notices when no badges are found

8 years agoMDL-29378 Code cleanup in the Survey module
David Mudrák [Wed, 4 Sep 2013 22:01:42 +0000 (00:01 +0200)]
MDL-29378 Code cleanup in the Survey module

While working on the issue, I spotted these two places that were worth of
fixing. The first one is a trivial reminiscence of a previous refactoring,
after which both branches of the if() statement became equal.

The second one is actually a typo as in theory it could generate unexpected
input fields with the name like qPP1. Luckily this never happened due to the
way how survey questions are hardcoded (there are no questions with the type 2
that would require two answers to their subquestions).

8 years agoMDL-29378 Fix the form display in the Survey/COLLES P+A module
David Mudrák [Wed, 4 Sep 2013 21:52:06 +0000 (23:52 +0200)]
MDL-29378 Fix the form display in the Survey/COLLES P+A module

In MDL-7501, we stopped using rowspanning cells in the form table due to
accessibility. That had introduced a regression so in the COLLES P+A survey,
all the rows were displayed with the same background colour. This patch returns
the previous behaviour that each couple of items can be distinguished by the
background colour.

Also, there is no need to display "I prefer that" and "I found that" as a small
text any more. It had made sense in rowspanning layout but not after MDL-7501
was fixed.

And finally, as all items are enumerated now sequentially, there are actually
48 lines, each couple covering one question in two variants. I think it's
correct to reflect this in the description of the form so the text was slightly
amended.

8 years agoMDL-29378 Fix regression in the Survey/COLLES P+A module
David Mudrák [Wed, 4 Sep 2013 21:42:35 +0000 (23:42 +0200)]
MDL-29378 Fix regression in the Survey/COLLES P+A module

This basically reverts the commit 5196df589b0fbcead4a0943c8e7b227f8a98c897 that
I believe was a result of misunderstanding of how question type field is
(ab)used in the Survey module. As it took significant time to get familiar with
the overall logic of questions and their processing in the module, I left my
findings in added inline comments. The point is that it is $question->type that
matters. Types of questions listed as subquestions in the multi field is
irrelevant in that case (and all have it set to 1 IIRC).

This patch re-enables the "COLLES (Preferred and Actual)" survey type that did
not work at all due to regression.

8 years agoMDL-29069 Data / Glossary: allow disapproving entries
Henning Bostelmann [Thu, 8 Aug 2013 18:15:11 +0000 (19:15 +0100)]
MDL-29069 Data / Glossary: allow disapproving entries

8 years agoMDL-38570 administration: Temporary file deletion
Tim Gus [Tue, 30 Jul 2013 18:44:19 +0000 (14:44 -0400)]
MDL-38570 administration: Temporary file deletion

Added new function "cron_delete_from_temp" to delete old files and
directories under $CFG->tempdir during cron run. Unit test included.

8 years agoMerge branch 'MDL-41568_master-fix_behat' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 4 Sep 2013 08:59:20 +0000 (16:59 +0800)]
Merge branch 'MDL-41568_master-fix_behat' of git://github.com/dmonllao/moodle

8 years agoMDL-41568 lang: Fix behat features after changes
David Monllao [Wed, 4 Sep 2013 07:16:59 +0000 (15:16 +0800)]
MDL-41568 lang: Fix behat features after changes

8 years agoMDL-41369 Pass viewing argument to more message screens
Marina Glancy [Wed, 4 Sep 2013 06:40:01 +0000 (16:40 +1000)]
MDL-41369 Pass viewing argument to more message screens

8 years agoMerge branch 'MDL-41485-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Wed, 4 Sep 2013 04:24:54 +0000 (12:24 +0800)]
Merge branch 'MDL-41485-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Wed, 4 Sep 2013 03:45:07 +0000 (11:45 +0800)]
Merge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'wip-MDL-41369-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 4 Sep 2013 03:09:30 +0000 (11:09 +0800)]
Merge branch 'wip-MDL-41369-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'wip-mdl-41418' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 4 Sep 2013 02:38:10 +0000 (10:38 +0800)]
Merge branch 'wip-mdl-41418' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'wip-MDL-41395-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 4 Sep 2013 02:33:33 +0000 (10:33 +0800)]
Merge branch 'wip-MDL-41395-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-28579 scorm: Fix broken unit tests
Damyon Wiese [Wed, 4 Sep 2013 01:44:05 +0000 (09:44 +0800)]
MDL-28579 scorm: Fix broken unit tests

8 years agoMerge branch 'master_MDL-28579' of git://github.com/danmarsden/moodle
Damyon Wiese [Wed, 4 Sep 2013 01:00:48 +0000 (09:00 +0800)]
Merge branch 'master_MDL-28579' of git://github.com/danmarsden/moodle

8 years agoMDL-41267 fix phpunit tests
Eloy Lafuente (stronk7) [Tue, 3 Sep 2013 23:11:54 +0000 (01:11 +0200)]
MDL-41267 fix phpunit tests

8 years agoMerge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 3 Sep 2013 23:08:37 +0000 (01:08 +0200)]
Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle

Conflicts:
lib/upgrade.txt

8 years agoMerge branch 'MDL-41146-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 3 Sep 2013 23:01:19 +0000 (01:01 +0200)]
Merge branch 'MDL-41146-master' of git://github.com/sammarshallou/moodle

8 years agoMDL-41290 SCORM: Improve user report
Dan Marsden [Thu, 22 Aug 2013 03:15:47 +0000 (15:15 +1200)]
MDL-41290 SCORM: Improve user report

put descriptions in help popups instead of in table.

AMOS BEGIN
MOV [interactionscorrectcount, mod_scorm],[trackcorrectcount_help, mod_scorm]
MOV [interactionslatency, mod_scorm],[tracklatency_help, mod_scorm]
MOV [interactionsresult, mod_scorm],[trackresult_help, mod_scorm]
MOV [interactionsscoremin, mod_scorm],[trackscoremin_help, mod_scorm]
MOV [interactionsscoremax, mod_scorm],[trackscoremax_help, mod_scorm]
MOV [interactionsscoreraw, mod_scorm],[trackscoreraw_help, mod_scorm]
MOV [interactionssuspenddata, mod_scorm],[tracksuspenddata_help, mod_scorm]
MOV [interactionstime, mod_scorm],[tracktime_help, mod_scorm]
MOV [interactionsweight, mod_scorm],[trackweight_help, mod_scorm]
AMOS END

Move userreport into /report and rename parameters to be more useful

fix overcomplicated parameter handling

remove SCORM 2004 specific reporting of objectives and interactions to simplify page - these will appear in full list of tracking data instead
Also remove duplicated data - the general tracks info is repated 3 times on the page so isn't required.

remove link to player as loading scos this way is problematic

split out user tracks table into it's own file

convert tracks table to flexible table and allow export

add new interactions report

add tabs to allow navigation between reports

force wrapping of track data value even when no spaces

fix some coding guideline stuff

8 years agoMDL-28579 SCORM: use filemanager instead of old file picker
Dan Marsden [Thu, 22 Aug 2013 22:17:22 +0000 (10:17 +1200)]
MDL-28579 SCORM: use filemanager instead of old file picker