Commit Graph

24767 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) 9fc25660c5 Merge branch 'MDL-43450_master' of git://github.com/dmonllao/moodle 2014-01-28 00:07:57 +01:00
David Curry a5ab83ac5e MDL-43797 lib/db/upgrade.php: Remove custom pages for deleted users
Change-Id: Ifef563431682a2a5524927f85ca9eba9cbe520ff
2014-01-28 11:55:17 +13:00
David Curry 72d1ccffb3 MDL-43797 lib/moodlelib.php: Remove custom homepages on user deletion
Change-Id: Ibaf6f0a9dc29d00b97a32111d1cf5063ebed1888
2014-01-28 11:41:20 +13:00
Eloy Lafuente (stronk7) 2c8b15c50d Merge branch 'MDL-43757_master' of git://github.com/dmonllao/moodle 2014-01-27 21:20:39 +01:00
Eloy Lafuente (stronk7) 8fce57c001 Merge branch 'MDL-43581' of git://github.com/timhunt/moodle 2014-01-27 17:03:25 +01:00
James Pratt 1239d28776 MDL-41756 (2) quiz statistics : break down question stats by variant 2014-01-27 18:00:04 +07:00
James Pratt eb50c6e198 MDL-43027 core progress : new method keeps track of progress internally 2014-01-27 17:51:09 +07:00
James Pratt ef81a7c30e MDL-41754 (3) quiz statistics : need to escape core_php_time_limit
after MDL-42084 was merged into upstream, introducing
core_php_time_limit, this branch that moved a reference to
core_php_time_limit to a new namespace was broken.
2014-01-27 17:45:50 +07:00
James Pratt 8da6fc9d57 MDL-41754 (2) quiz statistics : using Sam's new progress classes 2014-01-27 17:45:50 +07:00
James Pratt 809fdb83b1 MDL-41754 (1) Progress tracking : moved from backup and restore to core 2014-01-27 17:45:50 +07:00
Tim Hunt 391edc51f9 MDL-43581 additionalhtmlfooter should be added to every page
Not just pages with a visible footer.
2014-01-27 10:24:43 +00:00
Damyon Wiese 9843e5ece5 MDL-25500 lock: New locking framework.
This locking system is designed to be used everywhere requiring
locking in Moodle. Each use of the locking system can be configured
to use a different type of locking (or the same type with a different
configuration).

The first supported lock types are memcache, memcached, file (flock),
db (specific handlers for pg, mysql and mariadb).
2014-01-27 10:04:18 +08:00
Sam Hemelryk 068ffec81b Merge branch 'w04_MDL-43761_m27_sqlinstall' of https://github.com/skodak/moodle 2014-01-27 14:30:57 +13:00
Eloy Lafuente (stronk7) f4068d757f Merge branch 'MDL-43758_master' of git://github.com/dmonllao/moodle 2014-01-27 01:18:05 +01:00
Sam Hemelryk 9299144461 Merge branch 'w04_MDL-43746_m27_courselogin' of https://github.com/skodak/moodle 2014-01-27 11:32:08 +13:00
Sam Hemelryk 00dfc95708 Merge branch 'MDL-43794' of https://github.com/merrill-oakland/moodle 2014-01-27 11:16:11 +13:00
Russell Smith 74b63eae76 MDL-43440 unit testing: Use cmid in unit tests when it should be used.
instance is has been used instead of cmid.  This works as all id's are 1
in most cases, but not always.

accesslib_clear_all_caches_for_unit_testing was updated to clear the
$USER->access cache which would fail test when the wrong user's data was used.
2014-01-25 08:57:32 +11:00
Michael Aherne 780cf0a728 MDL-43440 unit tests Use correct cm identifier in unit tests 2014-01-25 08:56:43 +11:00
David Monllao b8c4d91ca0 MDL-43450 behat: Improving error messages 2014-01-24 16:45:27 +08:00
Damyon Wiese ac2b4ffc8c MDL-43593 Assign editpdf: More robust handling of errors from TCPDF.
This includes a check to see if there are 0 pages in the combined pdf,
catching exceptions and suppressing php warnings and errors from bad pdf files.

Also - Use TCPDF directly to check if pdfs are compatible. The previous check was
letting dodgy PDFs through which then failed at generation time. This way dodgy
pdfs will get run through ghostscript early and cleaned up.
2014-01-24 16:16:38 +08:00
David Monllao a922209e84 MDL-43758 performance: New metric, time spent by the database
This patch adds a new performance metric to the performance
info shown by MDL_PERF* vars, the time spent by the database,
it was one of the wonderful @poltawski ideas. To be more specific
the value displayed is the sum of the time elapsed between query_start()
and query_end().
2014-01-24 16:07:01 +08:00
David Monllao cca6f37389 MDL-43757 behat: Allowing the form field guesser to detect TinyMCE
It includes 2 more minor fixes:
- Escapes values sent to TinyMCE as it was breaking
  when values contained double quotes.
- Adding seconds to the screenshots directory to
  avoid using the same folder for multiple runs.
2014-01-24 15:06:12 +08:00
Petr Skoda 9d202aed27 MDL-43746 fix require_course_login regression caused by MDL-25981 2014-01-24 13:50:57 +08:00
Petr Škoda b4b03d38b7 MDL-43761 execute bulk sql when modifying db structure
In case of postgresql this uses transactions to allow easier recovery from broken installs.
2014-01-24 13:47:41 +08:00
Petr Škoda ab3fc898f4 MDL-43761 use single query in mysql when crating tables 2014-01-24 13:46:30 +08:00
Petr Skoda 3f17d7091b MDL-43761 refactor db manager code to send arrays of SQL to the dml driver 2014-01-24 13:45:07 +08:00
Dan Poltawski 88de0401ae MDL-33064 tests: remove code_test.php
This test was doing work which doesn't make sense as a unit test.
Perhaps the most sensible option would be to use a git hook. Here is
a replacement David Mudrák created:

$ cat .git/hooks/pre-commit
 #!/bin/bash

FOUND=$(git diff-index --cached -U0 HEAD -- | grep DONOTCOMMIT | wc -l)

if [[ $FOUND -gt 0 ]]; then
    echo "pre-commit hook: DONOTCOMMIT detected, commit not allowed"
    exit 1
fi
2014-01-23 16:03:59 +08:00
Eric Merrill ec74b980c6 MDL-43794 Files API Set the mtime of files to extraction time.
The restore cleanup code expects the mtime to be the time of extraction
not the mtime before archiving. If set to the old mtime, the restore
files may be cleaned up before the restore is complete.

This behaviour also matches the behaviour of the zip unpacker.
2014-01-22 11:06:39 -05:00
Petr Škoda 32f906b677 MDL-43661 use new edulevel in all existing events 2014-01-21 16:12:35 +08:00
Petr Škoda 3345e24f4b MDL-43661 change event property level to edulevel
Level is a reserved word in sql, sorry.
2014-01-21 15:54:56 +08:00
Dan Poltawski 0eea6f5d99 Merge branch '43714-27' of git://github.com/samhemelryk/moodle 2014-01-21 14:49:26 +08:00
Dan Poltawski 8a04a045b3 Merge branch 'MDL-43760-master' of git://github.com/damyon/moodle 2014-01-21 14:28:50 +08:00
Damyon Wiese f329801959 Merge branch 'MDL-41810_master' of https://github.com/totara/openbadges
Conflicts:
	badges/upgrade.txt
2014-01-21 13:06:30 +08:00
Frederic Massart 22c5c6e627 MDL-41767 themes: Support for parent-specific sheets in plugins 2014-01-20 13:29:20 +01:00
Dan Poltawski 1db62f7ff4 Merge branch 'wip-MDL-41062-master' of git://github.com/marinaglancy/moodle 2014-01-20 15:29:15 +08:00
Damyon Wiese e0ebe681e0 MDL-43760 Potential fix for fletcher scott issues with fullname. 2014-01-20 13:37:51 +08:00
Marina Glancy b35ef82f33 MDL-41062 gradebook: corrections to grade_item upgrade script, more tests 2014-01-20 12:26:14 +08:00
Damyon Wiese c8bfabd267 Merge branch '43675-27' of git://github.com/samhemelryk/moodle 2014-01-20 10:57:30 +08:00
Damyon Wiese 12c0236385 Merge branch 'MDL-40051_master' of https://github.com/markn86/moodle 2014-01-20 10:41:36 +08:00
Mark Nelson 362b9a0465 MDL-40051 core_lib: replaced add_to_log call when failing to send email with an event 2014-01-19 18:30:40 -08:00
Mark Nelson 0b7422f366 MDL-40051 core_mnet: replaced add_to_log calls with events 2014-01-19 18:30:40 -08:00
Dan Poltawski e6fbca9f65 Merge branch 'wip-mdl-43306-m' of git://github.com/rajeshtaneja/moodle 2014-01-20 09:45:43 +08:00
Dan Poltawski 2a9d7a42aa MDL-41062 gradebook: remove sortorder duplicates
* Upgrade function to remove duplicates from the grade item duplicates
  column. Duplicates were causing sorting to fail in some cases.
* Add some unit tests which simulate sort order duplicate data and
  verify that they have been removed.
2014-01-17 17:31:21 +08:00
Sam Hemelryk 8496ddd7c6 MDL-43714 blocks: fixed coding style of ajax/blocks.php 2014-01-17 10:50:18 +13:00
Sam Hemelryk efd556f77b MDL-43714 blocks: fixed notice when moving to an empty region 2014-01-17 10:45:23 +13:00
Sam Hemelryk 956e2e8a8c MDL-43675 navigation: courses branch is now recognised as expandable 2014-01-17 10:27:10 +13:00
Damyon Wiese efbed79063 Merge branch 'MDL-43621_master' of https://github.com/totara/openbadges 2014-01-15 13:17:31 +08:00
Dan Poltawski b19608d682 Merge branch 'MDL-40912_master' of https://github.com/markn86/moodle 2014-01-15 11:41:05 +08:00
Yuliya Bozhko e477ec0a39 MDL-43621 badges: Fix has_awards() result when deleted users are the only recipients of a badge 2014-01-15 16:24:37 +13:00
Mark Nelson 001f09548d MDL-40912 coursecat: replaced 'hide' and 'show' add_to_log calls with an event 2014-01-14 19:24:15 -08:00