2353 Commits

Author SHA1 Message Date
Rajesh Taneja
11f69d4165 MDL-43835 behat: Fixed backup behat test
Disabling section, disables all checkboxes in section,
So we don't have to unset them manually
2014-06-25 12:54:52 +08:00
Eloy Lafuente (stronk7)
8b8c78946f Merge branch 'MDL-46079-master' of https://github.com/sammarshallou/moodle 2014-06-25 01:32:11 +02:00
Damyon Wiese
dd6279788d Merge branch 'MDL-45652_master' of https://github.com/markn86/moodle 2014-06-24 16:58:04 +08:00
Eloy Lafuente (stronk7)
af03e18f48 Merge branch 'MDL-45721_master' of https://github.com/markn86/moodle 2014-06-24 00:56:31 +02:00
Damyon Wiese
a51201a433 Merge branch 'MDL-43835' of https://github.com/mr-russ/moodle 2014-06-23 12:20:04 +08:00
sam marshall
9f7b688c63 MDL-46079 Restore: Can run out of memory in get_records call 2014-06-20 14:15:28 +01:00
Mark Nelson
c5f0d9f50a MDL-45652 core_backup: display warning on restore destination form when necessary data is missing 2014-06-17 21:55:48 -07:00
Mark Nelson
ef03fb19ae MDL-45721 core_backup: only trigger the course_restored event when restoring a course 2014-06-17 19:43:48 -07:00
Russell Smith
d2c58b95bb MDL-43835 phpunit: Correct unit tests.
When different ID's are set for each sequence a number
of unit test failures appear.  They have been corrected
to allow unit tests to pass with the new generator in place.
2014-06-17 19:08:01 +10:00
Marina Glancy
6581e387a0 Merge branch 'MDL-45935-master' of git://github.com/andrewnicols/moodle 2014-06-16 14:02:17 +08:00
Marina Glancy
84dc90034a MDL-39726 backup: fix SQL syntax for Oracle 2014-06-11 17:16:45 +08:00
Marina Glancy
b9329e0cfe MDL-39726 backup: fix SQL syntax for Oracle 2014-06-11 12:14:16 +08:00
Andrew Nicols
87a37ebe6b MDL-45935 tests: Specify step names during backup/restore tests 2014-06-10 12:10:45 +08:00
Eloy Lafuente (stronk7)
3566ea16a8 Merge branch 'MDL-45574-master' of https://github.com/sammarshallou/moodle 2014-06-09 20:18:06 +02:00
Damyon Wiese
d78fa6c10a Merge branch 'MDL-39726-master' of https://github.com/merrill-oakland/moodle 2014-06-09 09:51:58 +08:00
sam marshall
e974eef932 MDL-45574 Backup progress: Can time out with large number of files
When there are many files inside a single resource, it's possible
for the backup to time out because it does not report progress
while adding entries to the backup_ids table.
2014-06-06 10:41:40 +01:00
Eric Merrill
d6441d1e5e MDL-39726 backup: Move question files by context, not one at a time
Use question category contexts to send file to the file pool in bulk.
Questions are only restored in whole category chunks, so this is safe
to do.
2014-06-04 09:14:49 -04:00
Eric Merrill
1f3b23569e MDL-45714 backup: Less aggressive removal of old backup dirs
The old 4 hour standard was too aggressive and can cause backup files
to be removed while they were still in use. Now the same as cron,
1 week.
2014-06-02 21:47:04 -04:00
Tim Hunt
5bcfd504df MDL-45618 Fix @since PHPdoc tags. 2014-05-19 17:03:04 +01:00
Eloy Lafuente (stronk7)
e443e016b2 MDL-45502 Bump release to 2.8 dev branch 2014-05-11 03:44:22 +02:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Marina Glancy
b76ae3b0ce Merge branch 'MDL-44630_CC_Changes' of git://github.com/moodlerooms/moodle 2014-05-08 12:05:20 +08:00
Mark Nielsen
e686494fbc MDL-44630: Fixing PHP foreach warnings 2014-05-07 12:39:47 -07:00
Mark Nielsen
4bcde92185 MDL-44630: Fix CC backup of quizzes
The common cartridge backup was skipping
quizzes because the <questions> element
is no longer in the Moodle backup file.
Instead, now reading from the list of
<question_instances> list.
2014-05-06 14:00:13 -07:00
Marina Glancy
8505550532 Merge branch 'MDL-45258-master' of git://github.com/ankitagarwal/moodle 2014-05-01 11:47:27 +08:00
Frederic Massart
98fed696dc MDL-45283 restore: Prevent failure when user course grade exists
When we restore a course, the grade that a user has for the
grade item of the course cannot be created twice. If we try
to create it when it already exists, a database exception is
raised because of index duplication.

The safest way to proceed is certainly to ignore the grade
information from the backup, otherwise we could potentially
overwrite existing information. Though, this only applies
to restore as merge, and it does not affect the update of
the course grade.
2014-04-30 12:09:13 +08:00
Ankit Agarwal
a9282e4120 MDL-45258 tags:context object/0 should not be passed to tag_set() 2014-04-28 15:35:01 +08:00
Dan Poltawski
452ef53428 MDL-45205 backup: avoid oracle incompatible query
Instead of aliasing column name with sql, use the backup API.
2014-04-21 20:36:52 +08:00
Dan Poltawski
c8ca0cea77 Merge branch 'MDL-44468_master' of git://github.com/ds125v/moodle 2014-04-18 15:27:41 +08:00
Dan Poltawski
63476b0f6f Merge branch 'MDL-44619_master' of git://github.com/dmonllao/moodle 2014-04-17 17:02:04 +08: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 Scotson
a1071322f7 MDL-44468 backup: use html_writer::div call
Simplify the renderer code with the new html_writer
div function.
2014-04-08 09:46:42 +01:00
David Scotson
9b2a2ffe2a MDL-44468 backup: use notification API
Replace a hardcoded div.notifyproblem with a API call that,
in Standard theme, outputs the same HTML.

Also removes the .notifyproblem class from the heading,
as that might cause problems for themers who expect it to be
used consistently with the API.
2014-04-08 09:46:42 +01:00
Damyon Wiese
392cb4577a MDL-44070 Conditional availability - white space fix 2014-04-08 13:49:15 +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
sam marshall
38674ef91a MDL-44070 Conditional availability enhancements (4): backup
Implements backup and restore for the new conditional availability
data. This includes:

* Backup and restore of new field.
* Restore updates IDs in conditions, as required.
* Restore converts availability data from legacy (Moodle 2.6) backups.
* Unit tests for all this.
2014-04-07 20:11:41 +01:00
Sam Hemelryk
566889aaa8 MDL-42317 output: reviewed standard/base layouts and converted where a better option was available 2014-04-06 15:57:32 +12:00
Mark Nielsen
cb4b7e55a0 MDL-44630: Review changes
* Fixing coding style violations.
* Fixing DOMDocument warning.
2014-04-03 10:10:10 -07:00
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00
Marina Glancy
f316de8a7f MDL-44316 core_tag: correction to the default value 2014-03-25 14:05:06 +08:00
Mark Nelson
cc033d48b5 MDL-44316 core_tag: changed the API to accept a contextid and component 2014-03-22 13:50:08 -07:00
Marina Glancy
4826ed1177 Merge branch 'MDL-44141-master' of git://github.com/sammarshallou/moodle 2014-03-19 09:49:00 +08:00
sam marshall
ddf368a213 MDL-44141 Completion: System updates data during restore
The completion system has code which is supposed to prevent it
updating completion status while grades are being restored. This
code was a nasty hack and had not worked for some time. As a result
completion dates were restored incorrectly.

This commit implements a 'proper' way to find out if a restore is
currently running, replacing the previous hack.
2014-03-18 13:31:34 +00:00
Ankit Agarwal
2523979821 MDL-42890 backup: Remove usage of log table in backup cron helper 2014-03-14 12:07:17 +08:00
Mark Nielsen
c3d245cff3 MDL-44630: Several additions to Common Cartridge Import/Export
Changes provided by Darko Miletic and Sam Chaffee.

* Fix problem with CC import not detecting a CC package. (Sam)
* Fixed Common Cartridge not importing FIB answers. (Sam)
* Fix to CC export so that short answer pattern matching question
  in a quiz does not prevent the entire quiz from exporting. (Sam)
* Fix notice about missing index when there is no answer-specific
  feedback in short answer question during CC export. (Sam)
* Fixed Japanese characters being incorrectly encoded (garbled)
  on Common Cartridge import. (Sam)
* Changed import of CC discussions to create 'Standard General'
  forums in Moodle. (Sam)
* Fix problem with question name being replaced with question
  text on CC import of exported Moodle questions. (Sam)
* Fix CC 1.1 multiple choice question import having no correct
  answers. (Sam)
* Fixed problem with multiple choice, multiple answers allowed
  questions not exporting correct answers to CC. (Sam)
* Removed duplicate method. (Darko)
* Implemented fix that skips quiz export if it contains
  non-exportable question. (Darko)
* Fixed: Common cartridge export is extremely slow when dealing
  with lot of more than 200 files. (Darko)
* Added support for basic roles support in common cartridge. (Darko)
* Implemented folder resource export. (Darko)
* Minor fixes to adjust to the standard. (Darko)
* Added support for exporting simple fill in the blank
  (shortanswer without wildcards in Moodle). (Darko)
* Added support for exporting essay question. (Darko)
* Added support for true/false export. (Darko)
* Added support for exporting multiple response questions,
  added also category information into question metadata
  during export (Darko)
* Added support for correctly importing multiple response
  questions. (Darko)
2014-03-13 15:42:13 -07:00
Dan Poltawski
060aa628b3 Merge branch 'master_MDL-44066' of git://github.com/danmarsden/moodle 2014-03-11 11:28:56 +08:00
Dan Marsden
538864dffd MDL-44066 Restore: Restore source field.
Causes problems when restoring a SCORM pacakge that uses an alias.
2014-03-08 21:09:30 +13:00
David Monllao
759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00
Damyon Wiese
0cc30f6fcf Merge branch 'MDL-44370-master' of git://github.com/ankitagarwal/moodle 2014-03-05 13:44:56 +08:00
Ankit Agarwal
cebfb9ec9f MDL-44370 calendar: Add support for restoring calendar log rules 2014-03-04 16:13:25 +08:00