67723 Commits

Author SHA1 Message Date
Sam Hemelryk
2891559fd5 MDL-43682 report_loglive: fixed lint warning in fetchlogs JS 2014-04-08 15:41:54 +12:00
Dan Poltawski
23cc5bbdc0 Merge branch 'MDL-44868-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
2014-04-08 11:37:25 +08:00
Dan Poltawski
95ce54f060 Merge branch 'MDL-44869-master' of git://github.com/FMCorz/moodle 2014-04-08 11:27:59 +08:00
Marina Glancy
39b70b23b7 Merge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle 2014-04-08 11:14:52 +08:00
Marina Glancy
593fc9d8d6 Merge branch 'MDL-44948' of git://github.com/timhunt/moodle 2014-04-08 11:13:43 +08:00
Marina Glancy
aaba0d56e2 Merge branch 'MDL-44891-master' of git://github.com/sammarshallou/moodle 2014-04-08 11:13:17 +08:00
Damyon Wiese
1786388680 MDL-44342 message_airnotifier: Fix for unit tests. 2014-04-08 10:55:33 +08:00
Damyon Wiese
1e16a58525 Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle 2014-04-08 10:09:21 +08:00
Sam Hemelryk
e2a486837f Merge branch 'MDL-43975-master' of https://github.com/sammarshallou/moodle 2014-04-08 13:46:28 +12:00
Dan Poltawski
36e051dab4 Merge branch 'wip-MDL-18598-master' of git://github.com/marinaglancy/moodle 2014-04-08 09:45:07 +08:00
Damyon Wiese
9f7e101fc7 Merge branch 'MDL-44342' of git://github.com/jleyva/moodle 2014-04-08 09:27:48 +08:00
Dan Poltawski
3a047312b6 Merge branch '42317-27' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-08 09:22:38 +08:00
Marina Glancy
72c0f16889 Merge branch 'master_MDL-44938' of git://github.com/danmarsden/moodle 2014-04-08 08:53:58 +08:00
Marina Glancy
08cf1d787e Merge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle 2014-04-08 08:53:49 +08:00
Marina Glancy
0f4fc5a878 Merge branch 'MDL-42195-master' of git://github.com/damyon/moodle 2014-04-08 08:53:35 +08:00
Marina Glancy
efa6ee356b Merge branch 'MDL-44954' of git://github.com/jleyva/moodle 2014-04-08 08:34:24 +08:00
Sam Hemelryk
17c37406b5 Merge branch 'MDL-44408' of git://github.com/jleyva/moodle 2014-04-08 11:44:21 +12:00
Sam Hemelryk
3fb4d8fa88 Merge branch 'MDL-44912-master-core' of git://github.com/FMCorz/moodle 2014-04-08 11:42:29 +12:00
Sam Hemelryk
2e718bc4bd Merge branch 'MDL-44933-master' of git://github.com/FMCorz/moodle 2014-04-08 11:38:13 +12:00
Sam Hemelryk
c1229656db Merge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle 2014-04-08 11:35:34 +12:00
Sam Hemelryk
652f9a5ef8 Merge branch 'MDL-36141' of https://github.com/merrill-oakland/moodle 2014-04-08 11:22:23 +12:00
AMOS bot
10f68d9d26 Automatically generated installer lang files 2014-04-07 22:39:43 +00:00
Sam Hemelryk
87f2c808f7 Merge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
	lib/editor/atto/plugins/table/yui/src/button/js/button.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
2014-04-08 08:59:54 +12:00
Sam Hemelryk
06d94411de MDL-43682 report_loglive: fixed whitespace issue 2014-04-08 08:51:17 +12:00
Sam Hemelryk
78add102b9 Merge branch 'MDL-43682-master' of git://github.com/ankitagarwal/moodle 2014-04-08 08:50:38 +12:00
Justin Filip
4400033004 MDL-22999 code_grades: Added Behat tests for configurable grade point maximum. 2014-04-07 16:02:37 -04:00
James McQuillan
597662335d MDL-22999 core_grades: Added ability to configure maximum grade value both globally and for each graded-activity. 2014-04-07 16:02:37 -04:00
sam marshall
46d70f0535 MDL-44070 Conditional availability enhancements (10): autogenerated
Includes all the autogenerated files (to make it easier/less worrying
when reviewing and rebasing).
2014-04-07 20:12:03 +01:00
sam marshall
8270f0d0bd MDL-44070 Conditional availability enhancements (9): wider changes
Changes to arbitrary areas of code that are necessary after the new
API (mostly to replace deprecated function calls).
2014-04-07 20:11:59 +01:00
sam marshall
00c832d7a1 MDL-44070 Conditional availability enhancements (8): display
Includes theme and renderer changes required for the new feature.
There are two parts: style required for the display as part of the
course page (when showing the list of conditions for an activity),
and style required for the settings form.

This change supports both the bootstrapbase theme (which was the
main theme used during development) and the old base theme.
2014-04-07 20:11:56 +01:00
sam marshall
400c0fd229 MDL-44070 Conditional availability enhancements (7): forms
Changes to the module and section editing forms to use the new
fields and JavaScript.
2014-04-07 20:11:52 +01:00
sam marshall
8d1f33e122 MDL-44070 Conditional availability enhancements (6): core changes
Changes core code to use new API instead of the old one when
checking user access to activities and sections.

Includes changes to other libraries that are necessary after
adding the availability system and removing old conditional tables
etc.
2014-04-07 20:11:48 +01:00
sam marshall
6a601097a0 MDL-44070 Conditional availability enhancements (5): deprecate old lib
The old conditionlib.php, which is replaced by the new availability
API, has been deprecated.

* Code which uses the key functions (is_available,
  get_full_information) should still work. These now show
  deprecated warnings and then pass through to equivalents in the
  new API.
* I have created new unit tests for these functions.
* The old language file has been removed (reused strings already
  moved with AMOS).
* Most other functions throw exceptions because it was impossible
  (due to fundamental API differences) or difficult to reimplement.
* I don't really expect that non-core code (outside unit tests) will
  have used any of the other functions.
2014-04-07 20:11:45 +01:00
sam marshall
38674ef91a MDL-44070 Conditional availability enhancements (4): backup
Implements backup and restore for the new conditional availability
data. This includes:

* Backup and restore of new field.
* Restore updates IDs in conditions, as required.
* Restore converts availability data from legacy (Moodle 2.6) backups.
* Unit tests for all this.
2014-04-07 20:11:41 +01:00
sam marshall
e01efa2cfd MDL-44070 Conditional availability enhancements (3): conditions
Includes all the conditions that were in previous Moodle versions:

* Date
* Grade
* Completion (of another activity)
* User profile field

Also includes conditions that are used to reimplement
groupmembersonly:

* Grouping
* Group

For each condition, the component plus unit tests are included.

PLEASE NOTE: The code to actually check each condition is reused
from previous Moodle versions and has not been modified except to
pass codechecker. This is intentional, to reduce the risk of the
change and maximise the chance that behaviour is preserved. Some
of this code might not be very good and might need updating but
that can happen separately.

AMOS BEGIN
 CPY [contains,core_condition],[op_contains,availability_profile]
 CPY [doesnotcontain,core_condition],[op_doesnotcontain,availability_profile]
 CPY [endswith,core_condition],[op_endswith,availability_profile]
 CPY [isempty,core_condition],[op_isempty,availability_profile]
 CPY [isequalto,core_condition],[op_isequalto,availability_profile]
 CPY [isnotempty,core_condition],[op_isnotempty,availability_profile]
 CPY [startswith,core_condition],[op_startswith,availability_profile]
 CPY [completion_fail,core_condition],[option_fail,availability_completion]
 CPY [completion_pass,core_condition],[option_pass,availability_completion]
 CPY [completion_complete,core_condition],[option_complete,availability_completion]
 CPY [completion_incomplete,core_condition],[option_incomplete,availability_completion]
AMOS END
2014-04-07 20:11:37 +01:00
sam marshall
d3db4b037c MDL-44070 Conditional availability enhancements (2): subsystem, API
This commit defines the new /availability root folder, with
/availability/classes, /availability/tests, and
/availability/condition where the condition plugins will live.
Condition plugin prefix is availability_, e.g. availability_date.

Rationale for this organisation:

1. I was originally going to put this in /lib/availability but
   it has been pointed out that putting even more junk in lib
   is probably bad.
2. 'availability' and 'condition' are the two names used in code
   to refer to this system ($CFG->enableavailability).
3. The prefix has to be short enough to allow database tables
   (although in practice I assume that condition plugins will not
   normally contain database tables).

The new API includes a Boolean tree structure that controls the
availability of an item.

AMOS BEGIN
 CPY [availabilityconditions,core_condition],[restrictaccess,core_availability]
 CPY [enableavailability,core_condition],[enableavailability,core_availability]
 CPY [configenableavailability,core_condition],[enableavailability_desc,core_availability]
AMOS END
2014-04-07 20:11:33 +01:00
sam marshall
8e97006ad0 MDL-44070 Conditional availability enhancements (1): DB upgrade
Converts existing data to new structure in database as part of
upgrade, including a progress bar.

Deletes the database tables and fields that were used by the old
system and are no longer needed.
2014-04-07 18:27:43 +01:00
Andrew Nicols
ee616cff45 MDL-44760 editor_atto: Make menus consistent with Clean theme 2014-04-07 20:43:57 +08:00
James Pratt
1d75d9fe70 MDL-44981 quiz statistics report : Differentiating '0' and no response
in numeric questions.
2014-04-07 19:13:04 +07:00
James Pratt
bec7719c3b MDL-44980 quiz statistics report : break down by variants failing
when there has only been one variant seen.
2014-04-07 18:44:48 +07:00
Juan Leyva
5e12b369af MDL-44954 messages: Fixed save notifications with the notification flag 2014-04-07 12:19:52 +02:00
Juan Leyva
d62c3c6ea8 MDL-44342 airnotifier: Add support for shifter in the YUI Module
This commit includes also some integrator review related fixes
2014-04-07 12:14:09 +02:00
Juan Leyva
438c7020c2 MDL-44342 airnotifier: Include missing defined and required lib in externallib.php 2014-04-07 12:14:01 +02:00
Juan Leyva
b310aeecd4 MDL-44342 airnotifier: Add information about the message in the payload.
In order to check if is a notification or just a private message
2014-04-07 12:13:53 +02:00
Juan Leyva
1bcb18e7f9 MDL-44342 airnotifier: Unit tests for external functions (web services) 2014-04-07 12:13:53 +02:00
Juan Leyva
324facf457 MDL-44342 airnotifier: Use system context instead user.
Added missing capabilities and language strings
2014-04-07 12:13:43 +02:00
Juan Leyva
98fb4d413b MDL-44342 airnotifier: Add support for Android notifications 2014-04-07 12:13:43 +02:00
Juan Leyva
a8f111aaf2 MDL-44342 airnotifier: rest.php should return success information
Javascript should handle properly errors, also, the eye and spinner
should be synchronized with the remote operation
2014-04-07 12:13:35 +02:00
Juan Leyva
3570f5e287 MDL-44342 airnotifier: Added support for the new workflow of registering devices
And also for request access keys to Airnotifier
2014-04-07 12:13:24 +02:00
mouneyrac
08ca1a5bfd MDL-44342 airnotifier: Initial work, first version of the plugin 2014-04-07 12:13:07 +02:00