Commit graph

71404 commits

Author SHA1 Message Date
Dan Poltawski
e1a826e205 Merge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle 2014-11-24 11:53:53 +00:00
Dan Poltawski
3111b66fbd Merge branch 'wip_MDL-47834_m29_concurrentlogins' of https://github.com/skodak/moodle 2014-11-24 11:07:20 +00:00
Dan Poltawski
bcc4dc3eab Merge branch 'MDL-31500_master' of git://github.com/dmonllao/moodle
Conflicts:
	backup/util/ui/renderer.php
2014-11-24 10:55:27 +00:00
David Mudrák
32c670c8c2 MDL-48210 updates checker: Improve cron notifications processing
These are cosmetic improvements spotted while working on the issue.

1. Do not waste time if there are no changes to notify about.
2. Fix the legacy plugin manager's get_plugins() call.
2014-11-24 11:44:13 +01:00
David Mudrák
c9f1b3a0c3 MDL-48210 plugin_manager: Invalidate caches after fetching updates info 2014-11-24 11:44:02 +01:00
Amanda Doughty
cc6dee5856 MDL-35696 enrol_meta: Fixed course sort order 2014-11-24 10:19:17 +00:00
Ankit Agarwal
80a1dfe561 MDL-42717 backups: set correct backup status and add logs
Set a correct backup status of ERROR when we fail to copy a file to an external directory given the backup configs demand it.
Also a lot of logs are added around this area to let admins easily find the problem if backup fails because of directory permissions.
2014-11-24 10:18:56 +05:30
Sam Hemelryk
d148da7e56 Merge branch 'MDL-48148-master' of git://github.com/andrewnicols/moodle 2014-11-24 15:57:59 +13:00
Sam Hemelryk
b52e55bb47 Merge branch 'MDL-25763_master' of git://github.com/dmonllao/moodle 2014-11-24 15:53:56 +13:00
David Monllao
34f18420ac MDL-22309 report_singleview: Fixing wrong uses of get_role_users() 2014-11-24 10:53:53 +08:00
David Monllao
a8e60d97d9 MDL-22309 accesslib: Preventing incorrect get_role_users() uses 2014-11-24 10:46:04 +08:00
Sam Hemelryk
6d84f28553 Merge branch 'MDL-48064-master' of https://github.com/dthies/moodle 2014-11-24 14:54:16 +13:00
David Monllao
655f737187 MDL-22309 accesslib: Adding unit test to expose the issue 2014-11-24 09:45:50 +08:00
Adrian Greeve
67eb7d7804 MDL-48252 scheduled tasks: Unit test for file_temp_cleanup_task. 2014-11-24 09:41:42 +08:00
Adrian Greeve
bdead76ea4 MDL-48252 scheduled tasks: file_temp_cleanup_task does full delete.
This scheduled task was previously only doing a partial delete
due to the fact that the directory modification time would be
updated when a child file was deleted. It would then have to
wait another week before that directory could be deleted.
2014-11-24 09:41:42 +08:00
David Monllao
06bb6478fd MDL-25763 tool_replace: Returning correct error code 2014-11-24 09:30:06 +08:00
Andrew Nicols
338ee3d6bb MDL-48148 mod_forum: Use the standard forum reply subject as default
When a user replies by e-mail, the course name has been included in the
original e-mail. As a result, the reply subject becomes longer and longer.

In cases whether either:
* the discussion name; or
* the replied-to-post subject

is present in the mail subject, the standard reply subject is instead used.
2014-11-24 09:10:54 +08:00
Matteo Scaramuccia
8e1f21d47b MDL-43483 mod_chat: Fixed race condition issues, including not useful logs. 2014-11-24 08:58:38 +08:00
Brian Barnes
270a8f1bf0 MDL-48317 groups: Removed table from User groups page 2014-11-24 10:43:15 +13:00
Sam Hemelryk
74cb9073d0 Merge branch 'MDL-35494_master' of https://github.com/markn86/moodle 2014-11-24 10:06:00 +13:00
Sam Hemelryk
bb554eb4ef MDL-48335 phpdoc: cleaned up @package in lang files 2014-11-22 11:03:46 +13:00
Sam Hemelryk
365c4edc92 MDL-48334 tool_messageinbound: phpdoc cleanup 2014-11-22 11:02:46 +13:00
Sam Hemelryk
04f2d13b4a MDL-48334 tool_messageinbound: cleanup @package @category 2014-11-22 11:02:40 +13:00
David Monllao
03c39daad8 MDL-31500 backup: Allow front page backup/restore
Removes restore on front page restrictions and allows
front page modules duplication.
2014-11-21 14:55:09 +08:00
David Monllao
818262afa5 MDL-31500 backup: New unit test for front page backup/restore 2014-11-21 12:37:27 +08:00
Rajesh Taneja
4db699fd26 MDL-48190 behat: Fixed visit background in MoodleScenarioTester 2014-11-21 12:02:20 +08:00
Frederic Massart
93539c44dc MDL-18183 mnet: Option to verify peer and host of MNet peer using HTTPS 2014-11-21 11:33:16 +08:00
Rajesh Taneja
2ca7f4e649 MDL-48063 behat: Fixed JS Exception
M is not created on all pages, like cron and
Steps which check for exported data. So we need
to ensure M is defined, before using it in
behat_hooks::wait_for_pending_js()
2014-11-21 11:01:35 +08:00
Jetha Chan
a71d9d28b7 MDL-48288 gradebook: fix floating footer exception when averages disabled
The code we use to update styles on floating elements did not account for
situations where those floating elements don't exist. This was discovered
when a test site didn't have column averages enabled, resulting in no
floating footer element being created, so when _handleScrollEvent was
fired the first time, a null reference exception was thrown trying to
apply styles to a non-existent element.
2014-11-21 11:00:51 +08:00
Rajesh Taneja
8d85156db7 MDL-48302 behat: Reverted temp fix added by MDL-48251 2014-11-21 10:39:42 +08:00
Jonathon Fowler
ee4b11e0a6 MDL-25763 tool_replace: cli version 2014-11-21 10:38:04 +08:00
Jetha Chan
d8389cd6f8 MDL-47329 mod_book: missing RTL styles, added page body selectors 2014-11-21 10:34:24 +08:00
Jetha Chan
15b3c4e0a4 MDL-47329 mod_book: use embedded pagetype instead of hardcoded HTML 2014-11-21 10:34:24 +08:00
Rajesh Taneja
ab25d8a7f7 MDL-48302 behat: Reset all data, before starting behat suite 2014-11-21 10:23:07 +08:00
Rajesh Taneja
97d0445a7b MDL-48302 behat: Make sure to clear php file cache 2014-11-21 10:22:56 +08:00
Rajesh Taneja
ef1d45b394 MDL-48302 behat: Reset cache before scenario 2014-11-21 10:22:56 +08:00
Sam Hemelryk
32bc89811c MDL-36236 cache: clarified locking strings
We copy the cachedef_locking string as that cache definition is
used for locking and its name is more than likely the descriptive
word we are looking for.

AMOS BEGIN
  CPY [cachedef_locking,cache],[locking,cache]
AMOS END
2014-11-21 11:33:07 +13:00
Petr Skoda
89e9321f96 MDL-47834 auth: Allow enforcing of login limits 2014-11-21 10:00:01 +13:00
Petr Skoda
f720c2c060 MDL-48282 Standardise update of user->firstaccess 2014-11-21 09:25:57 +13:00
Kordan
2313504186 MDL-46618 tool_xmldb: added styles_bootstrapbase.css 2014-11-20 10:40:32 +01:00
Dan Poltawski
ca0e301c7b weekly release 2.9dev 2014-11-20 08:38:12 +00:00
Dan Poltawski
796f50a8d4 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-11-20 08:38:09 +00:00
Dan Poltawski
17d4ff23ee Revert "MDL-46531 Make atto foreground colors and background colors configurable"
This reverts commit cb6e1d5270.

This reverts commit 7a5e605424, reversing
changes made to 7b9fb265d2.

This reverts commit 06404b0118, reversing
changes made to 0f87473fed.

Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-11-20 07:04:41 +00:00
Dave Cooper
0a6a254351 MDL-41155 Lesson: Fixed multiple question attempts logic
Thanks to Rajneel Totaram for providing this patch.
2014-11-20 14:43:12 +08:00
Dave Cooper
22cd6b3c8b MDL-41155 Lesson: Added behat tests for multiple question attempts 2014-11-20 14:42:11 +08:00
Sam Hemelryk
11b5e41b0c NOBUG: fixed commit message typo 2014-11-20 16:47:33 +13:00
Andrew Nicols
cb6e1d5270 MDL-46531 editor_atto: fontcolor -> backcolor 2014-11-20 10:46:04 +08:00
Sam Hemelryk
53623a70f0 MDL-26226 course: new setting for sections as links
This commit adds a new setting to always display course sections
as links (if possible).
2014-11-20 15:41:24 +13:00
Sam Hemelryk
9915109268 MDL-48304 moodle_url: compare now considers anchor 2014-11-20 15:38:34 +13:00
Adrian Greeve
b49964f7fc MDL-48252 scheduled tasks: Unit test for file_temp_cleanup_task. 2014-11-20 10:35:47 +08:00