Dan Poltawski [Wed, 4 Dec 2013 07:44:03 +0000 (15:44 +0800)]
Merge branch 'wip-MDL-40191-2-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 4 Dec 2013 07:27:55 +0000 (18:27 +1100)]
MDL-40191 folder: Do not check capability in renderer
Capability to access the module is already checked before calling the renderer. Extra check works bad together with switching roles
Dan Poltawski [Wed, 4 Dec 2013 06:57:24 +0000 (14:57 +0800)]
Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 4 Dec 2013 06:48:30 +0000 (14:48 +0800)]
MDL-43028 navigation: fixed section for profilepage
section for profile page is profilepage and not mypage
Dan Poltawski [Wed, 4 Dec 2013 03:30:09 +0000 (11:30 +0800)]
Merge branch 'MDL-42563_filter_algebra_thirdpartylibs.xml' of https://github.com/tmuras/moodle
Sam Hemelryk [Wed, 4 Dec 2013 02:29:00 +0000 (15:29 +1300)]
Merge branch 'MDL-43084-master' of git://github.com/phalacee/moodle
Damyon Wiese [Wed, 4 Dec 2013 01:52:51 +0000 (09:52 +0800)]
Merge branch 'MDL-43083-master' of git://github.com/phalacee/moodle
Dan Poltawski [Wed, 4 Dec 2013 01:08:54 +0000 (09:08 +0800)]
MDL-42597 yui: remove stale built files
Dan Poltawski [Wed, 4 Dec 2013 00:53:25 +0000 (08:53 +0800)]
Merge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Jason Fowler [Thu, 28 Nov 2013 01:20:23 +0000 (09:20 +0800)]
MDL-43084 Themes: fixing dialog header in standard theme
Dan Poltawski [Wed, 4 Dec 2013 00:36:05 +0000 (08:36 +0800)]
Merge branch 'master_MDL-43049' of git://github.com/totara/moodle
Rajesh Taneja [Wed, 20 Nov 2013 01:05:01 +0000 (09:05 +0800)]
MDL-42597 Administration: Modified maintenance mode countdown to display nicely
Added Style and JS to display maintenance mode timer similar
to what is done on moodle demo site for rest.
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:55:42 +0000 (23:55 +0100)]
Merge branch 'MDL-41446-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 3 Dec 2013 22:52:12 +0000 (11:52 +1300)]
Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:45:54 +0000 (23:45 +0100)]
Merge branch 'w49_MDL-43117_m27_releaseinfo' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:40:19 +0000 (23:40 +0100)]
Merge branch 'MDL-43142_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:24:22 +0000 (23:24 +0100)]
Merge branch 'MDL-43140_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 3 Dec 2013 21:12:12 +0000 (10:12 +1300)]
Merge branch 'MDL-43093' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 3 Dec 2013 20:49:29 +0000 (09:49 +1300)]
Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 3 Dec 2013 20:44:25 +0000 (09:44 +1300)]
Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle
Conflicts:
backup/util/ui/base_moodleform.class.php
Sam Hemelryk [Tue, 3 Dec 2013 20:43:43 +0000 (09:43 +1300)]
Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 18:33:15 +0000 (19:33 +0100)]
Merge branch 'wip-MDL-43058-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 18:15:05 +0000 (19:15 +0100)]
Merge branch 'MDL-43105-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 16:17:06 +0000 (17:17 +0100)]
Merge branch 'master-mdl33971' of https://github.com/tlock/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 14:36:25 +0000 (15:36 +0100)]
Merge branch 'MDL-43079-master-v2' of https://github.com/jamiepratt/moodle
Damyon Wiese [Tue, 3 Dec 2013 09:29:39 +0000 (17:29 +0800)]
Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 09:01:19 +0000 (10:01 +0100)]
Merge branch 'MDL-42885_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 3 Dec 2013 08:15:53 +0000 (16:15 +0800)]
Merge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 3 Dec 2013 08:11:48 +0000 (16:11 +0800)]
Merge branch 'wip-MDL-43026-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 3 Dec 2013 08:08:15 +0000 (16:08 +0800)]
Merge branch 'master-mdl43020' of https://github.com/tlock/moodle
Dan Poltawski [Tue, 3 Dec 2013 08:01:22 +0000 (16:01 +0800)]
Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 3 Dec 2013 07:21:09 +0000 (15:21 +0800)]
Merge branch 'MDL-42097-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 3 Dec 2013 07:15:25 +0000 (15:15 +0800)]
Merge branch 'MDL-42962-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 3 Dec 2013 06:59:16 +0000 (14:59 +0800)]
Revert "MDL-39286 Remove link on My Courses settings heading"
This reverts commit
8b79059480935160a7ef0b9d767a4fc2a5532b39.
Behat is failing with this change.
Dan Poltawski [Tue, 3 Dec 2013 06:57:10 +0000 (14:57 +0800)]
Revert "MDL-42932 core_calendar: introduced calendar type system setting"
This reverts commit
bb32a499e10abc3bb88e715fb0575e5b7fb66e8e.
Dan Poltawski [Tue, 3 Dec 2013 06:57:08 +0000 (14:57 +0800)]
Revert "MDL-42932 core_lib: added missing $CFG declaration"
This reverts commit
4c61097cc7138dd18173775ec55fe2c5aed48857.
Andrew Nicols [Tue, 3 Dec 2013 06:36:40 +0000 (14:36 +0800)]
MDL-42989 JavaScript: Check result of navigation IO requests before reporting errors
When making a request which fails, we need to ensure that the AJAX query
was not aborted before displaying the error.
This ensures that if the navigation tree is being requested at the same
time as a page load is being processed, the abortion of the AJAX request is
not displayed before the page reloads.
Ankit Agarwal [Tue, 19 Nov 2013 06:03:08 +0000 (14:03 +0800)]
MDL-42962 events: Remove duplicate code from all course_module_viewed events
Ankit Agarwal [Tue, 19 Nov 2013 06:51:36 +0000 (14:51 +0800)]
MDL-42962 events: Add unit tests for the abstract class course_module_viewed
Ankit Agarwal [Tue, 19 Nov 2013 05:50:13 +0000 (13:50 +0800)]
MDL-42962 events: Add a abstract class course_module_viewed
AMOS BEGIN
CPY [eventcoursemoduleviewed,core],[eventcoursemoduleviewed,mod_feedback]
AMOS END
Andrew Nicols [Tue, 3 Dec 2013 06:20:49 +0000 (14:20 +0800)]
MDL-42989 JavaScript: Do not attempt to expand navigation when opening link
When clicking on a link which is also expandable, we should not attempt to
expand it.
Ankit Agarwal [Thu, 21 Nov 2013 08:15:04 +0000 (16:15 +0800)]
MDL-42097 auth: Auth plugins must check passwordurl before returning it
Damyon Wiese [Tue, 3 Dec 2013 06:17:34 +0000 (14:17 +0800)]
Merge branch 'time-limit-fix' of https://github.com/danpoltawski/moodle
Ankit Agarwal [Mon, 18 Nov 2013 10:04:01 +0000 (18:04 +0800)]
MDL-42097 formslib: updates to edit profile form
Add a new dependency 'in' in forms library
Use the 'in' dependency to disable the 'changepassword' field when a auth plugin doesn't support it
Dan Poltawski [Tue, 3 Dec 2013 05:23:31 +0000 (13:23 +0800)]
MDL-42084 lib: fix undefined variable warnings
Dan Poltawski [Tue, 3 Dec 2013 05:45:59 +0000 (13:45 +0800)]
Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 3 Dec 2013 05:28:10 +0000 (13:28 +0800)]
MDL-40079 repositories: Added deprecated tags
Rajesh Taneja [Tue, 3 Dec 2013 05:24:10 +0000 (13:24 +0800)]
MDL-40079 repositories: Replaced const with configs for boxnet
Damyon Wiese [Tue, 3 Dec 2013 05:18:47 +0000 (13:18 +0800)]
Merge branch 'MDL-43076-master' of git://github.com/phalacee/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Tue, 3 Dec 2013 05:03:32 +0000 (13:03 +0800)]
Merge branch 'MDL-43081-master' of git://github.com/danpoltawski/moodle
Conflicts:
lib/upgrade.txt
Dan Poltawski [Tue, 3 Dec 2013 04:52:10 +0000 (12:52 +0800)]
Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Dec 2013 04:41:03 +0000 (12:41 +0800)]
Merge branch 'MDL-42738_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 3 Dec 2013 04:36:50 +0000 (12:36 +0800)]
Merge branch 'MDL-43066_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 3 Dec 2013 03:43:32 +0000 (11:43 +0800)]
Merge branch 'wip-mdl-43048' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Dec 2013 03:41:06 +0000 (11:41 +0800)]
Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle
Mark Nelson [Tue, 3 Dec 2013 03:11:36 +0000 (19:11 -0800)]
MDL-42932 core_lib: added missing $CFG declaration
Damyon Wiese [Tue, 3 Dec 2013 03:10:18 +0000 (11:10 +0800)]
Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle
Conflicts:
enrol/self/db/upgrade.php
Dan Poltawski [Tue, 3 Dec 2013 02:07:10 +0000 (10:07 +0800)]
Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 3 Dec 2013 01:26:58 +0000 (09:26 +0800)]
Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle
Conflicts:
filter/tex/version.php
lang/en/admin.php
Sam Hemelryk [Mon, 2 Dec 2013 22:12:34 +0000 (11:12 +1300)]
Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 2 Dec 2013 21:25:26 +0000 (10:25 +1300)]
Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle
Tim Hunt [Wed, 27 Nov 2013 13:35:11 +0000 (13:35 +0000)]
MDL-43093 update repeat_elements PHPdoc.
Damyon Wiese [Mon, 2 Dec 2013 07:16:12 +0000 (15:16 +0800)]
Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle
Damyon Wiese [Mon, 2 Dec 2013 07:14:26 +0000 (15:14 +0800)]
MDL-32888: Whitespace fixes (grr)
Damyon Wiese [Mon, 2 Dec 2013 07:01:37 +0000 (15:01 +0800)]
Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle
Dan Poltawski [Mon, 2 Dec 2013 06:52:03 +0000 (14:52 +0800)]
Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Fri, 22 Nov 2013 05:55:29 +0000 (16:55 +1100)]
MDL-42731 block_activity_modules: added behat tests
Marina Glancy [Fri, 22 Nov 2013 10:12:22 +0000 (21:12 +1100)]
MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode
Damyon Wiese [Mon, 2 Dec 2013 06:37:22 +0000 (14:37 +0800)]
Merge branch 'm27_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle
Andrew Nicols [Thu, 28 Nov 2013 03:21:28 +0000 (11:21 +0800)]
MDL-42989 Admin: Clean output when building site administration tree for JS
Previously, any inappropriate whitespace found whilst building the admin
tree caused a JSON error and for the site administration tree retrieval to
fail.
This change ensures that access to the site administration tree is unbroken
for non-developers, whilst still alerting developers that there is an
issue.
Dan Poltawski [Mon, 2 Dec 2013 06:23:48 +0000 (14:23 +0800)]
Merge branch 'MDL-42969-master' of git://github.com/mouneyrac/moodle
David Monllao [Thu, 21 Nov 2013 05:12:11 +0000 (13:12 +0800)]
MDL-41592 general: Also checking the site path
David Monllao [Thu, 21 Nov 2013 05:07:13 +0000 (13:07 +0800)]
MDL-41592 behat: Config settings more flexible
Adding the option to just set ->behat_wwwroot to
allow switching to the behat test site.
Aaron Barnes [Wed, 4 Sep 2013 08:35:50 +0000 (20:35 +1200)]
MDL-41592 behat: Allow alt wwwroot to be set for acceptance testing
To set add $CFG->behat_wwwroot = 'http://alturl'; in your config.php
David Monllao [Thu, 21 Nov 2013 07:11:59 +0000 (15:11 +0800)]
MDL-42627 behat: Moving the deprecated method to behat_deprecate and updating scenarios
David Monllao [Tue, 29 Oct 2013 09:16:32 +0000 (17:16 +0800)]
MDL-42627 behat: New steps definitions class for deprecated steps
David Monllao [Tue, 26 Nov 2013 10:20:22 +0000 (18:20 +0800)]
MDL-43066 behat: Checking that the site is not already installed
Damyon Wiese [Mon, 2 Dec 2013 04:52:01 +0000 (12:52 +0800)]
MDL-43018 Fix unit tests for minify changes.
Damyon Wiese [Mon, 2 Dec 2013 04:16:59 +0000 (12:16 +0800)]
Merge branch 'MDL-40040-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Thu, 21 Nov 2013 07:36:35 +0000 (15:36 +0800)]
MDL-40040 Cleanup some blog methods and replace add_to_log
Cleaned up add_association()
cleaned up add_associations()
Replaced remaining add_to_log() in blogs with events
Ankit Agarwal [Thu, 21 Nov 2013 07:35:28 +0000 (15:35 +0800)]
MDL-40040 events: Add unit tests for blog events
Ankit Agarwal [Thu, 21 Nov 2013 07:34:56 +0000 (15:34 +0800)]
MDL-40040 events: Add blog events
Added blog_entries_viewed
Added blog_association_created
Dan Poltawski [Mon, 2 Dec 2013 03:58:01 +0000 (11:58 +0800)]
Merge branch 'w49_MDL-43106_m27_doublecookie' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 2 Dec 2013 03:23:46 +0000 (11:23 +0800)]
Merge branch 'MDL-43018-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 2 Dec 2013 03:19:41 +0000 (11:19 +0800)]
Merge branch 'wip-MDL-40191-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 2 Dec 2013 03:11:07 +0000 (11:11 +0800)]
Merge branch 'MDL-43068' of git://github.com/timhunt/moodle
Rajesh Taneja [Fri, 11 Oct 2013 06:34:15 +0000 (14:34 +0800)]
MDL-40079 repositories: Replaced const with configs
Damyon Wiese [Mon, 2 Dec 2013 01:33:39 +0000 (09:33 +0800)]
Merge branch '43033-27' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Mon, 2 Dec 2013 01:04:09 +0000 (14:04 +1300)]
Merge branch 'MDL-42876-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 2 Dec 2013 00:44:05 +0000 (13:44 +1300)]
Merge branch 'MDL-42918' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Petr Škoda [Mon, 18 Nov 2013 02:50:26 +0000 (10:50 +0800)]
MDL-41819 try to work around max_input_vars restriction
Sam Hemelryk [Sun, 1 Dec 2013 21:52:11 +0000 (10:52 +1300)]
Merge branch 'MDL-42951-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 1 Dec 2013 21:35:46 +0000 (10:35 +1300)]
Merge branch 'wip-mdl-33618' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 26 Nov 2013 22:41:05 +0000 (11:41 +1300)]
MDL-43033 cache: added stats logging to set_many methods
Sam Hemelryk [Tue, 26 Nov 2013 22:18:53 +0000 (11:18 +1300)]
MDL-43033 cache: fixed display of definition stores in admin interface
Sam Hemelryk [Tue, 26 Nov 2013 01:07:29 +0000 (14:07 +1300)]
MDL-43033 cache: added a warning icon for mappings
We now show a warning icon with an explanatory alt if the user
has mapped a store as a mode default that doesn't not fulfill the
requirements of every known definition.
Sam Hemelryk [Mon, 25 Nov 2013 23:17:33 +0000 (12:17 +1300)]
MDL-43033 cache: fixed mode map event invalidation scenario
Sam Hemelryk [Mon, 25 Nov 2013 23:03:40 +0000 (12:03 +1300)]
MDL-43033 cache: added stats logging to get_many methods
Petr Škoda [Sun, 1 Dec 2013 10:55:58 +0000 (18:55 +0800)]
MDL-43117 Add release column to Plugins Overview page
This patch is based on previous patch by Marko Vidberg, thanks a lot!
Matteo Scaramuccia [Sun, 24 Nov 2013 08:21:14 +0000 (09:21 +0100)]
MDL-43039 Libraries "The session partition is full." false positive.
