Commit Graph

24767 Commits

Author SHA1 Message Date
Jetha Chan efbcbd5e46 MDL-45040 editor-atto: selection reverts erroneously
Fixed an issue where selections reverted on toolbar button press when the last selection was made by dragging outside of Atto.
2014-04-10 18:06:47 +08:00
Juan Leyva 6acfacfa9a MDL-44342 airnotifier: Added new functions to the Mobile service 2014-04-10 17:34:03 +08:00
Dan Poltawski e5d3f6ea26 Merge branch 'MDL-44868-master-fixup' of git://github.com/FMCorz/moodle
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2014-04-10 14:51:42 +08:00
Frederic Massart 5e543b4f76 MDL-44868 editor_atto: Remember the last focused button in the toolbar 2014-04-10 14:22:10 +08:00
Damyon Wiese 92810c07f7 MDL-44927 Atto: Fix bad merge of MDL-44760 (missing menu entry) 2014-04-10 13:26:03 +08:00
Sam Hemelryk b3a72c7f0d MDL-44354 page: fixed ignored property when fetching a renderer 2014-04-10 15:15:05 +12:00
Rajesh Taneja 92a34f2865 MDL-44979 behat: no need to purge all cache again 2014-04-10 11:00:40 +08:00
Sam Hemelryk 8abf605ee1 Merge branch 'MDL-44760-master-2' of https://github.com/andrewnicols/moodle 2014-04-10 09:26:07 +12:00
David Monllao af4830a257 MDL-44619 behat: Converting MDLQA-8
In a standard forum, students can start discussions
add replies and attach files to their posts.
2014-04-09 19:34:11 +07:00
David Monllao 9bc60e016b MDL-44619 behat: filemanager field manager
Enough to allow attachments use in multi-field steps.
2014-04-09 19:03:26 +07:00
David Monllao 020cf9aeef MDL-44619 behat: Helper to init contexts outside behat 2014-04-09 15:12:09 +07:00
Andrew Nicols c63f90539a MDL-44760 editor_atto: Address issues with focus when closing menus
Safari fires it's events in a slightly different order for the focusoutside
event which causes the focusAfterHide to be called *after* we change focus.

As a result, we must keep track of the menus which are currently open and
remove their focusAfterHide.
2014-04-09 15:26:34 +08:00
Andrew Nicols 9b2fc5741e MDL-44844 core: Fix custom menu navigation
Atto introduced a rule to hide all Nodes with the yui3-menu-hidden class
but this rule is too general and applies to non-atto content too.

As a result, when loading the menu and during the XY calculation, the
native Element.getBoundingClientRect() function was returning a bounding
box size of 0 because the Node was not visible and the node was being
hidden from view when it was later made visible.
2014-04-09 14:50:02 +08:00
Marina Glancy 039d204abd MDL-44070 availability: corrected SQL to be mysql-compatible 2014-04-09 14:41:12 +08:00
Dan Poltawski 28c247a735 MDL-44507 filemanger: fix coding style 2014-04-09 12:10:30 +08:00
Dan Poltawski 9eeacad9b8 Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-09 11:52:33 +08:00
Damyon Wiese 48dc9f0175 MDL-44927 Atto: Table editor typo that prevents creation of new tables. 2014-04-09 11:31:26 +08:00
Dan Poltawski 020af1058d Merge branch 'MDL-39740_grade_item_idnumber_fix' of git://github.com/ashleyholman/moodle 2014-04-09 11:12:55 +08:00
Sam Hemelryk e97b942223 Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle 2014-04-09 11:26:33 +12:00
Sam Hemelryk 6a90bc5e05 Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle 2014-04-09 10:37:05 +12:00
Sam Hemelryk b983a5d869 Merge branch 'MDL-44765-master' of git://github.com/phalacee/moodle 2014-04-09 10:26:33 +12:00
Damyon Wiese 0610d2ca92 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
2014-04-08 14:18:50 +08:00
Frederic Massart 050159dc9f MDL-44131 atto_equation: Equation library groups are aria toolbars 2014-04-08 14:08:54 +08:00
Damyon Wiese 48395a9cdb Merge branch 'wip-MDL-40907-master' of git://github.com/marinaglancy/moodle 2014-04-08 14:01:34 +08:00
Dan Poltawski 052d51b15f Merge branch 'MDL-44241-master' of git://github.com/andrewnicols/moodle 2014-04-08 13:53:19 +08:00
Marina Glancy 158379e173 MDL-40907 events: additional legacy logging for module update/add events" 2014-04-08 13:45:13 +08:00
Marina Glancy 957944dca8 MDL-40907 events: view list of resources in course 2014-04-08 13:45:09 +08:00
Marina Glancy c3ba899abd MDL-40907 events: Allow one event write several entries to the legacy log table 2014-04-08 13:44:57 +08:00
Damyon Wiese 515fe565f6 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
2014-04-08 13:30:41 +08:00
Damyon Wiese 594a5c8c02 Merge branch 'MDL-44235-master' of git://github.com/FMCorz/moodle 2014-04-08 12:32:49 +08:00
Dan Poltawski 822b055c61 Merge branch 'MDL-44784-master' of git://github.com/FMCorz/moodle 2014-04-08 12:12:01 +08:00
Dan Poltawski d0a3cec564 Merge branch 'MDL-44806-master' of git://github.com/phalacee/moodle 2014-04-08 12:07:15 +08:00
Dan Poltawski 9a59ebaa6c 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
2014-04-08 12:04:41 +08: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 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 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
Damyon Wiese 9f7e101fc7 Merge branch 'MDL-44342' of git://github.com/jleyva/moodle 2014-04-08 09:27:48 +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 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 652f9a5ef8 Merge branch 'MDL-36141' of https://github.com/merrill-oakland/moodle 2014-04-08 11:22:23 +12: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
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 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 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