Dan Poltawski [Mon, 2 Sep 2013 08:21:48 +0000 (16:21 +0800)]
Merge branch 'MDL-41399_master-remove_test' of git://github.com/dmonllao/moodle
Rajesh Taneja [Mon, 19 Aug 2013 09:03:39 +0000 (17:03 +0800)]
MDL-39961 Events: Replace Legacy events - User
This change includes:
* Added user_updated event, replacing old event
* Added user_created event, replacing old event
* Added user_deleted event, replacing old event
* Added user_loggedout event, replacing old event
* Added user_enrolment_created event, replacing old event
* Added user_enrolment_deleted event, replacing old event
* Added user_enrolment_updated event, replacing old event
David Monllao [Mon, 2 Sep 2013 07:55:18 +0000 (15:55 +0800)]
MDL-41399 tool_generator: Removing unit test
Removing dodgy database reset in the
middle of a test as sequences reset
is not allowed.
Damyon Wiese [Mon, 2 Sep 2013 07:26:26 +0000 (15:26 +0800)]
Merge branch 'wip-MDL-41231-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 2 Sep 2013 07:23:05 +0000 (15:23 +0800)]
Merge branch 'MDL-35925-master' of git://github.com/phalacee/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
Damyon Wiese [Mon, 2 Sep 2013 07:02:12 +0000 (15:02 +0800)]
Merge branch 'MDL-41259_master' of https://github.com/nitzo/moodle
Damyon Wiese [Mon, 2 Sep 2013 06:56:49 +0000 (14:56 +0800)]
Merge branch 'MDL-41516-m' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 2 Sep 2013 06:10:28 +0000 (14:10 +0800)]
Merge branch 'MDL-36093-master' of github.com:StudiUM/moodle
Dan Poltawski [Mon, 2 Sep 2013 05:58:53 +0000 (13:58 +0800)]
MDL-40676 tests: fix null byte test.
Yuliya Bozhko [Mon, 2 Sep 2013 05:41:09 +0000 (13:41 +0800)]
MDL-40712 badges: Display recipient information
Yuliya Bozhko [Mon, 2 Sep 2013 05:37:15 +0000 (13:37 +0800)]
MDL-40924 badges: Add caching to external badges
Petr Škoda [Wed, 24 Jul 2013 21:06:53 +0000 (23:06 +0200)]
MDL-40676 ignore null bytes
Dan Poltawski [Mon, 2 Sep 2013 03:50:38 +0000 (11:50 +0800)]
Merge branch 'MDL-41175_M26' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Mon, 2 Sep 2013 03:44:51 +0000 (11:44 +0800)]
Merge branch 'MDL-41328-master' of git://github.com/damyon/moodle
Andrew Nicols [Fri, 30 Aug 2013 10:10:27 +0000 (11:10 +0100)]
MDL-41328 Editor: Work around another iOS issue with TinyMCE
We apply this only on touchend and not touchstart or touchmove. The
location is not guaranteed until the end of the gesture, and there's no
need to keep applying focus on every move.
Andrew Nicols [Sun, 1 Sep 2013 22:52:58 +0000 (23:52 +0100)]
MDL-41516 Themes: Ensure that blocks are set up early
Blocks can require JavaScript which must be set up early in the page
lifecycle.
In order to do so, we should ensure that content is created in the standard
head setup before any other output is created so that any subsequent use of
block instances are no longer the first such use when they may already be
too late in the lifecycle.
Sam Hemelryk [Mon, 26 Aug 2013 22:43:55 +0000 (10:43 +1200)]
MDL-41432 output: several action_menu improvements
The following improvements have been made:
* Items no longer MUST have an icon, it can now be null instead.
* You can specify the icon displayed to toggle the dropdown menu.
* You can add text in front of the aforementioned icon.
David Monllao [Mon, 26 Aug 2013 09:29:16 +0000 (17:29 +0800)]
MDL-41399 tool_generator: Unit test for fixeddataset
David Monllao [Fri, 23 Aug 2013 06:32:17 +0000 (14:32 +0800)]
MDL-41399 tool_generator: Adding fixeddataset option
Damyon Wiese [Fri, 30 Aug 2013 01:37:04 +0000 (09:37 +0800)]
weekly release 2.6dev
Damyon Wiese [Fri, 30 Aug 2013 01:29:10 +0000 (09:29 +0800)]
ie9 svg compatibility fixes
Sam Hemelryk [Thu, 29 Aug 2013 08:34:45 +0000 (20:34 +1200)]
MDL-40931 theme_bootstrapbase: fixed missing ! when including html5shiv
Damyon Wiese [Thu, 29 Aug 2013 07:35:19 +0000 (15:35 +0800)]
Revert "MDL-39871 Find a solution to handling RTL switching in CSS"
This reverts commit
2e68b1254f4613c679bc7338a097d63f09b4089e.
This reverts commit
5b2ed8b5ff3160e85c6b7135739334f648535501.
Damyon Wiese [Thu, 29 Aug 2013 03:35:42 +0000 (11:35 +0800)]
Revert "MDL-40752 - Login panel should be placed on the right side, in RTL mode (theme/clean, bootstrap)"
This reverts commit
48e5db7428dfaaca81e326688b29fdc02dbf1566.
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Thu, 29 Aug 2013 02:15:47 +0000 (10:15 +0800)]
Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Wed, 28 Aug 2013 21:08:47 +0000 (09:08 +1200)]
MDL-41213 theme_bootstrapbase: fixed license filemanager overflow
Nadav Kavalerchik [Wed, 28 Aug 2013 18:15:49 +0000 (21:15 +0300)]
MDL-39682 Forms, File Picker, Themes: Fix alignment of Form's Labels and Input elements in RTL mode (theme/clean)
Jean-Philippe Gaudreau [Wed, 21 Aug 2013 20:00:10 +0000 (16:00 -0400)]
MDL-36093 grade export: Fix HTML special characters printed litteraly.
Damyon Wiese [Wed, 28 Aug 2013 09:06:07 +0000 (17:06 +0800)]
Merge branch 'w35_MDL-41245_m26_pluginuninstall' of https://github.com/skodak/moodle
Damyon Wiese [Wed, 28 Aug 2013 08:29:19 +0000 (16:29 +0800)]
MDL-41249 assign: Fix incorrect gradingform restore step
The mapping in the previous patch was wrong - mod assign uses
the area "submissions" but the itemid is the grade->id not the submission->id.
Jason Fowler [Tue, 30 Jul 2013 00:57:44 +0000 (08:57 +0800)]
MDL-35925 File picker - Improving accessibility by adding focus and removing unnecessary alt attribs
Petr Škoda [Wed, 28 Aug 2013 06:00:19 +0000 (08:00 +0200)]
MDL-41245 fix redirect and missing string when cannot automatically delete uninstalled plugin
Dan Poltawski [Wed, 28 Aug 2013 02:00:46 +0000 (10:00 +0800)]
Merge branch 'MDL-41098-master-fix1' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 27 Aug 2013 19:00:12 +0000 (21:00 +0200)]
Merge branch 'MDL-41387_master' of https://github.com/markn86/moodle
Nitzan Bar [Thu, 15 Aug 2013 13:27:01 +0000 (16:27 +0300)]
MDL-41259 when duplicate course shortname exists an exception is thrown and sync is aborted
Eloy Lafuente (stronk7) [Tue, 27 Aug 2013 17:45:24 +0000 (19:45 +0200)]
Merge branch 'm26_MDL-41410_Move_Comment_To_Appropriate_Place' of https://github.com/scara/moodle
Damyon Wiese [Tue, 27 Aug 2013 13:36:21 +0000 (21:36 +0800)]
MDL-41098 atto: Enable atto text editor on upgrade
TinyMCE is still the default.
Damyon Wiese [Tue, 27 Aug 2013 13:09:32 +0000 (21:09 +0800)]
MDL-41098 atto: Fix min-height on firefox.
Dan Poltawski [Tue, 27 Aug 2013 10:09:34 +0000 (18:09 +0800)]
Merge branch 'MDL-41366' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 27 Aug 2013 08:31:36 +0000 (16:31 +0800)]
Merge branch 'MDL-41364' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 27 Aug 2013 08:06:32 +0000 (16:06 +0800)]
Merge branch 'wip-mdl-41415' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 27 Aug 2013 07:55:14 +0000 (15:55 +0800)]
Merge branch 'wip-MDL-41127-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 27 Aug 2013 07:51:19 +0000 (15:51 +0800)]
Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 27 Aug 2013 07:47:52 +0000 (15:47 +0800)]
Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Tue, 27 Aug 2013 07:29:49 +0000 (15:29 +0800)]
Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
Conflicts:
version.php
Ankit Agarwal [Tue, 27 Aug 2013 02:27:08 +0000 (10:27 +0800)]
MDL-40052 events: Code style fixes
Ankit Agarwal [Tue, 20 Aug 2013 03:14:17 +0000 (11:14 +0800)]
MDL-40052 events: Add get_url() api to various report content_viewed classes
Ankit Agarwal [Tue, 20 Aug 2013 02:57:18 +0000 (10:57 +0800)]
MDL-40052 events: Add content view events for reports
Includes:
* Add content view events for report_log
* Add content view events for report_loglive
* Add content view events for report_outline
* Add content view events for report_participation
* Add content view events for report_stats
Ankit Agarwal [Tue, 6 Aug 2013 10:36:52 +0000 (18:36 +0800)]
MDL-40052 events: Add a base class for content view
Damyon Wiese [Tue, 27 Aug 2013 07:09:21 +0000 (15:09 +0800)]
Merge branch 'MDL-41401-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 27 Aug 2013 07:06:38 +0000 (15:06 +0800)]
Merge branch 'MDL-40732' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 27 Aug 2013 06:10:04 +0000 (14:10 +0800)]
MDL-41081 navbar: Cleanup comments in prepend()
Damyon Wiese [Tue, 27 Aug 2013 06:11:03 +0000 (14:11 +0800)]
Merge branch 'wip-MDL-41081-m26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 27 Aug 2013 06:06:54 +0000 (14:06 +0800)]
Merge branch 'MDL-41321_master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 27 Aug 2013 05:51:40 +0000 (13:51 +0800)]
Merge branch 'MDL-38765' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 27 Aug 2013 05:47:39 +0000 (13:47 +0800)]
Merge branch 'wip-MDL-41181-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 27 Aug 2013 05:36:00 +0000 (15:36 +1000)]
MDL-41181 function moveto_module does not modify properties of object
instead it returns the new value for module visibility
Damyon Wiese [Tue, 27 Aug 2013 05:36:38 +0000 (13:36 +0800)]
Merge branch 'wip-MDL-41307-master' of git://github.com/abgreeve/moodle
Marina Glancy [Wed, 14 Aug 2013 04:55:36 +0000 (14:55 +1000)]
MDL-41181 No need to reset modinfo cache after moveto_module()
it is already reset inside the function
Damyon Wiese [Tue, 27 Aug 2013 05:26:47 +0000 (13:26 +0800)]
MDL-31093 Scorm course format: Remove behat tests
The scorm course format has been removed so we don't need to test it anymore.
Damyon Wiese [Tue, 27 Aug 2013 05:16:55 +0000 (13:16 +0800)]
Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle
Conflicts:
lib/db/upgrade.php
version.php
Damyon Wiese [Tue, 27 Aug 2013 04:46:23 +0000 (12:46 +0800)]
Merge branch 'MDL-40877-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 27 Aug 2013 04:27:47 +0000 (12:27 +0800)]
Merge branch 'MDL-40447_master' of https://github.com/nadavkav/moodle
Damyon Wiese [Tue, 27 Aug 2013 04:23:16 +0000 (12:23 +0800)]
Merge branch 'MDL-40752_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 27 Aug 2013 03:54:28 +0000 (11:54 +0800)]
Merge branch 'MDL-37211_master' of https://github.com/nadavkav/moodle
Rajesh Taneja [Tue, 27 Aug 2013 03:35:32 +0000 (11:35 +0800)]
MDL-41415 Events: get_string should not use new
Rajesh Taneja [Mon, 26 Aug 2013 03:33:25 +0000 (11:33 +0800)]
MDL-41415 Events: get_legacy_logdata is protected
Damyon Wiese [Tue, 27 Aug 2013 03:11:11 +0000 (11:11 +0800)]
MDL-39871 themes RTL: Get rtlblockmanipulations from any parent
Nadav Kavalerchik [Sun, 25 Aug 2013 22:06:55 +0000 (01:06 +0300)]
MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array)
Dan Poltawski [Tue, 27 Aug 2013 03:03:35 +0000 (11:03 +0800)]
Merge branch 'wip-MDL-41222-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 27 Aug 2013 02:57:09 +0000 (10:57 +0800)]
Merge branch 'MDL-41098-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 27 Aug 2013 02:55:51 +0000 (10:55 +0800)]
Merge branch 'wip-MDL-41419-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 27 Aug 2013 02:36:00 +0000 (10:36 +0800)]
MDL-41098 atto: Fix for dialogue ignoring centered option.
Damyon Wiese [Mon, 26 Aug 2013 14:05:05 +0000 (22:05 +0800)]
MDL-41098 atto: Force some styles on the editor
Bootstrap is overriding random styles on the contenteditable div like:
line-height, font-size and color. Silly - force them to be the same as the
textarea we are derived from.
Adrian Greeve [Mon, 26 Aug 2013 09:02:33 +0000 (17:02 +0800)]
MDL-41419 - unit tests: Fixed up sporadic test failures in externallib_test.php.
Also added much needed comments to the unit test.
Damyon Wiese [Tue, 27 Aug 2013 02:16:26 +0000 (10:16 +0800)]
MDL-40321 theme_bootstrapbase: Combine reset into existing overrides file
Damyon Wiese [Tue, 27 Aug 2013 02:07:07 +0000 (10:07 +0800)]
Merge branch 'wip-MDL-40321_master' of git://github.com/gjb2048/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Fri, 9 Aug 2013 06:32:28 +0000 (14:32 +0800)]
MDL-41098 Atto Text editor: Add new text editor to core
This is an alternative to the TinyMCE text editor that is based on HTML5
content editable regions.
It has been designed to "gel" with Moodle and uses YUI for javascript,
Moodle standard dialogs and standard moodle buttons. It has also been designed
to work well on mobile devices and can collapse down to a narrow column if required.
Imported from the plugins database here:
https://moodle.org/plugins/view.php?plugin=editor_contenteditable
Original git repository here:
https://github.com/damyon/contenteditable
Dan Poltawski [Mon, 26 Aug 2013 09:50:08 +0000 (17:50 +0800)]
Merge branch 'MDL-41291-master' of git://github.com/mr-russ/moodle
Dan Poltawski [Mon, 26 Aug 2013 09:47:05 +0000 (17:47 +0800)]
Merge branch 'MDL-38505' of git://github.com/jmvedrine/moodle
Damyon Wiese [Mon, 26 Aug 2013 08:18:37 +0000 (16:18 +0800)]
MDL-41213 filepicker: Version bump for css changes
Damyon Wiese [Mon, 26 Aug 2013 08:00:35 +0000 (16:00 +0800)]
Merge branch '41213-26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 26 Aug 2013 07:09:33 +0000 (15:09 +0800)]
Merge branch 'MDL-40055-master' of git://github.com/FMCorz/moodle
Frederic Massart [Mon, 19 Aug 2013 08:17:49 +0000 (16:17 +0800)]
MDL-39959: Replace Legacy events - Groups
This combines the following changes:
* Event for group member added
* Event for group member removed
* Event for group created
* Event for grouping created
* Event for group updated
* Event for grouping updated
* Event for group deleted
* Event for grouping deleted
* Adding tests for deleting functions
* Bulk remove of members uses low-level API
The reason for this is that a bulk event has no value from a logging
perspective as it is not granular. So now, the API is a bit slower,
but the information the events contain makes sense, beside this is
not (and should not be) used very often.
The reason why the events_trigger_legacy() is kept is because we
cannot create a new event for this, as we don't encourage developers
to created bulk events, for the reasons mentioned above.
I removed the call that gets the user record from the function
groups_remove_member() as it was not required and only appeared
to check if the user existed. It appears to be safe not to do
this check as nothing would fail down the line.
* Bulk unassign of groupings uses low-level API
As the previous commit, we keep the legacy event for now as it would
be wrong to create a new event to replace it.
Also, the code has been changed to call the low-level API to unassign
groups from groupins, even though at the moment there are no
events for that function.
* Bulk deletion of groups uses low-level API
Again, we keep the legacy event because replacing it would force
us to create a new event that does not make sense. See MDL-41312.
* Bulk deleting of groupings uses low-level API
* Asserting legacy event name in unit tests
* Minor SQL query and code improvements
Dan Poltawski [Mon, 26 Aug 2013 06:55:54 +0000 (14:55 +0800)]
Merge branch 'MDL-35930' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 26 Aug 2013 06:33:06 +0000 (14:33 +0800)]
Merge branch '40249-26' of git://github.com/samhemelryk/moodle
Rossiani Wijaya [Mon, 26 Aug 2013 06:30:35 +0000 (14:30 +0800)]
MDL-35930 filepicker filemanaer: make announcement on page change when selecting view files options
Dan Poltawski [Mon, 26 Aug 2013 06:25:20 +0000 (14:25 +0800)]
Merge branch 'MDL-36126_master' of https://github.com/markn86/moodle
Frederic Massart [Mon, 26 Aug 2013 06:21:34 +0000 (14:21 +0800)]
MDL-40055 mod_assign: Wrong namespace when throwing exception
Frederic Massart [Wed, 21 Aug 2013 06:28:38 +0000 (14:28 +0800)]
MDL-40055 mod_assign: Setting level according to new event constants
Frederic Massart [Mon, 12 Aug 2013 09:33:07 +0000 (17:33 +0800)]
MDL-40055 mod_assign: get_name() uses get_string() not lang_string
Frederic Massart [Fri, 9 Aug 2013 07:53:55 +0000 (15:53 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'grade submission'
Frederic Massart [Tue, 6 Aug 2013 08:12:48 +0000 (16:12 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'unlock submission'
Frederic Massart [Tue, 6 Aug 2013 07:53:29 +0000 (15:53 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'submit'
Frederic Massart [Tue, 6 Aug 2013 07:44:50 +0000 (15:44 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'submission statement accepted'
Frederic Massart [Tue, 6 Aug 2013 07:14:58 +0000 (15:14 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'submissioncopied'
Frederic Massart [Tue, 6 Aug 2013 04:41:09 +0000 (12:41 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'set marking workflow state'
Frederic Massart [Tue, 6 Aug 2013 04:38:00 +0000 (12:38 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'set marking allocation'
Frederic Massart [Tue, 6 Aug 2013 03:29:59 +0000 (11:29 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'revert submission to draft'
Frederic Massart [Mon, 5 Aug 2013 10:52:31 +0000 (18:52 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'reveal identities'