Sam Hemelryk [Mon, 10 Mar 2014 22:54:05 +0000 (11:54 +1300)]
Merge branch 'w11_MDL-44496_m27_eventbuffer' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 10 Mar 2014 21:10:08 +0000 (10:10 +1300)]
Merge branch 'MDL-44334-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 10 Mar 2014 20:19:44 +0000 (09:19 +1300)]
Merge branch 'MDL-43721-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 10 Mar 2014 19:51:36 +0000 (08:51 +1300)]
Merge branch 'wip-MDL-44471-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 10 Mar 2014 07:13:43 +0000 (15:13 +0800)]
Merge branch 'wip-mdl-44017' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 10 Mar 2014 05:45:26 +0000 (13:45 +0800)]
Merge branch 'MDL-44440_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 10 Mar 2014 05:31:01 +0000 (13:31 +0800)]
MDL-44440 behat: Changing , for > as a navigation tree nodes separator
Using greater than as seems a more natural separator
than the comma when separating nodes which have a
hierarchy relation.
Dan Poltawski [Mon, 10 Mar 2014 04:04:14 +0000 (12:04 +0800)]
Merge branch 'MDL-43236_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 24 Feb 2014 03:29:41 +0000 (11:29 +0800)]
MDL-43236 behat: Step arguments normalization
Updating step definitions arguments according to the
documentation page.
David Monllao [Fri, 21 Feb 2014 07:18:07 +0000 (15:18 +0800)]
MDL-43236 behat: Updating references to deprecated methods
David Monllao [Fri, 21 Feb 2014 07:14:15 +0000 (15:14 +0800)]
MDL-43236 behat: Deprecate old steps
Correcting grammar errors and deprecating
the previous steps definitions:
- behat_data_generators::the_following_exists()
- behat_general::should_exists()
- behat_general::should_not_exists()
Rajesh Taneja [Wed, 5 Mar 2014 07:01:27 +0000 (15:01 +0800)]
MDL-44017 Events: Added unit test for report_viewed events
Rajesh Taneja [Tue, 4 Mar 2014 08:13:28 +0000 (16:13 +0800)]
MDL-44017 Events: Deprecated content_viewed event
Replaced content_viewed event with appropriate events and deprecated
content_viewed event
Andrew Nicols [Tue, 25 Feb 2014 02:42:45 +0000 (10:42 +0800)]
MDL-44334 Javascript: Prevent scroll locking for small screen heights
David Monllao [Tue, 4 Mar 2014 09:40:56 +0000 (17:40 +0800)]
MDL-44440 behat: Refactoring features to use I navigate to
Replacing multiple "I expand node" steps by the
new "I navigate to". Also fixing few I navigate to
when dealing with non-JS.
David Monllao [Mon, 24 Feb 2014 10:14:57 +0000 (18:14 +0800)]
MDL-44440 behat: Other fixes to make clean work properly
- Update the step to follow links inside a treeview
to work also when JS is disabled.
- Make regions accept header and footer.
- Change some locators refering to non-clean compatible
regions.
- Restricting click to the table row in forum tracking
because seems to conflict with the navigation bar when
using narrow window sizes.
Rajesh Taneja [Thu, 13 Feb 2014 06:27:44 +0000 (14:27 +0800)]
MDL-44440 navigation: Added behat step to navigate from navigation/Admin block
This step will help navigate to different parts of moodle
using navigation or adminstration block.
David Monllao [Mon, 24 Feb 2014 05:35:46 +0000 (13:35 +0800)]
MDL-44440 behat: Log out compatible with clean
.navbar needs to be clicked before following
log in or log out links.
Petr Škoda [Fri, 7 Mar 2014 03:06:17 +0000 (11:06 +0800)]
MDL-44496 fix minor trait docs issue
The store trait is not necessary any more in bufferef_writer
because we define the required methods as abstract.
Petr Škoda [Fri, 7 Mar 2014 02:36:34 +0000 (10:36 +0800)]
MDL-44496 fix event buffering in log stores
Marina Glancy [Thu, 6 Mar 2014 01:21:36 +0000 (09:21 +0800)]
MDL-44471 Revert "MDL-42238 mod_wiki: Alternate name sql update to wiki_print_recent_activity"
This reverts commit
6d3d9bd927d5386b1dc4fbbcb7db5559efa7a5cd.
Petr Škoda [Tue, 4 Mar 2014 06:21:41 +0000 (14:21 +0800)]
MDL-44359 fix explode(', ', regressions from MDL-44255
Eloy Lafuente (stronk7) [Thu, 6 Mar 2014 21:16:58 +0000 (22:16 +0100)]
weekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 6 Mar 2014 21:16:48 +0000 (22:16 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Damyon Wiese [Wed, 26 Feb 2014 08:29:48 +0000 (16:29 +0800)]
MDL-43721 Assign + groups: Improve performance of assign grading table
Add a function to the groups lib to filter a list of users down
to the ones who can see the module. Required because calling
groups_course_module_visible() for a list of users is too slow
and we shouldn't spread group logic outside of grouplib.php.
Using it in the assign grading table reduces DB queries from 6198/1 to 256/3.
This is 12secs down to 2.5secs.
Damyon Wiese [Thu, 6 Mar 2014 06:00:38 +0000 (14:00 +0800)]
MDL-43721 Assign: Static cache for plugin is_enabled and is_visible because they get used alot
Yuliya Bozhko [Thu, 13 Feb 2014 21:20:29 +0000 (10:20 +1300)]
MDL-44140 badges: Prevent non-owners to change visibility of issued badges
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
Damyon Wiese [Thu, 6 Mar 2014 05:37:52 +0000 (13:37 +0800)]
Revert "MDL-32917 YUI2 to YUI3 Calendar port: only display the date from the matching selector and display the month/year matching the selector value"
There are numerous bugs with this new module to do with showing the currently selected date,
random changes in the selected dates, showing multiple selected dates and css errors.
This reverts commit
1d128663f69be8b60fc28b6b7732acd24d800a98.
This reverts commit
4a521e6596918279fd0cdeb47d06e7906bc004cc.
Damyon Wiese [Thu, 6 Mar 2014 03:41:09 +0000 (11:41 +0800)]
Merge branch 'MDL-32917-master-nomerge3' of git://github.com/mouneyrac/moodle
Jerome Mouneyrac [Thu, 6 Mar 2014 03:35:00 +0000 (11:35 +0800)]
MDL-32917 YUI2 to YUI3 Calendar port: only display the date from the matching selector and display the month/year matching the selector value
Damyon Wiese [Thu, 6 Mar 2014 01:21:24 +0000 (09:21 +0800)]
Merge branch 'wip-MDL-44403-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 6 Mar 2014 01:03:19 +0000 (09:03 +0800)]
Revert "MDL-43852 Filters Fixed naked-OR conditions."
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.
This reverts commit
840c1c554d12d9214928da6f10989fc5546dbb43.
Eloy Lafuente (stronk7) [Wed, 5 Mar 2014 23:35:28 +0000 (00:35 +0100)]
Merge branch 'MDL-44425-en_fix' of git://github.com/mudrd8mz/moodle
Helen Foster [Mon, 3 Mar 2014 19:26:20 +0000 (20:26 +0100)]
MDL-44425 Merge English strings from the en_fix language pack
Brent Boghosian [Tue, 14 Jan 2014 16:25:10 +0000 (11:25 -0500)]
MDL-43635: Further support custom contexts
Reading from config DB table and reset method for after plugin install
Add PHPUnit test for custom context changes
Dan Poltawski [Wed, 5 Mar 2014 06:21:28 +0000 (14:21 +0800)]
Merge branch 'MDL-44319-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 5 Mar 2014 06:18:21 +0000 (14:18 +0800)]
Merge branch 'wip-MDL-44287-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 5 Mar 2014 06:13:23 +0000 (14:13 +0800)]
Merge branch 'MDL-43930-master-fix1' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 5 Mar 2014 05:44:56 +0000 (13:44 +0800)]
Merge branch 'MDL-44370-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Wed, 5 Mar 2014 05:35:14 +0000 (13:35 +0800)]
Merge branch 'm27_MDL-44312_cron_overdue_warning_Does_Not_Take_Care_Of_cronclionly_And_cronremotepassword' of https://github.com/scara/moodle
Damyon Wiese [Wed, 5 Mar 2014 05:17:18 +0000 (13:17 +0800)]
Merge branch 'MDL-41585' of https://github.com/totara/openbadges
Dan Poltawski [Wed, 5 Mar 2014 04:47:17 +0000 (12:47 +0800)]
Merge branch '44180-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 5 Mar 2014 04:39:53 +0000 (12:39 +0800)]
Merge branch 'MDL-41248' of git://github.com/timhunt/moodle
Damyon Wiese [Wed, 5 Mar 2014 04:21:27 +0000 (12:21 +0800)]
MDL-43930 Assign: Fix unit tests.
The tests were expecting exact log data to match, I changed the data
but missed updating the test.
Damyon Wiese [Wed, 5 Mar 2014 03:36:16 +0000 (11:36 +0800)]
Merge branch 'MDL-44361-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 5 Mar 2014 03:22:35 +0000 (11:22 +0800)]
Merge branch 'MDL-43930-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 5 Mar 2014 03:08:31 +0000 (11:08 +0800)]
Merge branch 'wip-MDL-44321-master-fix2' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 5 Mar 2014 02:58:20 +0000 (10:58 +0800)]
MDL-44321 events: make sure the full object is passed to add_record_snapshot in book
Dan Poltawski [Wed, 5 Mar 2014 02:52:46 +0000 (10:52 +0800)]
Merge branch 'MDL-44065-master' of https://github.com/sammarshallou/moodle
Damyon Wiese [Wed, 5 Mar 2014 02:13:56 +0000 (10:13 +0800)]
Merge branch 'wip-MDL-44074-master_4' of git://github.com/gjb2048/moodle
Ankit Agarwal [Fri, 28 Feb 2014 05:25:16 +0000 (13:25 +0800)]
MDL-42079 calendar: Update core apis to support ical imports with rrule repeats
Ankit Agarwal [Fri, 28 Feb 2014 05:24:35 +0000 (13:24 +0800)]
MDL-42079 calendar: Add unittests for rrule_manager class
Ankit Agarwal [Fri, 28 Feb 2014 05:24:09 +0000 (13:24 +0800)]
MDL-42079 calendar: Add a rrule_manager class
AMOS bot [Wed, 5 Mar 2014 00:54:42 +0000 (00:54 +0000)]
Automatically generated installer lang files
Tim Hunt [Tue, 4 Mar 2014 17:57:47 +0000 (17:57 +0000)]
MDL-43749 quiz editing: fix adding the first question.
The first question added to a quiz was getting slot number 2, not 1.
Dan Poltawski [Tue, 4 Mar 2014 09:49:06 +0000 (17:49 +0800)]
Merge branch 'wip-MDL-44258-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 4 Mar 2014 08:59:10 +0000 (16:59 +0800)]
Merge branch 'wip-mdl-41266' of https://github.com/rajeshtaneja/moodle
Ankit Agarwal [Tue, 4 Mar 2014 08:13:25 +0000 (16:13 +0800)]
MDL-44370 calendar: Add support for restoring calendar log rules
Dan Poltawski [Tue, 4 Mar 2014 07:59:55 +0000 (15:59 +0800)]
Merge branch 'MDL-44272-master' of git://github.com/ankitagarwal/moodle
Rajesh Taneja [Tue, 4 Mar 2014 07:55:50 +0000 (15:55 +0800)]
MDL-41266 Logging: Added choose option for external database store
Dan Poltawski [Tue, 4 Mar 2014 07:43:23 +0000 (15:43 +0800)]
Merge branch 'MDL-44278' of git://github.com/timhunt/moodle
Marina Glancy [Fri, 28 Feb 2014 08:15:26 +0000 (16:15 +0800)]
MDL-44403 events: MDL-44403 events: bug fix in legacy event data for unknown_service_api_called
Marina Glancy [Fri, 28 Feb 2014 08:11:15 +0000 (16:11 +0800)]
MDL-44403 events: added public method to get eventdata
Ankit Agarwal [Wed, 26 Feb 2014 06:22:04 +0000 (14:22 +0800)]
MDL-44370 calendar: Fix calendar url in reports
Dan Poltawski [Tue, 4 Mar 2014 07:03:02 +0000 (15:03 +0800)]
Merge branch 'wip-MDL-44321-master-fix' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 4 Mar 2014 06:49:40 +0000 (14:49 +0800)]
MDL-44321 unittest correction since snapshot is not a reference to object any more.
Frederic Massart [Tue, 28 Jan 2014 07:18:18 +0000 (15:18 +0800)]
MDL-43468 mod_assign: Webservice parameters were not safely cleaned
Dan Poltawski [Tue, 4 Mar 2014 06:40:23 +0000 (14:40 +0800)]
Merge branch 'MDL-44436-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 4 Mar 2014 06:27:33 +0000 (14:27 +0800)]
Merge branch 'MDL-32917-master-nomerge2' of git://github.com/mouneyrac/moodle
Frederic Massart [Wed, 29 Jan 2014 02:01:17 +0000 (10:01 +0800)]
MDL-44436 context: Context IDs are forced to be int
The method context::insert_context_record() sets the context::$id to
an int, while when we create an instance, the $id is often read from
a DB $record object, and is a string. The ID should always be an int.
Damyon Wiese [Tue, 4 Mar 2014 05:41:55 +0000 (13:41 +0800)]
Merge branch 'MDL-42842' of https://github.com/danielneis/moodle
Damyon Wiese [Tue, 4 Mar 2014 05:32:43 +0000 (13:32 +0800)]
Merge branch 'w10_MDL-41266_m27_logging' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 4 Mar 2014 05:29:03 +0000 (13:29 +0800)]
Merge branch 'MDL-43738_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 4 Mar 2014 04:56:08 +0000 (12:56 +0800)]
Merge branch 'm27_MDL-43852_SWF_Not_Embedded_By_Mediaplugin_Filter' of https://github.com/scara/moodle
Dan Poltawski [Tue, 28 Jan 2014 07:35:42 +0000 (15:35 +0800)]
MDL-43146 enrol_imsenterprise: missing sesskey protection
Frederic Massart [Thu, 30 Jan 2014 04:02:09 +0000 (12:02 +0800)]
MDL-29409 repository_alfresco: Drop support for URL/link
The current solution has two major issues. Firstly, it is using the
session key in the file URL, allowing anyone with the link to steal
the identify of the poster. Secondly, the links are not presistent
and become broken as soon as the server is restarted. Let's not
support this any more until a proper solution is found in MDL-26454.
Dan Poltawski [Mon, 3 Mar 2014 23:38:56 +0000 (07:38 +0800)]
Merge branch 'w10_MDL-44358_m27_stylesrefact' of https://github.com/skodak/moodle
Matteo Scaramuccia [Sat, 22 Feb 2014 12:54:19 +0000 (13:54 +0100)]
MDL-44312 Administration Take care of cronclionly and cronremotepassword.
Dan Poltawski [Mon, 3 Mar 2014 07:15:23 +0000 (15:15 +0800)]
Merge branch 'MDL-44377' of https://github.com/stronk7/moodle
Marina Glancy [Fri, 7 Feb 2014 05:54:43 +0000 (13:54 +0800)]
MDL-39990 wiki: more detailed validation of view/edit access rights
Petr Škoda [Mon, 3 Mar 2014 06:19:12 +0000 (14:19 +0800)]
MDL-44358 inform developers that CSS handling was refactored
Dan Poltawski [Mon, 3 Mar 2014 05:50:18 +0000 (13:50 +0800)]
Merge branch 'wip-MDL-44321-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 3 Mar 2014 05:33:40 +0000 (13:33 +0800)]
Merge branch 'wip-MDL-44362-master' of git://github.com/marinaglancy/moodle
Andrew Davis [Mon, 3 Mar 2014 04:15:54 +0000 (12:15 +0800)]
MDL-44082 mod_chat: added a security check for users already in the chat activity
Tomasz Muras [Mon, 3 Mar 2014 03:23:44 +0000 (11:23 +0800)]
MDL-43656 mod_feedback: availablity date logic incorrect
Maria Torres [Mon, 3 Mar 2014 02:35:00 +0000 (10:35 +0800)]
MDL-43916 - Email addresses incorrectly displayed
When capabilities and settings do not allow it.
Dan Poltawski [Mon, 3 Mar 2014 02:07:16 +0000 (10:07 +0800)]
Merge branch 'w06_MDL-43344_m27_flow' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 3 Mar 2014 01:36:54 +0000 (09:36 +0800)]
Merge branch 'MDL-43749' of git://github.com/timhunt/moodle
Sam Hemelryk [Sat, 15 Feb 2014 22:59:15 +0000 (11:59 +1300)]
MDL-44180 mod_quiz: unified @package use
Tim Hunt [Wed, 22 Jan 2014 18:25:22 +0000 (18:25 +0000)]
MDL-43749 quiz DB tables. Put install.xml in a more logical order.
All settings tables before all user data.
Tim Hunt [Wed, 22 Jan 2014 18:19:31 +0000 (18:19 +0000)]
MDL-43749 normalise quiz database structure.
The sequence of questions that made up a quiz used to be stored as a
comma-separated list in quiz.questions. Now the same information is
stored in the rows in the quiz_slots table. This is not just 'better' in
a database design sense, but it allows for the future changes we will
need as we enhance the quiz in the MDL-40987 epic.
Having changed the database structure, all the rest of the code needs to
be changed to account for it, and that is done here.
Note that there are not many unit tests for the changed bit. That is
because as part of MDL-40987 we will be changing the code further, and
we will add unit tests then.
Tim Hunt [Thu, 20 Feb 2014 12:16:03 +0000 (12:16 +0000)]
MDL-44251 fix typo in DML unit tests.
Tim Hunt [Mon, 17 Feb 2014 16:48:27 +0000 (16:48 +0000)]
MDL-44251 DB helper to update rows without violating a unique index.
Gareth J Barnard [Sat, 1 Mar 2014 09:37:59 +0000 (09:37 +0000)]
MDL-44074 theme_bootstrapbase: No 768px-979px & 1200px+ empty blk span calcs.
AMOS bot [Sat, 1 Mar 2014 00:56:02 +0000 (00:56 +0000)]
Automatically generated installer lang files
Gordon Bateson [Mon, 27 Jan 2014 05:35:41 +0000 (14:35 +0900)]
MDL-43852 Filters Fixed naked-OR conditions.
Eloy Lafuente (stronk7) [Wed, 26 Feb 2014 15:32:40 +0000 (16:32 +0100)]
MDL-44377 dml: enforce non-empty prefix for sqlsrv
Only MySQL is allowed to run Moodle instances without
(with an empty) database prefix. The rationale is that
"user" is a reserved word in every RDBMS but MySQL.
Before this patch, installation was breaking badly, when
the "user" CREATE TABLE statement was issued. With this
patch the error is shown earlier (on connection) preventing
any advance/use of the database.
This check is present in all the drivers, just sqlsrv was missing it.
Marina Glancy [Fri, 28 Feb 2014 09:09:39 +0000 (17:09 +0800)]
MDL-44258 workshop: adjust tests with MDL-43738
Marina Glancy [Wed, 26 Feb 2014 03:51:21 +0000 (11:51 +0800)]
MDL-44362 recentactivity: fix regressions from MDL-44055
Marina Glancy [Tue, 18 Feb 2014 02:22:56 +0000 (10:22 +0800)]
MDL-44258 Behat test for workshop, automate MDLQA-99