moodle.git
11 years agoMerge branch 'MDL-32917-master-nomerge2' of git://github.com/mouneyrac/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

11 years agoMerge branch 'MDL-42842' of https://github.com/danielneis/moodle
Damyon Wiese [Tue, 4 Mar 2014 05:41:55 +0000 (13:41 +0800)]
Merge branch 'MDL-42842' of https://github.com/danielneis/moodle

11 years agoMerge branch 'w10_MDL-41266_m27_logging' of https://github.com/skodak/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

11 years agoMerge branch 'MDL-43738_master' of git://github.com/dmonllao/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

11 years agoMerge branch 'm27_MDL-43852_SWF_Not_Embedded_By_Mediaplugin_Filter' of https://github...
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

11 years agoMDL-43146 enrol_imsenterprise: missing sesskey protection
Dan Poltawski [Tue, 28 Jan 2014 07:35:42 +0000 (15:35 +0800)]
MDL-43146 enrol_imsenterprise: missing sesskey protection

11 years agoMDL-29409 repository_alfresco: Drop support for URL/link
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.

11 years agoMerge branch 'w10_MDL-44358_m27_stylesrefact' of https://github.com/skodak/moodle
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

11 years agoMerge branch 'MDL-44377' of https://github.com/stronk7/moodle
Dan Poltawski [Mon, 3 Mar 2014 07:15:23 +0000 (15:15 +0800)]
Merge branch 'MDL-44377' of https://github.com/stronk7/moodle

11 years agoMDL-39990 wiki: more detailed validation of view/edit access rights
Marina Glancy [Fri, 7 Feb 2014 05:54:43 +0000 (13:54 +0800)]
MDL-39990 wiki: more detailed validation of view/edit access rights

11 years agoMDL-44358 inform developers that CSS handling was refactored
Petr Škoda [Mon, 3 Mar 2014 06:19:12 +0000 (14:19 +0800)]
MDL-44358 inform developers that CSS handling was refactored

11 years agoMerge branch 'wip-MDL-44321-master' of git://github.com/marinaglancy/moodle
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

11 years agoMerge branch 'wip-MDL-44362-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

11 years agoMDL-44082 mod_chat: added a security check for users already in the chat activity
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

11 years agoMDL-43656 mod_feedback: availablity date logic incorrect
Tomasz Muras [Mon, 3 Mar 2014 03:23:44 +0000 (11:23 +0800)]
MDL-43656 mod_feedback: availablity date logic incorrect

11 years agoMDL-43916 - Email addresses incorrectly displayed
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.

11 years agoMerge branch 'w06_MDL-43344_m27_flow' of https://github.com/skodak/moodle
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

11 years agoMerge branch 'MDL-43749' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 3 Mar 2014 01:36:54 +0000 (09:36 +0800)]
Merge branch 'MDL-43749' of git://github.com/timhunt/moodle

11 years agoMDL-43749 quiz DB tables. Put install.xml in a more logical order.
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.

11 years agoMDL-43749 normalise quiz database structure.
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.

11 years agoMDL-44251 fix typo in DML unit tests.
Tim Hunt [Thu, 20 Feb 2014 12:16:03 +0000 (12:16 +0000)]
MDL-44251 fix typo in DML unit tests.

11 years agoMDL-44251 DB helper to update rows without violating a unique index.
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.

11 years agoMDL-43852 Filters Fixed naked-OR conditions.
Gordon Bateson [Mon, 27 Jan 2014 05:35:41 +0000 (14:35 +0900)]
MDL-43852 Filters Fixed naked-OR conditions.

11 years agoMDL-44377 dml: enforce non-empty prefix for sqlsrv
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.

11 years agoMDL-44362 recentactivity: fix regressions from MDL-44055
Marina Glancy [Wed, 26 Feb 2014 03:51:21 +0000 (11:51 +0800)]
MDL-44362 recentactivity: fix regressions from MDL-44055

11 years agoMDL-44321 events: Text correction in assessable events
Marina Glancy [Thu, 20 Feb 2014 06:15:29 +0000 (14:15 +0800)]
MDL-44321 events: Text correction in assessable events

11 years agoMDL-44321 events: make sure the full object is passed to add_record_snapshot()
Marina Glancy [Tue, 25 Feb 2014 05:45:01 +0000 (13:45 +0800)]
MDL-44321 events: make sure the full object is passed to add_record_snapshot()

11 years agoMDL-44321 events: debug on errors in add_record_snapshot()
Marina Glancy [Tue, 25 Feb 2014 03:30:19 +0000 (11:30 +0800)]
MDL-44321 events: debug on errors in add_record_snapshot()

also clone object returned by get_record_snapshot() to prevent accidental changing of $COURSE or other important objects

11 years agoMDL-44321 events: cleaning up course_module_instance_list_viewed event
Marina Glancy [Tue, 25 Feb 2014 01:27:13 +0000 (09:27 +0800)]
MDL-44321 events: cleaning up course_module_instance_list_viewed event

11 years agoMDL-44321 events: cleaning up course_module_viewed event
Marina Glancy [Tue, 25 Feb 2014 03:43:13 +0000 (11:43 +0800)]
MDL-44321 events: cleaning up course_module_viewed event

11 years agoMDL-32917 port YUI2 Moodle calendar into a shifted YUI3 Calendar
Jerome Mouneyrac [Fri, 28 Feb 2014 07:05:43 +0000 (15:05 +0800)]
MDL-32917 port YUI2 Moodle calendar into a shifted YUI3 Calendar

11 years agoMDL-41266 improve naming of log reader interfaces
Petr Škoda [Thu, 27 Feb 2014 08:42:44 +0000 (16:42 +0800)]
MDL-41266 improve naming of log reader interfaces

11 years agoMDL-42891 fix $interface parameter in dummy log manager and add unit tests
Petr Škoda [Tue, 25 Feb 2014 08:16:15 +0000 (16:16 +0800)]
MDL-42891 fix $interface parameter in dummy log manager and add unit tests

11 years agoMDL-42891 logging: Add support for getting readers that implement a specific interfac...
Ankit Agarwal [Fri, 21 Feb 2014 05:15:46 +0000 (13:15 +0800)]
MDL-42891 logging: Add support for getting readers that implement a specific interface in log manager

11 years agoMDL-43759 logging: Rename trait writer to buffered_writer
Ankit Agarwal [Fri, 21 Feb 2014 03:44:33 +0000 (11:44 +0800)]
MDL-43759 logging: Rename trait writer to buffered_writer

11 years agoMDL-41266 improve log store strings
Michael de Raadt [Thu, 20 Feb 2014 07:01:56 +0000 (15:01 +0800)]
MDL-41266 improve log store strings

11 years agoMDL-37658 core: Event strings added to core
Rajesh Taneja [Thu, 13 Feb 2014 06:29:27 +0000 (14:29 +0800)]
MDL-37658 core: Event strings added to core

11 years agoMDL-41269 use courseid index instead of contextid because new events are going to...
Petr Škoda [Wed, 12 Feb 2014 06:33:58 +0000 (14:33 +0800)]
MDL-41269 use courseid index instead of contextid because new events are going to use courseid

11 years agoMDL-41269 add standard log table indexes
Petr Škoda [Tue, 11 Feb 2014 06:48:17 +0000 (14:48 +0800)]
MDL-41269 add standard log table indexes

11 years agoMDL-41268 keep full backwards compatibility when installing new logging subsystem
Petr Škoda [Tue, 11 Feb 2014 06:34:16 +0000 (14:34 +0800)]
MDL-41268 keep full backwards compatibility when installing new logging subsystem

11 years agoMDL-41266 add new is_logging() method to log readers
Petr Škoda [Mon, 10 Feb 2014 08:05:04 +0000 (16:05 +0800)]
MDL-41266 add new is_logging() method to log readers

This will be useful in live logs report where we want only readers that have latest data.

11 years agoMDL-41266 fix coding style issues
Petr Škoda [Mon, 10 Feb 2014 02:01:28 +0000 (10:01 +0800)]
MDL-41266 fix coding style issues

11 years agoMDL-41268 fix cron execution in new log manager
Petr Škoda [Mon, 10 Feb 2014 00:50:19 +0000 (08:50 +0800)]
MDL-41268 fix cron execution in new log manager

11 years agoMDL-43931 add logging unit tests
Petr Škoda [Fri, 31 Jan 2014 05:25:55 +0000 (13:25 +0800)]
MDL-43931 add logging unit tests

11 years agoMDL-39933 logging: Get external dabatabase working.
Ankit Agarwal [Fri, 31 Jan 2014 02:18:07 +0000 (10:18 +0800)]
MDL-39933 logging: Get external dabatabase working.

11 years agoMDL-41269 add separate ip column to standard log table
Petr Škoda [Thu, 30 Jan 2014 08:22:52 +0000 (16:22 +0800)]
MDL-41269 add separate ip column to standard log table

11 years agoMDL-41269 disable all logging during phpunit testing
Petr Škoda [Thu, 30 Jan 2014 08:08:22 +0000 (16:08 +0800)]
MDL-41269 disable all logging during phpunit testing

11 years agoMDL-41269 add standard log life time and add missing lang strings
Petr Škoda [Thu, 30 Jan 2014 07:12:36 +0000 (15:12 +0800)]
MDL-41269 add standard log life time and add missing lang strings

11 years agoMDL-43759 logging: Update stores to remove duplicated code
Ankit Agarwal [Tue, 21 Jan 2014 03:49:34 +0000 (11:49 +0800)]
MDL-43759 logging: Update stores to remove duplicated code

11 years agoMDL-43759 logging: Add helper traits for stores and add support for buffering
Ankit Agarwal [Tue, 21 Jan 2014 03:49:11 +0000 (11:49 +0800)]
MDL-43759 logging: Add helper traits for stores and add support for buffering

11 years agoMDL-37658 logging: convert all standard log fields to legacy log fields
Rajesh Taneja [Wed, 15 Jan 2014 08:56:30 +0000 (16:56 +0800)]
MDL-37658 logging: convert all standard log fields to legacy log fields

11 years agoMDL-41266 logging: Legacy reader should convert passed courseid to course in sql...
Ankit Agarwal [Wed, 15 Jan 2014 07:17:48 +0000 (15:17 +0800)]
MDL-41266 logging: Legacy reader should convert passed courseid to course in sql queries

11 years agoMDL-41266 move reader access control out from manager
Petr Skoda [Wed, 15 Jan 2014 04:02:00 +0000 (12:02 +0800)]
MDL-41266 move reader access control out from manager

We need to let reports decide if they want to use capability to access readers.

11 years agoMDL-37658 logging: fixed bug in legacy logging
Marina Glancy [Tue, 14 Jan 2014 10:14:06 +0000 (18:14 +0800)]
MDL-37658 logging: fixed bug in legacy logging

11 years agoMDL-37658 add new logging API with basic implemenation
Petr Škoda [Mon, 13 Jan 2014 01:08:58 +0000 (09:08 +0800)]
MDL-37658 add new logging API with basic implemenation

11 years agoMDL-44358 simplify CSS processing
Petr Škoda [Thu, 27 Feb 2014 06:35:03 +0000 (14:35 +0800)]
MDL-44358 simplify CSS processing

The affected code areas are not supposed to be used in any add-ons,
the backwards compatibility should not be a concern for us.

11 years agoMDL-25505 Tasks: Fix for scheduled task bug on the last day of the month.
Damyon Wiese [Fri, 28 Feb 2014 05:09:08 +0000 (13:09 +0800)]
MDL-25505 Tasks: Fix for scheduled task bug on the last day of the month.

On the last day of the month, the scheduled task next time calculation was wrapping
to the 0th day of the month (which is not a valid day).

11 years agoweekly release 2.7dev
Damyon Wiese [Fri, 28 Feb 2014 02:02:14 +0000 (10:02 +0800)]
weekly release 2.7dev

11 years agoNOBUG: Fixed file access permissions
Damyon Wiese [Fri, 28 Feb 2014 02:02:13 +0000 (10:02 +0800)]
NOBUG: Fixed file access permissions

11 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Damyon Wiese [Fri, 28 Feb 2014 02:02:04 +0000 (10:02 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

11 years agoMDL-43738 behat: Refactoring the field type guesser
David Monllao [Thu, 27 Feb 2014 08:39:25 +0000 (16:39 +0800)]
MDL-43738 behat: Refactoring the field type guesser

The previous behaviour delegates the responsability
of overwriting the 3 public methods to the child
classes, now the field type or moodleform field is
guessed earlier in the execution flow.

Other changes introduced here:
- Fix wrong moodleform detection when there is a form
  in the page but the field we are dealing with is
  not inside it.
- Updating the last week feature files to these new
  step definitions.
- Some coding style changes.

11 years agoMDL-43738 behat: More info about how to get/set fields
David Monllao [Fri, 31 Jan 2014 10:50:15 +0000 (18:50 +0800)]
MDL-43738 behat: More info about how to get/set fields

11 years agoMDL-43738 behat: Updating features files
David Monllao [Thu, 30 Jan 2014 07:19:21 +0000 (15:19 +0800)]
MDL-43738 behat: Updating features files

The following used steps were replaced by the ones
added in this issue:
- I fill the moodle form with
- I fill in with
- I select from
- I select radio button
- I check
- I uncheck
- the field should match

Also removing test for deprecated steps:
- the ASD checkbox should be checked
- the ASD checkbox should not be checked

11 years agoMDL-43738 behat: Updating steps definitions and deprecating methods
David Monllao [Thu, 30 Jan 2014 06:48:20 +0000 (14:48 +0800)]
MDL-43738 behat: Updating steps definitions and deprecating methods

11 years agoMDL-43738 behat: Normalization and major refactoring of getters and setters
David Monllao [Fri, 24 Jan 2014 05:24:22 +0000 (13:24 +0800)]
MDL-43738 behat: Normalization and major refactoring of getters and setters

Every single step that sets or gets a value from a field
has been updated to follow the same behaviour both when
using it through a single step or through generic steps
like "I fill the moodle form with:", to resume all the
changes:
- Created a behat_form_group to re-guess the field type
  and act appropriately setting and getting it's value
- Normalize all getters and setters to use behat_form_field
  children
- Complete behat_form_checkbox to trigger the appropiate JS
  event needed to perform some JS scripts that are listening
- Refactor MDL-43713 multi-select changes and remove
  the two new steps introduced there as that behaviour can
  be managed from the generic getter
- Added a new step definition to check a capability permission
  as we changed the way radio buttons gets it's value

11 years agoMDL-43738 behat: Functional tests for fields management
David Monllao [Fri, 24 Jan 2014 05:29:31 +0000 (13:29 +0800)]
MDL-43738 behat: Functional tests for fields management

We are cheating with this .feature file as this
is not a behaviour and we are just testing the
framework, but in this case I think that everybody
will agree on the need of doing it, as every browser
behaves differently and minor changes in the getters
and setters can easily end up breaking the behaviours.

All credit goes to Eloy Lafuente (stronk7).

11 years agoMDL-43713 behat: improve multi-select support
Eloy Lafuente (stronk7) [Thu, 16 Jan 2014 01:38:24 +0000 (02:38 +0100)]
MDL-43713 behat: improve multi-select support

This patch implements:

1) Normalization of options. Before the patch options
in a select were being returned as "op1 op2 op3" by selenium
and "op1 op2 op3" by goutte. With the patch, those lists
are always returned like "op1, op2, op3". If real commas are
needed when handling multiple selects they should
be escaped with backslash in feature files.

2) Support for selecting multiple options. Before the patch
only one option was selected and a new selection was cleaning the
previous one. With the patch it's possible to pass "op1, op2" in
these steps:
  - I fill the moodle form with (table)
  - I select "OPTION_STRING" from "SELECT_STRING"

3) Ability to match multiple options in this steps. Before the
patch matching of multiple was really random, now every every
passed option ("opt1, opt2") is individually verified. It applies
to these 2 steps:
  - the "ELEMENT" select box should contain "OPTIONS"
  - the "ELEMENT" select box should not contain "OPTIONS"

4) Two new steps able to verify if a form have some options selected or no:
  - the "ELEMENT" select box should contain "OPTIONS" selected
  - the "ELEMENT" select box should contain "OPTIONS" not selected

5) Change get_value from xpath search to Mink's getValue() that is immediate
(does not need form submission) and works for all browsers but Safari, that
fails because of the extra ->click() issued.

Note all the changes 1-4 only affect to multi-select fields. Single
selects should continue working 100% the same.

The change 5) causes Safari to fail. The problem has been traced down to
the extra ->click() present there. Anyway there are not test cases
requiring that "immediate" evaluation right now. Only the special feature
file attached verifies it.

11 years agoMDL-25505 behat: Adding a time gap between two cron runs.
David Monllao [Thu, 27 Feb 2014 06:29:20 +0000 (14:29 +0800)]
MDL-25505 behat: Adding a time gap between two cron runs.

According to \core\task\scheduled_task::get_next_scheduled_time() we
wait 61 seconds, as the next scheduled time is in the next minute.

11 years agoMDL-44286 behat: Fixing JS code error
David Monllao [Thu, 27 Feb 2014 03:47:06 +0000 (11:47 +0800)]
MDL-44286 behat: Fixing JS code error

PhantomJS console shows a JS error regarding
an undefined Syn var; as explained by Andrew
Nicols this is caused by Syn supported features
checker, the change in moodle-behat-extension
solves this problem.

11 years agoMerge branch 'MDL-38903-master' of git://github.com/phalacee/moodle
Damyon Wiese [Thu, 27 Feb 2014 05:18:27 +0000 (13:18 +0800)]
Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle

11 years agoMDL-38903 Filepicker: Improving Bootstrap button support
Jason Fowler [Thu, 27 Feb 2014 02:51:03 +0000 (10:51 +0800)]
MDL-38903 Filepicker: Improving Bootstrap button support

11 years agoMDL-44139 Remove adminwarning from base css.
Damyon Wiese [Wed, 26 Feb 2014 07:30:44 +0000 (15:30 +0800)]
MDL-44139 Remove adminwarning from base css.

Grr. Afterburner has nothing defined for adminwarning before, so this
makes it look all red and splotchy.

11 years agoMDL-44139 Themes: Add default definitions for .adminwarning and .adminerror to base
Damyon Wiese [Wed, 26 Feb 2014 06:07:07 +0000 (14:07 +0800)]
MDL-44139 Themes: Add default definitions for .adminwarning and .adminerror to base

These were missing from base, but were defined in standard and canvas, which 99% of old themes
inherit from. But they are critical for the proper display of moodle and should at least have a
default definition in all themes (e.g. afterburner only inherits from base).

This background color has been tested for contrast accessibility.

11 years agoMDL-25499: Centralise management of all types of cron tasks
Damyon Wiese [Tue, 25 Feb 2014 01:47:39 +0000 (09:47 +0800)]
MDL-25499: Centralise management of all types of cron tasks

Centralise management of all types of cron tasks with registration, scheduling,
parallel task conflicts(blocking) and running once off tasks, all using an
administration screen.

This is a combination of several issues:

MDL-25502: Added "black magic" task allocator for cron
MDL-25503: Add step to cron to run all scheduled tasks
MDL-25504 cron: Refactor to use scheduler
MDL-25505: Add an admin interface to schedule tasks via cron.
MDL-25507: Add support for adhoc tasks.

11 years agoMDL-42842 Change availability fields to date_time_selector
Daniel Neis Araujo [Tue, 12 Nov 2013 16:42:23 +0000 (14:42 -0200)]
MDL-42842 Change availability fields to date_time_selector

11 years agoMDL-43723 Blocks drag and drop: Javascript cleanup
Damyon Wiese [Tue, 25 Feb 2014 09:01:45 +0000 (17:01 +0800)]
MDL-43723 Blocks drag and drop: Javascript cleanup

Declare the selector instead of repeating it several times.

11 years agoMerge branch 'MDL-43723-master-nomerge2' of git://github.com/mouneyrac/moodle
Damyon Wiese [Tue, 25 Feb 2014 08:43:56 +0000 (16:43 +0800)]
Merge branch 'MDL-43723-master-nomerge2' of git://github.com/mouneyrac/moodle

11 years agoMerge branch 'MDL-43882_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 25 Feb 2014 07:33:58 +0000 (15:33 +0800)]
Merge branch 'MDL-43882_master' of git://github.com/dmonllao/moodle

11 years agoMerge branch '44255-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 25 Feb 2014 06:14:31 +0000 (14:14 +0800)]
Merge branch '44255-27' of git://github.com/samhemelryk/moodle

Conflicts:
user/profile.php

11 years agoMerge branch 'wip-mdl-40919' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 25 Feb 2014 04:44:35 +0000 (12:44 +0800)]
Merge branch 'wip-mdl-40919' of https://github.com/rajeshtaneja/moodle

11 years agoMDL-18633 admin: Added capability string for user:viewlastip
Rajesh Taneja [Tue, 25 Feb 2014 04:02:07 +0000 (12:02 +0800)]
MDL-18633 admin: Added capability string for user:viewlastip

11 years agoMDL-43882 lib: Adding info about the new performance metric
David Monllao [Tue, 25 Feb 2014 03:30:38 +0000 (11:30 +0800)]
MDL-43882 lib: Adding info about the new performance metric

The performance metric was introduced in MDL-43758.

11 years agoMerge branch '44185-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 25 Feb 2014 03:22:24 +0000 (11:22 +0800)]
Merge branch '44185-27' of git://github.com/samhemelryk/moodle

11 years agoMerge branch '44315-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 25 Feb 2014 03:09:53 +0000 (11:09 +0800)]
Merge branch '44315-27' of git://github.com/samhemelryk/moodle

11 years agoMDL-40619 mod_quiz: Remove commented non-js behat scenario
Damyon Wiese [Tue, 25 Feb 2014 03:02:03 +0000 (11:02 +0800)]
MDL-40619 mod_quiz: Remove commented non-js behat scenario

11 years agoMerge branch 'wip-MDL-40619-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 25 Feb 2014 02:53:09 +0000 (10:53 +0800)]
Merge branch 'wip-MDL-40619-master' of git://github.com/marinaglancy/moodle

11 years agoMerge branch 'MDL-40916_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 25 Feb 2014 02:47:20 +0000 (10:47 +0800)]
Merge branch 'MDL-40916_master' of https://github.com/markn86/moodle

11 years agoMerge branch 'w08_MDL-42889_m27_vir' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 25 Feb 2014 02:32:44 +0000 (10:32 +0800)]
Merge branch 'w08_MDL-42889_m27_vir' of https://github.com/skodak/moodle

11 years agoMerge branch 'MDL-43405_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 25 Feb 2014 02:30:35 +0000 (10:30 +0800)]
Merge branch 'MDL-43405_master' of https://github.com/markn86/moodle

11 years agoMerge branch 'MDL-42923' of git://github.com/jleyva/moodle
Damyon Wiese [Tue, 25 Feb 2014 02:26:22 +0000 (10:26 +0800)]
Merge branch 'MDL-42923' of git://github.com/jleyva/moodle

Conflicts:
version.php

11 years agoMerge branch 'MDL-43478-master-v4' of git://github.com/jamiepratt/moodle
Dan Poltawski [Tue, 25 Feb 2014 01:27:35 +0000 (09:27 +0800)]
Merge branch 'MDL-43478-master-v4' of git://github.com/jamiepratt/moodle

11 years agoMDL-38903: Version bump for lang strings
Damyon Wiese [Tue, 25 Feb 2014 01:25:43 +0000 (09:25 +0800)]
MDL-38903: Version bump for lang strings

11 years agoMerge branch 'MDL-38903-master' of git://github.com/phalacee/moodle
Damyon Wiese [Tue, 25 Feb 2014 01:21:30 +0000 (09:21 +0800)]
Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

11 years agoMDL-38903 File picker: making upload form with more semantic HTML
Jason Fowler [Fri, 17 Jan 2014 03:23:59 +0000 (11:23 +0800)]
MDL-38903 File picker: making upload form with more semantic HTML

11 years agoMerge branch 'MDL-43837_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 24 Feb 2014 08:56:05 +0000 (16:56 +0800)]
Merge branch 'MDL-43837_master' of git://github.com/dmonllao/moodle

11 years agoMDL-44101 Javascript: Apply widget-focusonclose to some core dialogues
Andrew Nicols [Tue, 11 Feb 2014 10:01:36 +0000 (18:01 +0800)]
MDL-44101 Javascript: Apply widget-focusonclose to some core dialogues

Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js

11 years agoMDL-44101 Javascript: Introduce a module to focus after widget close
Andrew Nicols [Tue, 11 Feb 2014 10:01:29 +0000 (18:01 +0800)]
MDL-44101 Javascript: Introduce a module to focus after widget close

This module supports focusing on a specified Node, or attempting to
determine the Node which caused the displayed the Widget to return focus to
that location.

11 years agoMerge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:42:32 +0000 (15:42 +0800)]
Merge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle

11 years agoMerge branch 'MDL-44111_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:39:32 +0000 (15:39 +0800)]
Merge branch 'MDL-44111_master' of git://github.com/dmonllao/moodle

11 years agoMerge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:28:51 +0000 (15:28 +0800)]
Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css