Commit Graph

766 Commits

Author SHA1 Message Date
Sam Hemelryk 2a336e2a36 Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle
Conflicts:
	backup/util/ui/base_moodleform.class.php
2013-12-04 09:44:25 +13:00
Sam Hemelryk a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Petr Škoda a377754770 MDL-41819 try to work around max_input_vars restriction 2013-12-02 08:29:08 +08:00
Damyon Wiese df9b573d85 MDL-43065 Backup: Prevent any responsiveness in backup/restore forms
Adding 'unresponsive' class to any moodle form will prevent the default
collapsing on screens < 1200px.
2013-11-29 14:27:34 +08:00
sam marshall 8f46e2a808 MDL-42905 Backup progress: Pointless line of code should be deleted 2013-11-15 12:44:34 +00:00
sam marshall 40e8f0260c MDL-42815 Backup/restore: Error saving files - log messages unhelpful
This commit contains three changes in the three files:
1. A bug in the backup process meant that anything logged after a
   certain point did not appear in the on-screen display of the
   backup log, because the logger was serialised and deserialised
   but display code referred to the old version. Changed so that
   code retrieves new object.
2. Add more information to backup log when there is a missing file.
3. Add more information to restore log when there is a missing file
   (and remove existing code duplication of the current message).

The 'missing file' situation is one that generally shouldn't occur in
normal usage, but when it does happen, it is useful to have full
information about the file.
2013-11-11 17:15:32 +00:00
sam marshall db0f0097e8 MDL-42084 Unit tests: Remove unnecessary 'clear time limit change' lines 2013-11-06 16:40:04 +00:00
sam marshall 3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
2013-11-06 16:40:01 +00:00
sam marshall 6edd90ccab MDL-42084 Backup: Update time limit to avoid regression, use new class 2013-11-06 16:39:59 +00:00
Andrew Nicols 11f8ef10c0 MDL-42737 ActionMenu: Close the menu after selecting actions 2013-11-06 17:16:49 +08:00
David Monllao 047a8800f4 MDL-40975 course: Adapt behat tests to the new course editing interface 2013-11-06 11:41:00 +08:00
David Monllao 622442765e MDL-42363 behat: Avoid random failure because of timing differences 2013-11-05 15:27:13 +08:00
Dan Poltawski dcc08e55b5 Merge branch 'MDL-42363_master' of git://github.com/dmonllao/moodle 2013-11-04 23:34:18 +08:00
Damyon Wiese e45910aff3 Merge branch 'MDL-42489-master' of git://github.com/ankitagarwal/moodle 2013-11-04 13:17:15 +08:00
Damyon Wiese 3b4e5a83f4 Merge branch 'MDL-38734-master' of git://github.com/danpoltawski/moodle 2013-11-01 08:55:29 +08:00
David Monllao 905729bf33 MDL-42363 behat: Covering MDL-41817 testing
Covering backup/restore without blocks
and with a single course section.
2013-10-30 18:28:14 +08:00
Damyon Wiese 3a33578926 Merge branch 'wip-mdl-30812' of git://github.com/rajeshtaneja/moodle 2013-10-28 12:11:34 +08:00
Ankit Agarwal 932f54e996 MDL-42489 backup: use correct exception class in automated backups 2013-10-28 09:58:56 +08:00
Dan Poltawski 76dcc0ee21 Merge branch 'MDL-42389-master' of git://github.com/sammarshallou/moodle 2013-10-24 16:07:17 +08:00
Ankit Agarwal f3218d15b0 MDL-42427 backup: Fix undefined errors during automated backups 2013-10-23 12:03:13 +08:00
Rajesh Taneja 0daadaaeaf MDL-34612 Restore: Gracefully handle empty file contenthash while restoring 2013-10-22 09:47:42 +08:00
Mark Nelson 70f210c04f MDL-42201 backup: introduced new automatic backup state 2013-10-21 11:51:12 +08:00
sam marshall b6cdb4d660 MDL-42389 Restore: Broken restore causes notice before exception 2013-10-18 12:00:56 +01:00
Tony Levi 1b55bdb644 MDL-38734: Automated backup failure causing all course to fail
Conflicts:
	backup/moodle2/backup_stepslib.php
2013-10-18 15:07:35 +08:00
Damyon Wiese 2c94d858f0 Merge branch 'MDL-37877-master' of git://github.com/ankitagarwal/moodle 2013-10-15 16:54:40 +08:00
Dan Poltawski bca2951282 Merge branch 'MDL-42209_master' of https://github.com/markn86/moodle 2013-10-15 14:43:02 +08:00
Ankit Agarwal b2e791d153 MDL-37877 backup: Fix issues with zipping of large files
Files bigger than 4GB is not supported at this point. Zip archiver doesn't know about it and always returns true. We need to verify if it is a valid file or not and delete if not
Also delete the backup file immediately if anything goes wrong anywhere in backup. We don't want to use up space
2013-10-15 12:14:23 +08:00
FilipBenco be885f1291 MDL-42209 backup: fixed wrong icon being displayed when restoring course 2013-10-14 14:32:18 +08:00
Eloy Lafuente (stronk7) b1636b4a8b Merge branch 'MDL-37181_master' of https://github.com/markn86/moodle 2013-10-13 23:32:30 +02:00
David Monllao e9af3ed361 MDL-42013 behat: I should (not)? see checking visibility
Only for non-Javascript tests. If the step
is named I should/should not see whatever
is makes sense that has to be visible.
2013-10-10 18:40:29 +08:00
Damyon Wiese 4aac948f34 MDL-41838 Backup: Fix undefined variable
Nice spotting Ankit!
2013-10-10 12:11:18 +08:00
Damyon Wiese 26d78116c0 MDL-42039 Backup: Fix whitespace 2013-10-10 11:25:51 +08:00
sam marshall 0e2637054f 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.
2013-10-10 10:57:31 +08:00
sam marshall a658b73cd0 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.
2013-10-10 10:56:30 +08:00
sam marshall 1cd39657b5 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.
2013-10-10 10:56:30 +08:00
sam marshall 37ff843d7d 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.
2013-10-10 10:56:30 +08:00
sam marshall 02da69214f 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.
2013-10-10 10:56:29 +08:00
Damyon Wiese 370058d8fb Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle
Conflicts:
	lib/upgrade.txt
2013-10-10 10:49:11 +08:00
Damyon Wiese f0ae8d7a66 Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle
Conflicts:
	backup/backup.php
	theme/bootstrapbase/style/moodle.css
2013-10-10 09:31:33 +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
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 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
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
sam marshall e555a4439f MDL-41722 Backup: Very large course times out on user interface pages
Adds 'Preparing page display' progress bars for user interface pages
if they take a long time to display.

Also adds changes where other parts of the backup progress timed out on
long backups. After this change, and MDL-41838, it is finally possible on
my dev server to successfully back up the 'XL' test course.
2013-10-04 10:32:13 +01:00
Damyon Wiese 3d27180e94 MDL-40493 User preference: Allow users to set their preferred text editor.
This changes the setting htmleditor in the user table from a 0 or 1 column
to a user preference for the name of their preferred html editor.
2013-10-02 12:49:30 +08:00
Marina Glancy 9e11059326 Merge branch 'MDL-12403-master' of git://github.com/danpoltawski/moodle 2013-09-30 18:04:38 +10:00
Dan Poltawski 2d2489e59e MDL-12403 backup: prevent unset config from being applied 2013-09-26 09:55:13 +08:00
Dan Poltawski 99d5203824 MDL-12403 backup: ability configure default for question bank excludes 2013-09-26 09:55:13 +08:00
Dan Poltawski 6507aaeaff MDL-12403 backup: configure question bank in automated backups 2013-09-26 09:55:12 +08:00
Eloy Lafuente (stronk7) 007b803b4a Merge branch 'MDL-38192-master' of git://github.com/sammarshallou/moodle 2013-09-25 00:27:57 +02:00