71488 Commits

Author SHA1 Message Date
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 cb6e1d527093bb955946498850ef8a51276a13a4.

This reverts commit 7a5e6054248ef18f05a228ab0db4d05e5d782180, reversing
changes made to 7b9fb265d20e53580a64dcd2be8546ff5b49bd26.

This reverts commit 06404b01180a2965804fab9e47715fdc2b6bdfb4, reversing
changes made to 0f87473fed2da15a8ba72ac9a578734fe2548f10.

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
Sam Hemelryk
83bee88119 MDL-47832 cache: removed data source aggregate functionality
Cache data source aggregate functionality was found to be broken
and unused, because of this the decision was made to remove it
rather than fix it.
As it was broken we did not follow typical deprecation methods and
instead the code was removed outright with only structure
remaining and left deprecated.
2014-11-20 11:02:56 +13:00
Sam Hemelryk
2949dedcda MDL-43628 mod_assign: fixed formatting of statement 2014-11-20 10:18:28 +13:00
Eloy Lafuente (stronk7)
4067991016 Merge branch '48206-29' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-11-19 21:28:51 +01:00
Sam Hemelryk
7a5e605424 Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle 2014-11-20 09:12:14 +13:00
Rajesh Taneja
7b9fb265d2 MDL-48251 behat: Shuffling activity creation fix quiz behat 2014-11-19 20:07:07 +01:00
David Balch
112aed6035 MDL-9443 core_files: Also filter .xhtml resources.
Change the filters to treat .xhtml files the same as .html,
so they are filtered by both "All files" and "HTML files only".
2014-11-19 14:14:50 +00:00
Dan Poltawski
72e3cb9ad2 MDL-29585 wiki: fix unit test fails 2014-11-19 11:37:35 +00:00
Dan Poltawski
b4fc107a35 Merge branch 'MDL-29585-master-fixup' of https://github.com/FMCorz/moodle 2014-11-19 10:29:10 +00:00
Frederic Massart
414f7ef8ff MDL-29585 mod_wiki: Prevent broken links in editable sections
When a section name ended with a URL, the '<a' part of [edit] link
that is appended to the section was considered as part of the URL
in the section, thus causing the [edit] link to be broken.
2014-11-19 17:28:36 +08:00
Andrew Nicols
db97ff0ee6 MDL-46531 editor_atto: Handle a null selection better on colour change
Sadly, there is no easy way to do this. When a range is empty, we need to
create a new span, make the changes there, and then select it. Rangy does
not provide a helper to do this yet (will be in 1.3) so we have to do it
manually in the mean time.
2014-11-19 15:45:37 +08:00
Dan Poltawski
23842d8c50 Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle 2014-11-19 06:39:35 +00:00
Mario Wehr
772e9dc17e MDL-48274 mod_forum: Add missing context to has_capability call 2014-11-19 14:06:07 +08:00
Dan Poltawski
7417189dcc MDL-48276 qformat_xhtml: avoid uncessary html in .css file
In order to help automated tools move the html out of the css
file.
2014-11-19 05:55:59 +00:00
Andrew Nicols
ad5fe454df MDL-22043 mod_forum: Fix toggle subscription editing button behaviour
Update the user session property before generating the button which relies
upon it.
2014-11-19 13:31:54 +08:00
Rajesh Taneja
e1d138a74f MDL-46865 report_log: Fixed site name in behat step 2014-11-19 10:17:32 +08:00
Andrew Nicols
fc05c1b8e5 MDL-48197 testing: Normalise uses of noemailever and phpmailer sink 2014-11-19 09:09:50 +08:00
Andrew Nicols
556e3a9e8a MDL-48197 testing: Always set up a mail sink for mail redirection
Rather than setting noemailever in the bootstrap, this sets up a default
phpmailer message sink which will catch all messages.

Tests which require the phpmailer sink will continue to work as before
without change, though the noemailever config setting no longer needs to
be altered.

For tests wanting to test with noemailever set with the previous behaviour,
they will need to load the message sink and then close it.
2014-11-19 09:09:49 +08:00