Commit graph

64422 commits

Author SHA1 Message Date
Jerome Mouneyrac
b0ec47fb19 MDL-41604 Moodle should also fallback to the default theme when a parent theme is invalid. 2013-10-09 17:05:31 +08:00
Dan Poltawski
c1636aea88 Merge branch 'MDL-40493-master-fix1' of git://github.com/damyon/moodle 2013-10-09 17:01:10 +08:00
Dan Poltawski
117111b78b Merge branch 'MDL-39776-master' of git://github.com/phalacee/moodle 2013-10-09 16:54:02 +08:00
Rajesh Taneja
9dbe0313ce 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
2013-10-09 16:53:46 +08:00
Damyon Wiese
6e4dcb9a47 MDL-40493 Question: Explain why setAdminUser is needed for tests 2013-10-09 16:53:21 +08:00
Dan Poltawski
07b0214588 Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-10-09 16:46:56 +08:00
Dan Poltawski
bbe834a152 Merge branch 'MDL-41986-master' of git://github.com/andrewnicols/moodle 2013-10-09 16:28:53 +08:00
Dan Poltawski
c58b3ca0ca Merge branch 'MDL-41985-master' of git://github.com/andrewnicols/moodle 2013-10-09 16:27:50 +08:00
Tim Hunt
e9af46d8e7 MDL-32188 fix type in question/engine/upgrade.txt 2013-10-09 09:14:24 +01:00
Kordan
f846568b6f MDL-42187 theme_formal_white: alignment between radio buttons and relative labels has been restored 2013-10-09 08:44:53 +02:00
Damyon Wiese
c778085550 Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle 2013-10-09 14:42:23 +08:00
Mark Nelson
5043bcfaae MDL-37181 backup: stopped setting the status of unscheduled backups to skipped 2013-10-09 13:58:56 +08:00
Damyon Wiese
4600853128 Merge branch 'MDL-41659_master' of https://github.com/totara/openbadges 2013-10-09 13:30:40 +08:00
Damyon Wiese
6412c972e3 Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle 2013-10-09 12:46:14 +08:00
Damyon Wiese
c2a2580ac9 Merge branch 'wip-MDL-40844-master' of git://github.com/abgreeve/moodle 2013-10-09 12:09:10 +08:00
Damyon Wiese
5cc2c6662d Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle 2013-10-09 12:03:54 +08:00
Damyon Wiese
604fc45ee0 Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle 2013-10-09 11:48:14 +08:00
Jason Fowler
614119163f MDL-39776 Javascript - enable formautosubmit from a select box on android 2013-10-09 11:36:13 +08:00
Sam Hemelryk
d00b3f19b9 Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle 2013-10-09 16:25:22 +13:00
Ankit Agarwal
136f4c47b3 MDL-40046 events: Use correct variable for page instance id 2013-10-09 11:20:32 +08:00
Dan Poltawski
e521e0724e Merge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle 2013-10-09 11:16:34 +08:00
Damyon Wiese
103ba42d84 MDL-41993 Atto: Always clean/update the textarea when the content is changed 2013-10-09 11:08:06 +08:00
Sam Hemelryk
f18f96f767 Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2013-10-09 15:58:45 +13:00
Paul Nicholls
0d64c75fb2 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.
2013-10-09 15:56:52 +13:00
Dan Poltawski
e9091a28f5 Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle 2013-10-09 10:54:24 +08:00
Dan Poltawski
9d841c6c90 Merge branch 'mdl41908-master' of https://github.com/tlock/moodle 2013-10-09 10:27:07 +08:00
Damyon Wiese
869dd1fc6c Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle 2013-10-09 09:39:09 +08:00
Eloy Lafuente (stronk7)
7e9dadfd99 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
2013-10-09 01:48:45 +02:00
Sam Hemelryk
571781fbf6 Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle 2013-10-09 12:41:36 +13:00
Eloy Lafuente (stronk7)
8fe9bbde09 Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle 2013-10-09 01:29:17 +02:00
Eloy Lafuente (stronk7)
38c6dc4313 Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnarfel/moodle 2013-10-09 01:26:52 +02:00
Petr Škoda
c969753885 MDL-40493 question: set real $USER before testing question walktrough 2013-10-09 11:02:35 +13:00
Petr Škoda
ed661154de MDL-41792 fix calendar test typos 2013-10-08 23:08:27 +02:00
Sam Hemelryk
08f95ac5e5 Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle 2013-10-09 09:23:53 +13:00
Sam Hemelryk
9d1b909a9c Merge branch 'MDL-41956_master' of https://github.com/totara/openbadges 2013-10-09 08:54:46 +13:00
Petr Škoda
6cf2091571 MDL-16073 add test for connection to external database for authentication and enrolments 2013-10-08 21:53:51 +02:00
Eloy Lafuente (stronk7)
7d19bc1353 Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle 2013-10-08 21:25:46 +02:00
Eloy Lafuente (stronk7)
cef0f4203b Merge branch 'wip-MDL-42141-master' of git://github.com/marinaglancy/moodle 2013-10-08 21:23:56 +02:00
Charles Fulton
3ed2c6e50c MDL-34612 forum: convert default format value during restore 2013-10-08 09:56:04 -07:00
Charles Fulton
68e0759c94 MDL-34586 assignment: convert default format value during restore 2013-10-08 09:45:52 -07:00
Eric Merrill
bd8f5d459d 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.
2013-10-08 08:04:55 -04:00
sam marshall
39e5102f8b 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.
2013-10-08 13:04:49 +01:00
sam marshall
c858655dde 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.
2013-10-08 13:04:48 +01:00
Eric Merrill
20e6782f10 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.
2013-10-08 08:03:54 -04:00
sam marshall
77b3d9dfdf 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).
2013-10-08 11:00:11 +01:00
Eloy Lafuente (stronk7)
467fc03982 Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle 2013-10-08 10:53:03 +02:00
Dan Poltawski
4f0eaf18f4 Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2013-10-08 16:42:17 +08:00
Damyon Wiese
7bfc69b0c2 Merge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle 2013-10-08 16:19:25 +08:00
Damyon Wiese
44585a1ecd Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle 2013-10-08 16:03:46 +08:00
Petr Škoda
307124bed8 MDL-42199 fix course revision test 2013-10-08 09:57:09 +02:00