Dan Poltawski [Fri, 25 Oct 2013 03:33:19 +0000 (11:33 +0800)]
Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Fri, 25 Oct 2013 03:26:58 +0000 (11:26 +0800)]
MDl-42261 My Home: Fixed string key to show all courses
Dan Poltawski [Fri, 25 Oct 2013 02:05:55 +0000 (10:05 +0800)]
Merge branch 'w43_MDL-42381_m26_ole' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 24 Oct 2013 23:14:04 +0000 (01:14 +0200)]
Merge branch 'MDL-42377_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Thu, 24 Oct 2013 23:09:25 +0000 (01:09 +0200)]
Merge branch 'MDL-41966-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Thu, 24 Oct 2013 21:35:24 +0000 (23:35 +0200)]
Merge branch 'MDL-42410-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 24 Oct 2013 21:33:42 +0000 (23:33 +0200)]
Merge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 24 Oct 2013 21:27:11 +0000 (23:27 +0200)]
Merge branch 'w43_MDL-42206_m26_metaedit' of https://github.com/skodak/moodle
Dan Poltawski [Thu, 24 Oct 2013 08:57:47 +0000 (16:57 +0800)]
Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 15 Oct 2013 01:23:34 +0000 (09:23 +0800)]
MDL-42261 My Home: Fixed strings to match moodle standards
Rajesh Taneja [Fri, 11 Oct 2013 04:13:48 +0000 (12:13 +0800)]
MDL-42261 My Home: Added link to show all courses on my home page
If not forced by admin, user can see all courses by clicking on link
Dan Poltawski [Thu, 24 Oct 2013 08:28:46 +0000 (16:28 +0800)]
Merge branch 'MDL-42338' of git://github.com/rwijaya/moodle
Dan Poltawski [Thu, 24 Oct 2013 08:15:24 +0000 (16:15 +0800)]
Merge branch 'MDL-42388-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Thu, 24 Oct 2013 08:07:17 +0000 (16:07 +0800)]
Merge branch 'MDL-42389-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Thu, 24 Oct 2013 07:55:52 +0000 (15:55 +0800)]
Merge branch 'MDL-42477-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 24 Oct 2013 07:47:48 +0000 (15:47 +0800)]
Merge branch '42299-26' of git://github.com/samhemelryk/moodle
Conflicts:
version.php
Dan Poltawski [Thu, 24 Oct 2013 07:15:07 +0000 (15:15 +0800)]
Merge branch 'wip-MDL-42486-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 24 Oct 2013 04:43:52 +0000 (12:43 +0800)]
Merge branch 'MDL-42272-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Thu, 24 Oct 2013 04:39:38 +0000 (12:39 +0800)]
Merge branch 'MDL-42362_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 24 Oct 2013 04:33:15 +0000 (12:33 +0800)]
Merge branch 'wip-MDL-42323-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 24 Oct 2013 04:29:15 +0000 (15:29 +1100)]
Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle
Marina Glancy [Thu, 24 Oct 2013 03:15:05 +0000 (14:15 +1100)]
Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle
rwijaya [Tue, 15 Oct 2013 10:53:35 +0000 (18:53 +0800)]
MDL-42338 lti_mod: convert hardcoded string.
Damyon Wiese [Thu, 24 Oct 2013 02:29:05 +0000 (10:29 +0800)]
Merge branch 'MDL-40976-behat-fix' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 24 Oct 2013 02:27:23 +0000 (10:27 +0800)]
Merge branch 'MDL-42293-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Thu, 24 Oct 2013 02:19:47 +0000 (10:19 +0800)]
Merge branch 'MDL-42030-master' of git://github.com/mouneyrac/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Frederic Massart [Thu, 24 Oct 2013 01:11:15 +0000 (09:11 +0800)]
MDL-42477 filter_glossary: Alert was not showing
Dan Poltawski [Thu, 3 Oct 2013 03:22:50 +0000 (11:22 +0800)]
MDL-29070 enrol_imsenterprise: more code cleanups
Including:
* fix whitespace
* coding style fixes:
* Declare method visibility
* Don't have variable names with underscores
* Comments without .
* if/for loop spacing
* Unused variables
* Split long lines
* Removed outdates files
* moodlecheck warnings
* code checker warnings
Brian Biggs [Tue, 24 Sep 2013 03:44:42 +0000 (11:44 +0800)]
MDL-29070 enrol_imsenterprise: Code cleanup
In preparation for new features.
David Monllao [Wed, 23 Oct 2013 08:19:33 +0000 (16:19 +0800)]
MDL-40976 behat: Updating tests according to new behaviour
We only open the actions menu when is collapsed.
Dan Poltawski [Wed, 23 Oct 2013 07:26:54 +0000 (15:26 +0800)]
Merge branch 'MDL-42342-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 23 Oct 2013 07:12:22 +0000 (15:12 +0800)]
Merge branch 'MDL-42343_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 23 Oct 2013 06:36:07 +0000 (14:36 +0800)]
Merge branch 'MDL-42290-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Wed, 23 Oct 2013 06:22:28 +0000 (17:22 +1100)]
Merge branch '42246-26' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Wed, 23 Oct 2013 06:06:04 +0000 (14:06 +0800)]
Merge branch 'MDL-42210_master' of git://github.com/grabs/moodle
Damyon Wiese [Wed, 23 Oct 2013 05:37:24 +0000 (13:37 +0800)]
Merge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle
Petr Škoda [Wed, 23 Oct 2013 05:32:24 +0000 (07:32 +0200)]
MDL-42208 fix JS get_string usage and remove unnecessary params from auth password unmask init
Dan Poltawski [Wed, 23 Oct 2013 05:20:08 +0000 (13:20 +0800)]
Merge branch 'wip-MDL-42278-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 23 Oct 2013 05:18:45 +0000 (13:18 +0800)]
Merge branch '42277-26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 23 Oct 2013 05:15:48 +0000 (13:15 +0800)]
Merge branch 'w43_MDL-38743_m26_private' of https://github.com/skodak/moodle
Dan Poltawski [Wed, 23 Oct 2013 04:37:45 +0000 (12:37 +0800)]
Merge branch 'MDL-40531' of https://github.com/stronk7/moodle
Marina Glancy [Wed, 23 Oct 2013 04:34:47 +0000 (15:34 +1100)]
Merge branch 'MDL-42427-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Fri, 18 Oct 2013 06:20:49 +0000 (14:20 +0800)]
MDL-42427 backup: Fix undefined errors during automated backups
Damyon Wiese [Wed, 23 Oct 2013 04:00:01 +0000 (12:00 +0800)]
MDL-41339 Tags - use uppercase for SQL keywords (AS)
Damyon Wiese [Wed, 23 Oct 2013 03:50:50 +0000 (11:50 +0800)]
Merge branch 'wip-mdl-41339' of https://github.com/jennymgray/moodle
Marina Glancy [Wed, 23 Oct 2013 02:59:50 +0000 (13:59 +1100)]
Merge branch 'MDL-42426-master' of git://github.com/damyon/moodle
Marina Glancy [Wed, 23 Oct 2013 02:51:00 +0000 (13:51 +1100)]
Merge branch '42301-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Wed, 23 Oct 2013 02:11:13 +0000 (13:11 +1100)]
Merge branch 'w43_MDL-42414_m26_rev' of https://github.com/skodak/moodle
Marina Glancy [Wed, 23 Oct 2013 00:43:23 +0000 (11:43 +1100)]
Merge branch '42170-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Wed, 23 Oct 2013 00:05:59 +0000 (11:05 +1100)]
Merge branch '42316-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 22 Oct 2013 23:44:22 +0000 (10:44 +1100)]
MDL-42486 enrol: fixed bug in URL on manage enrol plugins page
Marina Glancy [Tue, 22 Oct 2013 23:17:00 +0000 (10:17 +1100)]
Merge branch 'w43_MDL-37813_m26_filterall' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 22 Oct 2013 15:05:02 +0000 (23:05 +0800)]
on demand release 2.6beta+
Thanks to all who entered the competition to find the mistake in the
last commit. It was spotted by none other than super-awesome Moodler
Justin Filip.
He collects a beer from me at our next available meeting.
Dan Poltawski [Tue, 22 Oct 2013 12:52:44 +0000 (20:52 +0800)]
on demand release 2.5beta+
Dan Poltawski [Tue, 22 Oct 2013 12:51:30 +0000 (20:51 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Jerome Mouneyrac [Thu, 17 Oct 2013 08:07:38 +0000 (16:07 +0800)]
MDL-24380 Chat: autoscroll help popup incorrect and doesn't display fully
Dan Poltawski [Tue, 22 Oct 2013 09:54:10 +0000 (17:54 +0800)]
Merge branch 'w43_MDL-42440_m26_authenable' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 22 Oct 2013 08:29:59 +0000 (16:29 +0800)]
Merge branch 'MDL-42112-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 22 Oct 2013 07:16:08 +0000 (15:16 +0800)]
Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 22 Oct 2013 07:02:05 +0000 (15:02 +0800)]
Merge branch '40976-26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 22 Oct 2013 06:51:23 +0000 (14:51 +0800)]
MDL-42459 upgrade: fix upgrade step ordering
Also incremented version to be safe
Eloy Lafuente (stronk7) [Tue, 22 Oct 2013 10:14:29 +0000 (12:14 +0200)]
Merge branch 'MDL-42459-master' of git://github.com/damyon/moodle
Conflicts:
version.php
Dan Poltawski [Tue, 22 Oct 2013 05:19:27 +0000 (13:19 +0800)]
Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 22 Oct 2013 05:09:31 +0000 (13:09 +0800)]
Merge branch 'MDL-42115-master' of git://github.com/jamiepratt/moodle
Dan Poltawski [Tue, 22 Oct 2013 05:00:23 +0000 (13:00 +0800)]
Merge branch 'MDL-40045_master' of https://github.com/markn86/moodle
Marina Glancy [Tue, 22 Oct 2013 04:03:28 +0000 (15:03 +1100)]
Merge branch 'MDL-26170_rss' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 22 Oct 2013 03:52:26 +0000 (11:52 +0800)]
Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 22 Oct 2013 03:51:03 +0000 (11:51 +0800)]
Merge branch 'MDL-42117-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 22 Oct 2013 02:39:54 +0000 (10:39 +0800)]
MDL-42459 Atto: Bye bye - see you in the plugins db!
Andrew Davis [Mon, 7 Oct 2013 07:58:58 +0000 (14:58 +0700)]
MDL-26170 RSS: fixed RSS cache clearing when items are deleted
Andrew Nicols [Tue, 8 Oct 2013 08:22:10 +0000 (16:22 +0800)]
MDL-42117 JavaScript: Ensure that new activities are fully set up
We don't need to set up anything specifically for toolboxes any more, but
other third-party JS may require additional setup following new module
creation.
Andrew Nicols [Wed, 9 Oct 2013 01:55:01 +0000 (09:55 +0800)]
MDL-42117 JavaScript: Don't rely on node data for course toolboxes
The YUI versions of getData and setData do not store the data in the DOM,
but in an instance of YUI. If you make modifications in one instance, but
apply them in another, then the data values are not accessible between
these two instances.
Additionally, there's no benefit to storing the instances on
initialisation - if anything, it increases the load overhead.
This change moves toolboxes to calculating their ancestors on click in the
same way it was done in the initialiser.
Rajesh Taneja [Tue, 22 Oct 2013 03:09:34 +0000 (11:09 +0800)]
MDL-31405 Assignment: removed type in time shift reset status
Assignment reset shifts time for all assignments and not specific to
assignment type, hence removed type string from reset status
Marina Glancy [Tue, 22 Oct 2013 03:08:12 +0000 (14:08 +1100)]
Merge branch 'MDL-42239-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Mon, 14 Oct 2013 07:13:20 +0000 (15:13 +0800)]
MDL-42239 calendar: Fix missing ids issue with mouseover panels
Dan Poltawski [Tue, 22 Oct 2013 02:25:44 +0000 (10:25 +0800)]
Merge branch 'MDL-42201_master' of https://github.com/markn86/moodle
Ankit Agarwal [Mon, 7 Oct 2013 03:16:24 +0000 (11:16 +0800)]
MDL-42173 administration: Fix alternate name warnings during registration
AMOS bot [Tue, 22 Oct 2013 00:45:38 +0000 (00:45 +0000)]
Automatically generated installer lang files
Marina Glancy [Mon, 21 Oct 2013 22:48:57 +0000 (09:48 +1100)]
Merge branch 'wip-MDL-42177-master-three' of git://github.com/abgreeve/moodle
Adrian Greeve [Mon, 14 Oct 2013 02:36:25 +0000 (10:36 +0800)]
MDL-42177 libraries: Unit tests for new functions that deal with user name fields.
functions with unit tests: get_required_user_name_fields, get_enabled_user_name_fields,
get_disabled_user_name_fields.
Adrian Greeve [Tue, 15 Oct 2013 04:07:29 +0000 (12:07 +0800)]
MDL-42177 libraries: Additional checking of the fullnamedisplay language string.
If the language string is missing firstname or lastname, then when displaying the
user edit form it defaults to 'firstname lastname'
Previous logic has been moved out to new functions with unit tests.
Dan Poltawski [Mon, 21 Oct 2013 05:58:14 +0000 (13:58 +0800)]
Merge branch 'MDL-34209-master' of git://github.com/andrewnicols/moodle
Jody Steele [Wed, 16 Oct 2013 15:19:34 +0000 (11:19 -0400)]
MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission
Marina Glancy [Mon, 21 Oct 2013 04:58:51 +0000 (15:58 +1100)]
Merge branch 'w43_MDL-42386_m26_etag' of https://github.com/skodak/moodle
Mark Nelson [Wed, 16 Oct 2013 03:20:40 +0000 (11:20 +0800)]
MDL-42377 backup: fixed incorrect debugging message
Mark Nelson [Fri, 6 Sep 2013 09:01:46 +0000 (17:01 +0800)]
MDL-40045 login: removed add_to_log call when a user updates their password
This add_to_log call is not being replaced by a user_updated event as the
call to $userauth->user_update_password should (and does in the case of
manual authentication - see MDL-41170) do this already when the password
is changed in the user table. If the authentication plugin is changing
the password externally then there is no need to call the user_updated
event as this should only be called whenever any update is made on the
user table.
Mark Nelson [Fri, 4 Oct 2013 07:33:25 +0000 (15:33 +0800)]
MDL-40045 user: replaced add_to_log call when the user list is viewed with an event
Mark Nelson [Thu, 5 Sep 2013 09:14:11 +0000 (17:14 +0800)]
MDL-40045 user: replaced add_to_log call when a user profile is viewed with an event
Mark Nelson [Fri, 11 Oct 2013 07:56:52 +0000 (15:56 +0800)]
MDL-40045 auth: introduced PHPUnit test to ensure logging in via LDAP triggers an event
Mark Nelson [Wed, 4 Sep 2013 10:05:25 +0000 (18:05 +0800)]
MDL-40045 auth: removed unnecessary add_to_log calls
Both LDAP and Shibboleth call complete_user_login which triggers
a user_loggedin event that handles the legacy call to add_to_log.
Mark Nelson [Mon, 14 Oct 2013 09:21:47 +0000 (17:21 +0800)]
MDL-42201 backup: introduced new automatic backup state
Dan Poltawski [Mon, 21 Oct 2013 03:24:51 +0000 (11:24 +0800)]
Merge branch 'MDL-26244_url' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 21 Oct 2013 03:15:21 +0000 (11:15 +0800)]
Merge branch 'MDL-42408_master' of https://github.com/dmonllao/moodle
David Monllao [Tue, 15 Oct 2013 03:46:25 +0000 (11:46 +0800)]
MDL-42343 tool_generator: Using the new session manager
David Monllao [Tue, 15 Oct 2013 10:08:31 +0000 (18:08 +0800)]
MDL-42362 behat: Passing options to modules generators
David Monllao [Thu, 17 Oct 2013 06:20:11 +0000 (14:20 +0800)]
MDL-42408 behat: Setting the site summary
Dan Poltawski [Mon, 21 Oct 2013 02:57:44 +0000 (10:57 +0800)]
Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle
Conflicts:
lib/upgrade.txt
mod/upgrade.txt
Andrew Davis [Tue, 8 Oct 2013 06:59:16 +0000 (13:59 +0700)]
MDL-26244 mod_date:added some logic show or hide the file picker button based on repository availability
Ankit Agarwal [Fri, 11 Oct 2013 09:35:11 +0000 (17:35 +0800)]
MDL-42293 behat: Add suport for custom admin paths to the behat upload repository step
Ankit Agarwal [Mon, 14 Oct 2013 09:09:07 +0000 (17:09 +0800)]
MDL-41966 calendar: Fix missing css files issue
