moodle.git
7 years agoMerge branch 'MDL-42091-master' of git://github.com/phalacee/moodle
Damyon Wiese [Thu, 10 Oct 2013 06:04:47 +0000 (14:04 +0800)]
Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle

7 years agoMDL-42091 Atto - fixing on click indication
Jason Fowler [Thu, 10 Oct 2013 05:47:10 +0000 (13:47 +0800)]
MDL-42091 Atto - fixing on click indication

7 years agoMDL-41838 Backup: Fix undefined variable
Damyon Wiese [Thu, 10 Oct 2013 04:05:49 +0000 (12:05 +0800)]
MDL-41838 Backup: Fix undefined variable

Nice spotting Ankit!

7 years agoMDL-42039 Backup: Fix whitespace
Damyon Wiese [Thu, 10 Oct 2013 03:25:51 +0000 (11:25 +0800)]
MDL-42039 Backup: Fix whitespace

7 years agoMerge branch 'MDL-42039-master' of git://github.com/sammarshallou/moodle.git
Damyon Wiese [Thu, 10 Oct 2013 03:11:12 +0000 (11:11 +0800)]
Merge branch 'MDL-42039-master' of git://github.com/sammarshallou/moodle.git

7 years agoMerge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Thu, 10 Oct 2013 03:06:40 +0000 (16:06 +1300)]
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle

7 years agoMDL-42039 Restore: Add progress tracking while creating question files
sam marshall [Thu, 3 Oct 2013 16:50:47 +0000 (17:50 +0100)]
MDL-42039 Restore: Add progress tracking while creating question files

If a backup contains a large number of questions, the
create_question_files function can take a very long time. This
change adds progress reporting during that function.

7 years agoMDL-42039 Restore: Add progress tracking while creating users
sam marshall [Tue, 1 Oct 2013 17:01:31 +0000 (18:01 +0100)]
MDL-42039 Restore: Add progress tracking while creating users

When restoring a backup that contains a large number of users
to a different server where those users don't already exist,
creating users can take a significant time. This change adds
progress reporting so that it doesn't time out and shows
activity in the user interface while doing the creation.

7 years agoMDL-42039 Restore: Add progress tracking in restore controller load
sam marshall [Tue, 1 Oct 2013 12:46:28 +0000 (13:46 +0100)]
MDL-42039 Restore: Add progress tracking in restore controller load

In the case of a very large backup with many activities, simply loading
the restore controller (specifically, building the plan) can take a long
time and cause timeouts. This change adds progress reporting while the
restore controller is being loaded.

(This also reduces the time between first going to the page, and the
progress bar appearing, making a slightly better user experience.)

Conflicts:

backup/restore.php

7 years agoMDL-42039 Restore: Avoid unnecessary archive file copy at start
sam marshall [Tue, 1 Oct 2013 12:14:04 +0000 (13:14 +0100)]
MDL-42039 Restore: Avoid unnecessary archive file copy at start

Change the start of restore process so that the archive file can
be passed as a pathnamehash pointing to the Moodle file object,
rather than only as a filename in the temporary directory. This
avoids making an unnecessary copy of the archive file, which can
take a long time (and potentially cause a timeout) in the case
of multi-gigabyte backups.

7 years agoMDL-42039 Restore: Add progress reporting to directory deletion
sam marshall [Mon, 30 Sep 2013 12:06:42 +0000 (13:06 +0100)]
MDL-42039 Restore: Add progress reporting to directory deletion

Deleting directories at the end of backup can take a long time if
there are many directories (potentially up to 65536 file
directories). This change reports progress while deleting
directories to avoid timeout.

7 years agoMDL-42039 Restore: Add progress reporting between files in resource
sam marshall [Mon, 30 Sep 2013 10:31:21 +0000 (11:31 +0100)]
MDL-42039 Restore: Add progress reporting between files in resource

When a resource contains a very large number of (presumably small)
files, we should display progress between each file so that it
doesn't time out.

7 years agoMDL-41940 files Additional behat cleanup
Eric Merrill [Thu, 10 Oct 2013 02:56:29 +0000 (22:56 -0400)]
MDL-41940 files Additional behat cleanup

Fixing components and Given/When/Then styling.

7 years agoMDL-42039 Restore: Prevent adding too many form fields at once
sam marshall [Fri, 27 Sep 2013 17:16:21 +0000 (18:16 +0100)]
MDL-42039 Restore: Prevent adding too many form fields at once

This change relates to the Moodle forms used to select activities
in the restore process.

If you add too many form fields at once, it takes a very long time
during which we can't report progress. But adding fields in smaller
groups takes longer overall, so it's a tough balance. This change
splits the adds into groups of 1,000, reporting progress between each.

7 years agoMerge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Thu, 10 Oct 2013 02:49:11 +0000 (10:49 +0800)]
Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle

Conflicts:
lib/upgrade.txt

7 years agoMerge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle
Dan Poltawski [Thu, 10 Oct 2013 02:31:44 +0000 (10:31 +0800)]
Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-37153_master' of https://github.com/pauln/moodle
Marina Glancy [Thu, 10 Oct 2013 01:52:28 +0000 (12:52 +1100)]
Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle

7 years agoMerge branch 'wip-mdl-41744' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Thu, 10 Oct 2013 01:40:02 +0000 (14:40 +1300)]
Merge branch 'wip-mdl-41744' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Thu, 10 Oct 2013 01:31:33 +0000 (09:31 +0800)]
Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle

Conflicts:
backup/backup.php
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-42091-master' of git://github.com/phalacee/moodle
Damyon Wiese [Thu, 10 Oct 2013 01:11:25 +0000 (09:11 +0800)]
Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle

7 years agoMDL-42091 atto - fixing on hover and active states of buttons
Jason Fowler [Thu, 3 Oct 2013 06:34:22 +0000 (14:34 +0800)]
MDL-42091 atto - fixing on hover and active states of buttons

7 years agoMerge branch 'wip-mdl-38155' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Thu, 10 Oct 2013 00:23:06 +0000 (11:23 +1100)]
Merge branch 'wip-mdl-38155' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'wip-MDL-42020-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 10 Oct 2013 00:18:28 +0000 (08:18 +0800)]
Merge branch 'wip-MDL-42020-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Thu, 10 Oct 2013 00:12:35 +0000 (11:12 +1100)]
Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle

7 years agoMDL-42020 course: performance improvement in course listings
Marina Glancy [Fri, 27 Sep 2013 05:49:24 +0000 (15:49 +1000)]
MDL-42020 course: performance improvement in course listings

- better performance when get_course_count() OR search_course_count() are called by themselves
- better performance in displaying course contacts

7 years agoMerge branch '42057-26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 9 Oct 2013 23:20:18 +0000 (07:20 +0800)]
Merge branch '42057-26' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-41993-master-fix1' of git://github.com/damyon/moodle
Marina Glancy [Wed, 9 Oct 2013 22:36:30 +0000 (09:36 +1100)]
Merge branch 'MDL-41993-master-fix1' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Wed, 9 Oct 2013 19:37:03 +0000 (08:37 +1300)]
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle

7 years agoMerge branch 'MDL-32188' of git://github.com/timhunt/moodle
Sam Hemelryk [Wed, 9 Oct 2013 19:34:11 +0000 (08:34 +1300)]
Merge branch 'MDL-32188' of git://github.com/timhunt/moodle

7 years agoMDL-41940 files Fixes for behat tests
Eric Merrill [Wed, 9 Oct 2013 11:45:01 +0000 (07:45 -0400)]
MDL-41940 files Fixes for behat tests

Commented out second test pending MDL-42013 visibiliy checking.

7 years agoMerge branch 'w41_MDL-42054_m26_phpmailertesting_i' of https://github.com/skodak...
Dan Poltawski [Wed, 9 Oct 2013 10:16:56 +0000 (18:16 +0800)]
Merge branch 'w41_MDL-42054_m26_phpmailertesting_i' of https://github.com/skodak/moodle

7 years agoMDL-42054 fix incorrect email redirection in unit tests
Petr Škoda [Sun, 29 Sep 2013 21:28:50 +0000 (23:28 +0200)]
MDL-42054 fix incorrect email redirection in unit tests

7 years agoMerge branch 'wip-mdl-42222' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 9 Oct 2013 09:23:44 +0000 (17:23 +0800)]
Merge branch 'wip-mdl-42222' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-40493-master-fix1' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 9 Oct 2013 09:01:10 +0000 (17:01 +0800)]
Merge branch 'MDL-40493-master-fix1' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-39776-master' of git://github.com/phalacee/moodle
Dan Poltawski [Wed, 9 Oct 2013 08:54:02 +0000 (16:54 +0800)]
Merge branch 'MDL-39776-master' of git://github.com/phalacee/moodle

7 years agoMDL-42222 Assignment: Added type check before checking mimetype
Rajesh Taneja [Wed, 9 Oct 2013 08:37:01 +0000 (16:37 +0800)]
MDL-42222 Assignment: Added type check before checking mimetype

Online submission type pass string in files, so added check
to see if file is of type stored_file then check mimetype

7 years agoMDL-40493 Question: Explain why setAdminUser is needed for tests
Damyon Wiese [Wed, 9 Oct 2013 08:53:21 +0000 (16:53 +0800)]
MDL-40493 Question: Explain why setAdminUser is needed for tests

7 years agoMerge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara...
Dan Poltawski [Wed, 9 Oct 2013 08:46:56 +0000 (16:46 +0800)]
Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle

Conflicts:
lib/db/upgrade.php
version.php

7 years agoMerge branch 'MDL-41986-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 9 Oct 2013 08:28:53 +0000 (16:28 +0800)]
Merge branch 'MDL-41986-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-41985-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 9 Oct 2013 08:27:50 +0000 (16:27 +0800)]
Merge branch 'MDL-41985-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-32188 fix type in question/engine/upgrade.txt
Tim Hunt [Wed, 9 Oct 2013 08:14:24 +0000 (09:14 +0100)]
MDL-32188 fix type in question/engine/upgrade.txt

7 years agoMerge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle
Damyon Wiese [Wed, 9 Oct 2013 06:42:23 +0000 (14:42 +0800)]
Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-41659_master' of https://github.com/totara/openbadges
Damyon Wiese [Wed, 9 Oct 2013 05:30:40 +0000 (13:30 +0800)]
Merge branch 'MDL-41659_master' of https://github.com/totara/openbadges

7 years agoMerge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 9 Oct 2013 04:46:14 +0000 (12:46 +0800)]
Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'wip-MDL-40844-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 9 Oct 2013 04:09:10 +0000 (12:09 +0800)]
Merge branch 'wip-MDL-40844-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 9 Oct 2013 04:03:54 +0000 (12:03 +0800)]
Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 9 Oct 2013 03:48:14 +0000 (11:48 +0800)]
Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle

7 years agoMDL-39776 Javascript - enable formautosubmit from a select box on android
Jason Fowler [Tue, 24 Sep 2013 06:55:40 +0000 (14:55 +0800)]
MDL-39776 Javascript - enable formautosubmit from a select box on android

7 years agoMerge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Wed, 9 Oct 2013 03:25:22 +0000 (16:25 +1300)]
Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-40046 events: Use correct variable for page instance id
Ankit Agarwal [Wed, 9 Oct 2013 03:20:32 +0000 (11:20 +0800)]
MDL-40046 events: Use correct variable for page instance id

7 years agoMerge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 9 Oct 2013 03:16:34 +0000 (11:16 +0800)]
Merge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle

7 years agoMDL-41993 Atto: Always clean/update the textarea when the content is changed
Damyon Wiese [Wed, 9 Oct 2013 03:08:06 +0000 (11:08 +0800)]
MDL-41993 Atto: Always clean/update the textarea when the content is changed

7 years agoMerge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Wed, 9 Oct 2013 02:57:30 +0000 (15:57 +1300)]
Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php

7 years agoMDL-37153 - assign: Obey grade display settings in submission status
Paul Nicholls [Mon, 9 Sep 2013 02:37:53 +0000 (14:37 +1200)]
MDL-37153 - assign: Obey grade display settings in submission status

The assignment submission status screen was ignoring the grade item's
display setting, showing scores even if it's set to display letters only.

7 years agoMerge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 9 Oct 2013 02:54:24 +0000 (10:54 +0800)]
Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'mdl41908-master' of https://github.com/tlock/moodle
Dan Poltawski [Wed, 9 Oct 2013 02:27:07 +0000 (10:27 +0800)]
Merge branch 'mdl41908-master' of https://github.com/tlock/moodle

7 years agoMerge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle
Damyon Wiese [Wed, 9 Oct 2013 01:39:09 +0000 (09:39 +0800)]
Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle

7 years agoMerge branch 'MDL-42026-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 23:48:45 +0000 (01:48 +0200)]
Merge branch 'MDL-42026-master' of git://github.com/damyon/moodle

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

7 years agoMerge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Tue, 8 Oct 2013 23:41:36 +0000 (12:41 +1300)]
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle

7 years agoMerge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 23:29:17 +0000 (01:29 +0200)]
Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle

7 years agoMerge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnar...
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 23:26:52 +0000 (01:26 +0200)]
Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnarfel/moodle

7 years agoMDL-40493 question: set real $USER before testing question walktrough
Petr Škoda [Tue, 8 Oct 2013 21:21:34 +0000 (23:21 +0200)]
MDL-40493 question: set real $USER before testing question walktrough

7 years agoMDL-41792 fix calendar test typos
Petr Škoda [Tue, 8 Oct 2013 21:08:27 +0000 (23:08 +0200)]
MDL-41792 fix calendar test typos

7 years agoMerge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 8 Oct 2013 20:23:53 +0000 (09:23 +1300)]
Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-41956_master' of https://github.com/totara/openbadges
Sam Hemelryk [Tue, 8 Oct 2013 19:54:46 +0000 (08:54 +1300)]
Merge branch 'MDL-41956_master' of https://github.com/totara/openbadges

7 years agoMDL-16073 add test for connection to external database for authentication and enrolments
Petr Škoda [Mon, 30 Sep 2013 20:39:21 +0000 (22:39 +0200)]
MDL-16073 add test for connection to external database for authentication and enrolments

7 years agoMerge branch 'MDL-42069' of https://github.com/appalachianstate/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 19:25:46 +0000 (21:25 +0200)]
Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle

7 years agoMerge branch 'wip-MDL-42141-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 19:23:56 +0000 (21:23 +0200)]
Merge branch 'wip-MDL-42141-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-29663 forum: Replace constant FORUM_TRACKING_ON with FORUM_TRACKING_FORCED
Eric Merrill [Tue, 1 Oct 2013 18:55:12 +0000 (14:55 -0400)]
MDL-29663 forum: Replace constant FORUM_TRACKING_ON with FORUM_TRACKING_FORCED

Commit for MDL-29663 that renames the FORUM_TRACKING_ON constant
to FORUM_TRACKING_FORCED to allow easier and more consistant reading.

FORUM_TRACKING_ON retained but marked depreciated.

7 years agoMDL-41838 Backup/restore: Support .tar.gz format for .mbz (2 of 2)
sam marshall [Tue, 24 Sep 2013 17:14:09 +0000 (18:14 +0100)]
MDL-41838 Backup/restore: Support .tar.gz format for .mbz (2 of 2)

The new experimental setting enabletgzbackups allows backups to be
created so that the internal format for .mbz files is .tar.gz.

Restore transparently supports .mbz files with either internal
formats (.zip or .tar.gz).

The .tar.gz format has the following benefits for backup:
- Supports larger files (no limit on total size, 8GB on single file
  vs. 4GB limit on total size)
- Compresses text better, resulting in smaller .mbz files.
- Reports progress regularly during compression of single files,
  reducing the chance of timeouts during backups that include a
  very large file.

Time performance may also be improved although I haven't done a
direct comparison.

7 years agoMDL-41838 Files: Implement .tar.gz packer (1 of 2)
sam marshall [Wed, 18 Sep 2013 16:58:27 +0000 (17:58 +0100)]
MDL-41838 Files: Implement .tar.gz packer (1 of 2)

A new packer for .tar.gz files (MIME type application/x-gzip) has been
implemented, including unit tests.

This packer is intended for use during backup/restore only and is not
otherwise exposed in the user interface at present. However, it is
supposed to follow the (ancient) POSIX .tar standard; files created
with this packer will open in GNU tar.

There are restrictions in support corresponding to the POSIX standard:

- Non-ASCII filenames are not supported.
- Very long file/path names are not supported.
- Individual files within the .tar may not be more than 8GB.

Some of these limitations might need to be addressed in future changes
if the packer were to be used in areas other than backup/restore.

7 years agoMDL-29663 forum: Option to allow Forced for read tracking.
Eric Merrill [Thu, 26 Sep 2013 14:47:46 +0000 (10:47 -0400)]
MDL-29663 forum: Option to allow Forced for read tracking.

Converts the use of Read Tracking On to Forced. Adds new admin setting
forum_allowforcedreadtracking. If set, Forced will be available when
adding or editing forums. In this state the forced forum overrides the
user preference of off.

With forum_allowforcedreadtracking not set (default) behavior is the
same as now, except forums previously set in the On state are treated
as Optional.

The side effect of forum_allowforcedreadtracking being on, is that users
cannot speed up the loading of course pages with lots of forums by
setting their personal forum read tracking option to off.

7 years agoMDL-38196 Backup/restore: Display log if non-empty
sam marshall [Tue, 10 Sep 2013 12:25:04 +0000 (13:25 +0100)]
MDL-38196 Backup/restore: Display log if non-empty

When doing a backup or restore operation with the normal user interface,
if there is anything in the backup/restore log, it will now be displayed
at the end of the process below the Continue button.

If you have developer debugging enabled, it sets the display level to
LOG_DEBUG and there will always be content in the log. Otherwise, it
uses LOG_INFO which generally means the log is empty, and nothing
displays (no visible change for users).

7 years agoMerge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 08:53:03 +0000 (10:53 +0200)]
Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-40493-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 8 Oct 2013 08:42:17 +0000 (16:42 +0800)]
Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php

7 years agoMerge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 8 Oct 2013 08:19:25 +0000 (16:19 +0800)]
Merge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-41792_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 8 Oct 2013 08:03:46 +0000 (16:03 +0800)]
Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle

7 years agoMDL-42199 fix course revision test
Petr Škoda [Tue, 8 Oct 2013 07:57:09 +0000 (09:57 +0200)]
MDL-42199 fix course revision test

7 years agoMerge branch 'MDL-41722-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 8 Oct 2013 07:19:09 +0000 (15:19 +0800)]
Merge branch 'MDL-41722-master' of git://github.com/sammarshallou/moodle

7 years agoMDL-40053 events: Replace add_to_log() with new events in core_notes
Ankit Agarwal [Wed, 2 Oct 2013 07:45:55 +0000 (15:45 +0800)]
MDL-40053 events: Replace add_to_log() with new events in core_notes

7 years agoMDL-40053 events: Write unit tests for note events
Ankit Agarwal [Thu, 3 Oct 2013 03:11:11 +0000 (11:11 +0800)]
MDL-40053 events: Write unit tests for note events

7 years agoMDL-40053 events: write events for core_notes
Ankit Agarwal [Wed, 2 Oct 2013 08:47:49 +0000 (16:47 +0800)]
MDL-40053 events: write events for core_notes

Following events were added in this commit :-
core\event\note_created
core\event\note_deleted
core\event\note_updated
core\event\notes_viewed

7 years agoMDL-40053 events: Generator for core_notes
Ankit Agarwal [Wed, 2 Oct 2013 08:19:41 +0000 (16:19 +0800)]
MDL-40053 events: Generator for core_notes

7 years agoMerge branch 'MDL-41520-master-mod_lti-completion-view' of github.com:Trii/moodle
Damyon Wiese [Tue, 8 Oct 2013 06:43:14 +0000 (14:43 +0800)]
Merge branch 'MDL-41520-master-mod_lti-completion-view' of github.com:Trii/moodle

7 years agoMerge branch 'MDL-40060-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 8 Oct 2013 06:33:27 +0000 (14:33 +0800)]
Merge branch 'MDL-40060-master' of git://github.com/FMCorz/moodle

7 years agoMDL-40060 mod_book: Replace add_to_log with events
Frederic Massart [Tue, 1 Oct 2013 05:48:35 +0000 (13:48 +0800)]
MDL-40060 mod_book: Replace add_to_log with events

7 years agoMerge branch 'MDL-32570-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 8 Oct 2013 05:47:49 +0000 (13:47 +0800)]
Merge branch 'MDL-32570-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-42131-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 8 Oct 2013 05:33:25 +0000 (13:33 +0800)]
Merge branch 'MDL-42131-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-42150-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 8 Oct 2013 05:25:12 +0000 (13:25 +0800)]
Merge branch 'MDL-42150-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-38655' of git://github.com/aolley/moodle
Dan Poltawski [Tue, 8 Oct 2013 05:21:30 +0000 (13:21 +0800)]
Merge branch 'MDL-38655' of git://github.com/aolley/moodle

7 years agoMerge branch 'MDL-42122' of git://github.com/aolley/moodle
Damyon Wiese [Tue, 8 Oct 2013 04:48:10 +0000 (12:48 +0800)]
Merge branch 'MDL-42122' of git://github.com/aolley/moodle

7 years agoMerge branch 'MDL-40962-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 8 Oct 2013 04:45:43 +0000 (12:45 +0800)]
Merge branch 'MDL-40962-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 8 Oct 2013 03:04:05 +0000 (16:04 +1300)]
Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-23692 login: Revert change to files copyright
Damyon Wiese [Tue, 8 Oct 2013 02:31:56 +0000 (10:31 +0800)]
MDL-23692 login: Revert change to files copyright

7 years agoMerge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle
Damyon Wiese [Tue, 8 Oct 2013 02:30:57 +0000 (10:30 +0800)]
Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php

7 years agoMerge branch 'MDL-32188' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 8 Oct 2013 01:43:36 +0000 (14:43 +1300)]
Merge branch 'MDL-32188' of git://github.com/timhunt/moodle

Conflicts:
lib/db/upgrade.php

7 years agoMDL-41993 Atto: Strip yui ids from generated HTML.
Damyon Wiese [Tue, 1 Oct 2013 04:05:09 +0000 (12:05 +0800)]
MDL-41993 Atto: Strip yui ids from generated HTML.

7 years agoMerge branch 'MDL-25176' of https://github.com/merrill-oakland/moodle
Marina Glancy [Tue, 8 Oct 2013 01:03:15 +0000 (12:03 +1100)]
Merge branch 'MDL-25176' of https://github.com/merrill-oakland/moodle

7 years agoMerge branch 'w41_MDL-37717_m26_enrolwarn' of https://github.com/skodak/moodle
Marina Glancy [Tue, 8 Oct 2013 00:52:39 +0000 (11:52 +1100)]
Merge branch 'w41_MDL-37717_m26_enrolwarn' of https://github.com/skodak/moodle

7 years agoMerge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Oct 2013 22:20:51 +0000 (11:20 +1300)]
Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle