Commit graph

2316 commits

Author SHA1 Message Date
Damyon Wiese
37e2954e19 Merge branch 'MDL-41401-master' of git://github.com/danpoltawski/moodle 2013-08-27 15:09:21 +08:00
Damyon Wiese
a6163e7a5f MDL-31093 Scorm course format: Remove behat tests
The scorm course format has been removed so we don't need to test it anymore.
2013-08-27 13:26:47 +08:00
Damyon Wiese
f6c2af867f Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-08-27 13:16:55 +08:00
Dan Poltawski
e820d50791 Merge branch 'MDL-37211_master' of https://github.com/nadavkav/moodle 2013-08-27 11:54:28 +08:00
Dan Poltawski
ba59a28305 Merge branch 'MDL-36126_master' of https://github.com/markn86/moodle 2013-08-26 14:25:20 +08:00
Damyon Wiese
97c91725d1 Merge branch 'MDL-41380-master' of https://github.com/mr-russ/moodle 2013-08-26 12:42:15 +08:00
Dan Poltawski
007cbfe03e MDL-41401 backup: fix misnamed test method 2013-08-23 15:09:12 +08:00
Mark Nelson
6d8627cb6b MDL-36126 backup: changed the message column in the table backup_logs to a text field to prevent DB errors 2013-08-23 11:40:36 +08:00
Russell Smith
cdd8382b63 MDL-41380 backup: Fix incorrect function name from MDL-40618. 2013-08-22 12:41:51 +10:00
Dan Marsden
3d1808c6e2 MDL-40122 SCORM: replace SCORM course format with singleactivity 2013-08-21 20:26:06 +12:00
Damyon Wiese
74df2951d1 Revert "MDL-39876 Change get_record('course') calls to get_course"
This reverts commit ab7632b74c.
2013-08-21 13:42:30 +08:00
Sam Hemelryk
487caf6b65 Revert "MDL-39876 update_course_record function to update global COURSE"
This reverts commit c290ac5510.

Conflicts:
	course/lib.php
2013-08-21 15:21:06 +12:00
Sam Hemelryk
6eee89bc8f Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle
Conflicts:
	course/lib.php
2013-08-21 12:08:46 +12:00
Damyon Wiese
eedb6aae3f Merge branch 'MDL-27595-2' of https://github.com/bostelm/moodle 2013-08-20 13:31:16 +08:00
Dan Poltawski
91a888df34 Merge branch 'MDL-39957_master' of https://github.com/markn86/moodle 2013-08-20 12:38:08 +08:00
Dan Poltawski
6f44a73369 Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2013-08-20 11:42:03 +08:00
sam marshall
f06abc2ac1 MDL-38190 (3) Backup/restore: Progress display in main user interface 2013-08-16 16:28:04 +01:00
sam marshall
2531ae2922 MDL-38190 (2) Backup/restore: Progress tracking for tasks and steps 2013-08-16 10:50:36 +01:00
sam marshall
16cd708835 MDL-38190 (1) Backup/restore: Progress tracking API 2013-08-16 10:50:35 +01:00
Nadav Kavalerchik
1a46c81c87 MDL-37211 Backup: Migrate hard-coded strings to language string for the table header labels on the restore page 2013-08-16 12:24:10 +03:00
Russell Smith
536e9be605 MDL-40893 backup: cache question answers for performance
To constrain memory we only cache a single question's answers.
A quiz must display this many answers, so it will not result
in undue memory pressure.

We now match on the full answer text rather than the first 255
characters.  This removes the risk of matching questions with the
same start.
2013-08-16 10:06:13 +10:00
sam marshall
c290ac5510 MDL-39876 update_course_record function to update global COURSE 2013-08-15 11:31:21 +01:00
sam marshall
ab7632b74c MDL-39876 Change get_record('course') calls to get_course 2013-08-15 11:31:20 +01:00
Henning Bostelmann
55e4100617 MDL-27595 backup: allow course import with warnings
Proceed with import if warnings are found, but display the warnings afterwards
2013-08-15 11:18:40 +01:00
Mark Nelson
a4003c733a MDL-39957 course: replaced the course_restored legacy event 2013-08-15 18:14:08 +08:00
sam marshall
07e720010a MDL-41146 Backup: backup_includes_files can leak memory 2013-08-12 13:49:26 +01:00
Petr Škoda
96f81ea385 MDL-39474 introduce $CFG->debugdeveloper and cleanup $CFG init 2013-08-12 13:01:47 +02:00
sam marshall
975f8442c9 MDL-38191 Backup/restore: Should use large memory limit 2013-08-09 11:01:14 +01:00
Petr Škoda
2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Petr Škoda
8252b7c291 MDL-40901 standardise core test case class and file names
This finally allows us to type only the class name when executing individual core test cases.
2013-08-04 22:10:31 +02:00
Sam Hemelryk
e5de4933b0 MDL-39814 frontend: redeveloped overlay to correct tab-flow
Also:
 * fixed zindex issue + spinner placement
 * added notes to course format and theme upgrade texts
 * fixed behat tests after action menu changes
2013-07-30 16:15:19 +12:00
Dan Poltawski
50aa2587a4 Merge branch 'MDL-40618_restore_get_questions' of https://github.com/mr-russ/moodle 2013-07-29 14:14:58 +08:00
Eloy Lafuente (stronk7)
154bc6b240 Merge branch 'w30_MDL-40642_m26_umask' of https://github.com/skodak/moodle 2013-07-23 23:42:11 +02:00
Eloy Lafuente (stronk7)
79143f1e59 Merge branch 'MDL-40816_master' of git://github.com/markn86/moodle 2013-07-23 18:18:52 +02:00
Russell Smith
3e7e2ab2ee MDL-40618 backup: centralize info field, use info in queries.
encode_backup_temp_info() and decode_backup_temp_info() have been
introduced to keep the info field encoding in one place.
Many locations used get_backup_ids_record() to obtain info, that
makes lots of calls to get_backup_ids_record() which can be slow.
We now complete all those inline by adding the info field to the query.
To reduce memory usage, all queries of that nature have been changed
to use get_recordset_*. gzcompress was introduced if available to minimize
traffic to/from the database and to decrease the memory required for caching.
The compression time is saved by the benefits in other places of having smaller data.
2013-07-23 19:50:53 +10:00
Dan Poltawski
a0035108b0 MDL-40585 fix trailing whitespace 2013-07-23 13:33:49 +08:00
Dan Poltawski
33b6da7f59 Merge branch 'MDL-40585_grouped_parent_exists' of git://github.com/mr-russ/moodle 2013-07-23 13:33:27 +08:00
Dan Poltawski
3ee8607d46 Merge branch 'MDL-40584' of https://github.com/mr-russ/moodle 2013-07-23 12:35:41 +08:00
Mark Nelson
888e317f2d MDL-40816 backup: code cleanup on the manage backups form 2013-07-22 18:15:07 +08:00
Mark Nelson
8874895892 MDL-40816 backup: added missing setType calls to the manage backups form 2013-07-22 18:15:00 +08:00
David Monllao
3897608152 MDL-39635 behat: XPath cleanups
- Escaping steps arguments redirected to other steps
- Adding normalized-space() in all contains() assertions
- General xpaths review
- Convering provided xpath text strings to xpath literals
  to avoid problems with arguments containing both single
  quotes and double quotes
2013-07-19 10:02:36 +02:00
David Monllao
dedb973878 MDL-39635 behat: Replacing hardcoded language strings
Using get_string() instead.
2013-07-19 10:02:10 +02:00
Petr Škoda
eb459f7192 MDL-40642 set more restrictive umask and use proper permission for new dirs and files 2013-07-19 09:18:44 +02:00
Eloy Lafuente (stronk7)
fb1788c598 Merge branch 'MDL-40424-master' of git://github.com/FMCorz/moodle
Conflicts:
	admin/oacleanup.php
2013-07-17 01:21:51 +02:00
Petr Škoda
b0d1d941c9 MDL-40220 use new core_component::get_component_directory() 2013-07-16 22:42:37 +02:00
Petr Škoda
bd3b3bba9f MDL-40220 use new core_component::get_plugin_list() 2013-07-16 22:36:11 +02:00
Petr Škoda
46f6f7f224 MDL-40220 use new core_component::get_plugin_types() 2013-07-16 22:31:48 +02:00
Eloy Lafuente (stronk7)
e780e5cb8f Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges
Conflicts:
	lib/db/upgrade.php
	version.php
2013-07-16 01:29:01 +02:00
Russell Smith
42574d0900 MDL-40584 backup: Query db once per category in precheck
The cache is function local and testing against a large database
indicates 10k questions is a large category.  Restore already
uses MEMORY_EXTRA and that will have enough space for the couple
of megabtyes a local sql hash will introduce.
2013-07-15 16:44:45 +10:00
Damyon Wiese
d7bf5fd1f7 Merge branch 'MDL-40440-m' of git://github.com/andrewnicols/moodle 2013-07-15 14:42:10 +08:00