moodle.git
7 years agoMerge branch 'MDL-39740_grade_item_idnumber_fix' of git://github.com/ashleyholman...
Dan Poltawski [Wed, 9 Apr 2014 03:12:55 +0000 (11:12 +0800)]
Merge branch 'MDL-39740_grade_item_idnumber_fix' of git://github.com/ashleyholman/moodle

7 years agoMerge branch '44944-27' of git://github.com/samhemelryk/moodle
Marina Glancy [Wed, 9 Apr 2014 01:48:41 +0000 (09:48 +0800)]
Merge branch '44944-27' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-40908_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)]
Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 8 Apr 2014 22:37:05 +0000 (10:37 +1200)]
Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-44765-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 Apr 2014 22:26:33 +0000 (10:26 +1200)]
Merge branch 'MDL-44765-master' of git://github.com/phalacee/moodle

7 years agoMerge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalys...
Sam Hemelryk [Tue, 8 Apr 2014 22:15:50 +0000 (10:15 +1200)]
Merge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalyst/moodle

7 years agoMDL-39833 format: tidied up API improvement to allow for future backport
Sam Hemelryk [Mon, 7 Apr 2014 22:11:23 +0000 (10:11 +1200)]
MDL-39833 format: tidied up API improvement to allow for future backport

7 years agoMerge branch 'MDL-39833' of https://github.com/shashirepo/moodle
Sam Hemelryk [Tue, 8 Apr 2014 22:09:02 +0000 (10:09 +1200)]
Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle

7 years agoMDL-42195 Bootstrap - put border and vertical-align back in the reset for all images
Damyon Wiese [Tue, 8 Apr 2014 09:02:58 +0000 (17:02 +0800)]
MDL-42195 Bootstrap - put border and vertical-align back in the reset for all images

7 years agoMerge branch 'MDL-44881-master' of git://github.com/phalacee/moodle
Marina Glancy [Tue, 8 Apr 2014 08:55:49 +0000 (16:55 +0800)]
Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-44881 Filepicker: Fix alignment and padding on file-select dialog
Jason Fowler [Thu, 3 Apr 2014 01:00:53 +0000 (09:00 +0800)]
MDL-44881 Filepicker: Fix alignment and padding on file-select dialog

7 years agoMerge branch 'MDL-44131-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 8 Apr 2014 06:18:50 +0000 (14:18 +0800)]
Merge branch 'MDL-44131-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-debug.js
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button.js
lib/editor/atto/plugins/equation/yui/src/button/js/button.js

7 years agoMerge branch 'MDL-42462-Feedback-Fix-for-WCAG-2-0-issue-with-Informational-and-Error...
Dan Poltawski [Tue, 8 Apr 2014 06:11:59 +0000 (14:11 +0800)]
Merge branch 'MDL-42462-Feedback-Fix-for-WCAG-2-0-issue-with-Informational-and-Error-Content-Displayed-in-red' of https://github.com/michael-milette/moodle

7 years agoMDL-44131 atto_equation: Equation library groups are aria toolbars
Frederic Massart [Thu, 3 Apr 2014 07:53:06 +0000 (15:53 +0800)]
MDL-44131 atto_equation: Equation library groups are aria toolbars

7 years agoMerge branch 'wip-MDL-40907-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 8 Apr 2014 06:01:34 +0000 (14:01 +0800)]
Merge branch 'wip-MDL-40907-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-44241-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 8 Apr 2014 05:53:19 +0000 (13:53 +0800)]
Merge branch 'MDL-44241-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-44070 Conditional availability - white space fix
Damyon Wiese [Tue, 8 Apr 2014 05:49:15 +0000 (13:49 +0800)]
MDL-44070 Conditional availability - white space fix

7 years agoMDL-40907 events: additional legacy logging for module update/add events"
Marina Glancy [Tue, 25 Feb 2014 09:26:34 +0000 (17:26 +0800)]
MDL-40907 events: additional legacy logging for module update/add events"

7 years agoMDL-40907 events: view list of resources in course
Marina Glancy [Tue, 25 Feb 2014 09:25:10 +0000 (17:25 +0800)]
MDL-40907 events: view list of resources in course

7 years agoMDL-40907 events: Allow one event write several entries to the legacy log table
Marina Glancy [Thu, 6 Mar 2014 08:51:54 +0000 (16:51 +0800)]
MDL-40907 events: Allow one event write several entries to the legacy log table

7 years agoMerge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle
Damyon Wiese [Tue, 8 Apr 2014 05:30:41 +0000 (13:30 +0800)]
Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle

Conflicts:
theme/bootstrapbase/less/moodle/forms.less
theme/bootstrapbase/style/moodle.css
version.php

7 years agoMerge branch 'MDL-44235-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 8 Apr 2014 04:32:49 +0000 (12:32 +0800)]
Merge branch 'MDL-44235-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'wip-MDL-44340-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 8 Apr 2014 04:16:42 +0000 (12:16 +0800)]
Merge branch 'wip-MDL-44340-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-44784-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 8 Apr 2014 04:12:01 +0000 (12:12 +0800)]
Merge branch 'MDL-44784-master' of git://github.com/FMCorz/moodle

7 years agoMDL-44342 message_airnotifier: Fix shifter warnings in JS
Damyon Wiese [Tue, 8 Apr 2014 04:10:33 +0000 (12:10 +0800)]
MDL-44342 message_airnotifier: Fix shifter warnings in JS

7 years agoMerge branch 'MDL-44806-master' of git://github.com/phalacee/moodle
Dan Poltawski [Tue, 8 Apr 2014 04:07:15 +0000 (12:07 +0800)]
Merge branch 'MDL-44806-master' of git://github.com/phalacee/moodle

7 years agoMerge branch 'MDL-44810-master' of git://github.com/jethac/moodle
Dan Poltawski [Tue, 8 Apr 2014 04:04:41 +0000 (12:04 +0800)]
Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js

7 years agoMDL-43682 report_loglive: commit built yui files
Dan Poltawski [Tue, 8 Apr 2014 04:03:37 +0000 (12:03 +0800)]
MDL-43682 report_loglive: commit built yui files

7 years agoMDL-43682 report_loglive: fixed lint warning in fetchlogs JS
Sam Hemelryk [Tue, 8 Apr 2014 03:41:39 +0000 (15:41 +1200)]
MDL-43682 report_loglive: fixed lint warning in fetchlogs JS

7 years agoMerge branch 'MDL-44868-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 8 Apr 2014 03:37:25 +0000 (11:37 +0800)]
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

7 years agoMerge branch 'MDL-44869-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 8 Apr 2014 03:27:59 +0000 (11:27 +0800)]
Merge branch 'MDL-44869-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle
Marina Glancy [Tue, 8 Apr 2014 03:14:52 +0000 (11:14 +0800)]
Merge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle

7 years agoMerge branch 'MDL-44948' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 8 Apr 2014 03:13:43 +0000 (11:13 +0800)]
Merge branch 'MDL-44948' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-44891-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Tue, 8 Apr 2014 03:13:17 +0000 (11:13 +0800)]
Merge branch 'MDL-44891-master' of git://github.com/sammarshallou/moodle

7 years agoMDL-44342 message_airnotifier: Fix for unit tests.
Damyon Wiese [Tue, 8 Apr 2014 02:55:33 +0000 (10:55 +0800)]
MDL-44342 message_airnotifier: Fix for unit tests.

7 years agoMerge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle
Damyon Wiese [Tue, 8 Apr 2014 02:09:21 +0000 (10:09 +0800)]
Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle

7 years agoMerge branch 'MDL-43975-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 8 Apr 2014 01:46:28 +0000 (13:46 +1200)]
Merge branch 'MDL-43975-master' of https://github.com/sammarshallou/moodle

7 years agoMerge branch 'wip-MDL-18598-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 8 Apr 2014 01:45:07 +0000 (09:45 +0800)]
Merge branch 'wip-MDL-18598-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-44342' of git://github.com/jleyva/moodle
Damyon Wiese [Tue, 8 Apr 2014 01:27:48 +0000 (09:27 +0800)]
Merge branch 'MDL-44342' of git://github.com/jleyva/moodle

7 years agoMerge branch '42317-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 8 Apr 2014 01:22:38 +0000 (09:22 +0800)]
Merge branch '42317-27' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'master_MDL-44938' of git://github.com/danmarsden/moodle
Marina Glancy [Tue, 8 Apr 2014 00:53:58 +0000 (08:53 +0800)]
Merge branch 'master_MDL-44938' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle
Marina Glancy [Tue, 8 Apr 2014 00:53:49 +0000 (08:53 +0800)]
Merge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'MDL-42195-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 8 Apr 2014 00:53:35 +0000 (08:53 +0800)]
Merge branch 'MDL-42195-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-44954' of git://github.com/jleyva/moodle
Marina Glancy [Tue, 8 Apr 2014 00:34:24 +0000 (08:34 +0800)]
Merge branch 'MDL-44954' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-44408' of git://github.com/jleyva/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:44:21 +0000 (11:44 +1200)]
Merge branch 'MDL-44408' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-44912-master-core' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:42:29 +0000 (11:42 +1200)]
Merge branch 'MDL-44912-master-core' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-44933-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:38:13 +0000 (11:38 +1200)]
Merge branch 'MDL-44933-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:35:34 +0000 (11:35 +1200)]
Merge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-36141' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:22:23 +0000 (11:22 +1200)]
Merge branch 'MDL-36141' of https://github.com/merrill-oakland/moodle

7 years agoMerge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 7 Apr 2014 20:59:54 +0000 (08:59 +1200)]
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

7 years agoMDL-43682 report_loglive: fixed whitespace issue
Sam Hemelryk [Mon, 7 Apr 2014 20:51:17 +0000 (08:51 +1200)]
MDL-43682 report_loglive: fixed whitespace issue

7 years agoMerge branch 'MDL-43682-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 7 Apr 2014 20:50:38 +0000 (08:50 +1200)]
Merge branch 'MDL-43682-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-22999 code_grades: Added Behat tests for configurable grade point maximum.
Justin Filip [Mon, 7 Apr 2014 20:00:21 +0000 (16:00 -0400)]
MDL-22999 code_grades: Added Behat tests for configurable grade point maximum.

7 years agoMDL-22999 core_grades: Added ability to configure maximum grade value both globally...
James McQuillan [Mon, 7 Apr 2014 20:00:20 +0000 (16:00 -0400)]
MDL-22999 core_grades: Added ability to configure maximum grade value both globally and for each graded-activity.

7 years agoMDL-44070 Conditional availability enhancements (10): autogenerated
sam marshall [Fri, 21 Mar 2014 12:26:23 +0000 (12:26 +0000)]
MDL-44070 Conditional availability enhancements (10): autogenerated

Includes all the autogenerated files (to make it easier/less worrying
when reviewing and rebasing).

7 years agoMDL-44070 Conditional availability enhancements (9): wider changes
sam marshall [Fri, 21 Mar 2014 11:34:15 +0000 (11:34 +0000)]
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).

7 years agoMDL-44070 Conditional availability enhancements (8): display
sam marshall [Wed, 26 Mar 2014 13:24:58 +0000 (13:24 +0000)]
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.

7 years agoMDL-44070 Conditional availability enhancements (7): forms
sam marshall [Wed, 26 Mar 2014 11:49:44 +0000 (11:49 +0000)]
MDL-44070 Conditional availability enhancements (7): forms

Changes to the module and section editing forms to use the new
fields and JavaScript.

7 years agoMDL-44070 Conditional availability enhancements (6): core changes
sam marshall [Wed, 26 Mar 2014 12:01:52 +0000 (12:01 +0000)]
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.

7 years agoMDL-44070 Conditional availability enhancements (5): deprecate old lib
sam marshall [Tue, 11 Mar 2014 16:42:59 +0000 (16:42 +0000)]
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.

7 years agoMDL-44070 Conditional availability enhancements (4): backup
sam marshall [Thu, 13 Mar 2014 17:59:48 +0000 (17:59 +0000)]
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.

7 years agoMDL-44070 Conditional availability enhancements (3): conditions
sam marshall [Tue, 18 Feb 2014 16:20:54 +0000 (16:20 +0000)]
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

7 years agoMDL-44070 Conditional availability enhancements (2): subsystem, API
sam marshall [Wed, 26 Mar 2014 12:02:30 +0000 (12:02 +0000)]
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

7 years agoMDL-44070 Conditional availability enhancements (1): DB upgrade
sam marshall [Wed, 26 Mar 2014 12:02:03 +0000 (12:02 +0000)]
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.

7 years agoMDL-44760 editor_atto: Make menus consistent with Clean theme
Andrew Nicols [Thu, 27 Mar 2014 04:40:25 +0000 (12:40 +0800)]
MDL-44760 editor_atto: Make menus consistent with Clean theme

7 years agoMDL-44954 messages: Fixed save notifications with the notification flag
Juan Leyva [Fri, 4 Apr 2014 15:53:25 +0000 (17:53 +0200)]
MDL-44954 messages: Fixed save notifications with the notification flag

7 years agoMDL-44342 airnotifier: Add support for shifter in the YUI Module
Juan Leyva [Mon, 7 Apr 2014 09:52:10 +0000 (11:52 +0200)]
MDL-44342 airnotifier: Add support for shifter in the YUI Module

This commit includes also some integrator review related fixes

7 years agoMDL-44342 airnotifier: Include missing defined and required lib in externallib.php
Juan Leyva [Fri, 4 Apr 2014 09:37:39 +0000 (11:37 +0200)]
MDL-44342 airnotifier: Include missing defined and required lib in externallib.php

7 years agoMDL-44342 airnotifier: Add information about the message in the payload.
Juan Leyva [Fri, 4 Apr 2014 09:26:21 +0000 (11:26 +0200)]
MDL-44342 airnotifier: Add information about the message in the payload.

In order to check if is a notification or just a private message

7 years agoMDL-44342 airnotifier: Unit tests for external functions (web services)
Juan Leyva [Thu, 3 Apr 2014 14:01:01 +0000 (16:01 +0200)]
MDL-44342 airnotifier: Unit tests for external functions (web services)

7 years agoMDL-44342 airnotifier: Use system context instead user.
Juan Leyva [Thu, 3 Apr 2014 13:15:47 +0000 (15:15 +0200)]
MDL-44342 airnotifier: Use system context instead user.

Added missing capabilities and language strings

7 years agoMDL-44342 airnotifier: Add support for Android notifications
Juan Leyva [Thu, 3 Apr 2014 13:13:56 +0000 (15:13 +0200)]
MDL-44342 airnotifier: Add support for Android notifications

7 years agoMDL-44342 airnotifier: rest.php should return success information
Juan Leyva [Mon, 24 Mar 2014 14:44:35 +0000 (15:44 +0100)]
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

7 years agoMDL-44342 airnotifier: Added support for the new workflow of registering devices
Juan Leyva [Mon, 24 Mar 2014 10:48:00 +0000 (11:48 +0100)]
MDL-44342 airnotifier: Added support for the new workflow of registering devices

And also for request access keys to Airnotifier

7 years agoMDL-44342 airnotifier: Initial work, first version of the plugin
mouneyrac [Mon, 24 Mar 2014 10:28:08 +0000 (11:28 +0100)]
MDL-44342 airnotifier: Initial work, first version of the plugin

7 years agoMerge branch 'MDL-43856-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 7 Apr 2014 09:28:34 +0000 (17:28 +0800)]
Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle

7 years agoMDL-43856 MathJax: Remove unused build folder.
Damyon Wiese [Mon, 7 Apr 2014 09:21:43 +0000 (17:21 +0800)]
MDL-43856 MathJax: Remove unused build folder.

This is left over from when I renamed the module.

7 years agoMerge branch 'MDL-43856-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 7 Apr 2014 08:58:46 +0000 (16:58 +0800)]
Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle

7 years agoMDL-43682 Some imporvements to loglive report
Ankit Agarwal [Mon, 7 Apr 2014 03:42:16 +0000 (11:42 +0800)]
MDL-43682 Some imporvements to loglive report

7 years agoMDL-43682 log: Fix issues with log report
Ankit Agarwal [Fri, 4 Apr 2014 06:42:42 +0000 (14:42 +0800)]
MDL-43682 log: Fix issues with log report

Following fixes have been made:-
Porfile links where generating errors when there was no courseid present. Fixed the same.
get_readers() method was accessing an undefined property.
popups were used for action and ip address before the whole rewrite, we should maintain the same behaviour.
Fixed string issues.
Pass context to format_string method

7 years agoMDL-43682 loglive: Rewrite loglive to use new logging stores
Ankit Agarwal [Fri, 4 Apr 2014 06:42:19 +0000 (14:42 +0800)]
MDL-43682 loglive: Rewrite loglive to use new logging stores

AMOS BEGIN
 CPY [eventcomponent,report_log],[eventcomponent,report_loglive]
 CPY [eventcontext,report_log],[eventcontext,report_loglive]
 CPY [eventloggedas,report_log],[eventloggedas,report_loglive]
 CPY [eventorigin,report_log],[eventorigin,report_loglive]
 CPY [eventrelatedfullnameuser,report_log],[eventrelatedfullnameuser,report_loglive]
 CPY [nologreaderenabled,report_log],[nologreaderenabled,report_loglive]
 CPY [selectlogreader,report_log],[selectlogreader,report_loglive]
AMOS END

7 years agoMerge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 7 Apr 2014 08:57:06 +0000 (16:57 +0800)]
Merge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-44761-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Mon, 7 Apr 2014 08:16:32 +0000 (16:16 +0800)]
Merge branch 'MDL-44761-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'wip-mdl-44873' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Mon, 7 Apr 2014 08:16:25 +0000 (16:16 +0800)]
Merge branch 'wip-mdl-44873' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-44927-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 7 Apr 2014 08:10:14 +0000 (16:10 +0800)]
Merge branch 'MDL-44927-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-41569-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 7 Apr 2014 08:01:56 +0000 (16:01 +0800)]
Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-44927 Atto: Improve table editing UX
Damyon Wiese [Thu, 3 Apr 2014 06:00:22 +0000 (14:00 +0800)]
MDL-44927 Atto: Improve table editing UX

Hide context menu items that don't apply.
Add "Edit table" menu entry to change the caption / headers.

7 years agoMDL-43856 MathJAX: Small correction to readme_moodle.txt
Damyon Wiese [Mon, 7 Apr 2014 07:44:06 +0000 (15:44 +0800)]
MDL-43856 MathJAX: Small correction to readme_moodle.txt

The CDN urls have been moved to settings.php.

7 years agoMerge branch 'wip-MDL-43021-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 7 Apr 2014 07:19:11 +0000 (15:19 +0800)]
Merge branch 'wip-MDL-43021-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-41476 scorm settings- SCORM1.2 standard mode and CMIString length
Nobelium [Wed, 12 Mar 2014 08:31:03 +0000 (08:31 +0000)]
MDL-41476 scorm settings- SCORM1.2 standard mode and CMIString length

Adding SCORM 1.2 standard mode checkbox in scorm admin panel. By default it will be enabled
(i.e: config name = `scorm12standard`, plugin name = `scorm`, value = `1`)
If `scorm12standard` is `1` CMIString256 is of length 256 and CMIString4096 is of length is 4096
if `scorm12standard` is `0` CMIString256 and CMIString4096 are of length is 64000

7 years agoMerge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 7 Apr 2014 05:10:41 +0000 (13:10 +0800)]
Merge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-44454 core_user: removed unused code from user/index.php
Andrew Davis [Mon, 7 Apr 2014 01:09:12 +0000 (09:09 +0800)]
MDL-44454 core_user: removed unused code from user/index.php

7 years agoMerge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Apr 2014 03:43:12 +0000 (15:43 +1200)]
Merge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-44748-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 7 Apr 2014 03:18:52 +0000 (15:18 +1200)]
Merge branch 'MDL-44748-master' of git://github.com/damyon/moodle

7 years agoMerge branch '44967-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 7 Apr 2014 03:15:51 +0000 (11:15 +0800)]
Merge branch '44967-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-44758-master' of git://github.com/jethac/moodle
Sam Hemelryk [Mon, 7 Apr 2014 03:02:40 +0000 (15:02 +1200)]
Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle

Conflicts:
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js

7 years agoMerge branch 'wip-mdl-44945' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 7 Apr 2014 02:53:56 +0000 (10:53 +0800)]
Merge branch 'wip-mdl-44945' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-44758 editor-atto: prevent table-in-table creation
Jetha Chan [Tue, 1 Apr 2014 04:40:33 +0000 (12:40 +0800)]
MDL-44758 editor-atto: prevent table-in-table creation

Prevent new table creation, displaying table context menu instead when cursor is within caption, when multiple cells are selected, when selection contains both nodes within and outside of the table, and when selection contains nodes from multiple tables.

7 years agoMerge branch '41551-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 7 Apr 2014 02:28:27 +0000 (10:28 +0800)]
Merge branch '41551-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-44940' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 7 Apr 2014 01:16:12 +0000 (13:16 +1200)]
Merge branch 'MDL-44940' of git://github.com/timhunt/moodle