Commit graph

67570 commits

Author SHA1 Message Date
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
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
Dan Poltawski
b48eaedeb9 Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle 2014-04-07 17:28:34 +08:00
Damyon Wiese
22cee6a7ea MDL-43856 MathJax: Remove unused build folder.
This is left over from when I renamed the module.
2014-04-07 17:21:43 +08:00
Dan Poltawski
4834cfdf59 Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle 2014-04-07 16:58:46 +08:00
Ankit Agarwal
1722da6a7b MDL-43682 Some imporvements to loglive report 2014-04-07 16:58:45 +08:00
Ankit Agarwal
1ac341e23f 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
2014-04-07 16:58:44 +08:00
Ankit Agarwal
5991eb80cd 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
2014-04-07 16:58:44 +08:00
Damyon Wiese
e017c50bcf Merge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle 2014-04-07 16:57:06 +08:00
Marina Glancy
a8e4b006ce Merge branch 'MDL-44761-master' of git://github.com/andrewnicols/moodle 2014-04-07 16:16:32 +08:00
Marina Glancy
502ff062a0 Merge branch 'wip-mdl-44873' of git://github.com/rajeshtaneja/moodle 2014-04-07 16:16:25 +08:00
Dan Poltawski
e2e1622946 Merge branch 'MDL-44927-master' of git://github.com/damyon/moodle 2014-04-07 16:10:14 +08:00
Dan Poltawski
5e8be14cb9 Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-07 16:01:56 +08:00
Damyon Wiese
353473aa59 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.
2014-04-07 15:57:59 +08:00
Damyon Wiese
1c9785d52d MDL-43856 MathJAX: Small correction to readme_moodle.txt
The CDN urls have been moved to settings.php.
2014-04-07 15:44:06 +08:00
Damyon Wiese
2aa476bbc8 Merge branch 'wip-MDL-43021-master' of git://github.com/marinaglancy/moodle 2014-04-07 15:19:11 +08:00
Nobelium
e3528983f2 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
2014-04-07 14:07:48 +08:00
Dan Poltawski
0678d09213 Merge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle 2014-04-07 13:10:41 +08:00
Andrew Davis
abdfe18ddb MDL-44454 core_user: removed unused code from user/index.php 2014-04-07 12:02:15 +08:00
Sam Hemelryk
54c4398a6d Merge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle 2014-04-07 15:43:12 +12:00
Sam Hemelryk
b017ff6da6 Merge branch 'MDL-44748-master' of git://github.com/damyon/moodle 2014-04-07 15:18:52 +12:00
Damyon Wiese
c61269af86 Merge branch '44967-27' of git://github.com/samhemelryk/moodle 2014-04-07 11:15:51 +08:00
Sam Hemelryk
5ee0b3ceaf 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
2014-04-07 15:02:40 +12:00
Dan Poltawski
d69f584fe6 Merge branch 'wip-mdl-44945' of https://github.com/rajeshtaneja/moodle 2014-04-07 10:53:56 +08:00
Jetha Chan
3a6511a530 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.
2014-04-07 10:44:29 +08:00
Dan Poltawski
1c9e738b54 Merge branch '41551-27' of git://github.com/samhemelryk/moodle 2014-04-07 10:28:27 +08:00
Sam Hemelryk
b96bee62b1 Merge branch 'MDL-44940' of git://github.com/timhunt/moodle 2014-04-07 13:16:12 +12:00
Sam Hemelryk
2429e44011 Merge branch 'MDL-44846-master' of git://github.com/damyon/moodle 2014-04-07 08:48:50 +12:00
Sam Hemelryk
70aab3836a Merge branch 'MDL-44949-master' of git://github.com/damyon/moodle 2014-04-07 08:15:34 +12:00
Petr Škoda
1a361486a9 MDL-44882 always set maintenance mode on non-cached admin pages
This should resolve all issues with themes during upgrades.
2014-04-06 20:37:55 +08:00
Sam Hemelryk
566889aaa8 MDL-42317 output: reviewed standard/base layouts and converted where a better option was available 2014-04-06 15:57:32 +12:00
Sam Hemelryk
20015af513 MDL-42317 theme_bootstrapbase: more responsive styling for forms with blocks pre && post 2014-04-06 15:40:09 +12:00
Sam Hemelryk
04f1a90d05 MDL-41551 theme_base: improved custom block region handling for base 2014-04-06 15:17:48 +12:00