mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 11:02:38 +01:00
Code Issues Projects Releases Wiki Activity
71,786 Commits 36 Branches 527 Tags
Commit Graph

19606 Commits

Author SHA1 Message Date
Dan Poltawski
1d9eb92ff3 Merge branch 'MDL-45867-master' of https://github.com/dthies/moodle 2014-11-24 17:11:14 +00:00
Dan Poltawski
1d79061651 Merge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle 2014-11-24 16:29:25 +00:00
Dan Poltawski
e378e6b397 Merge branch 'wip-mdl-48063' of https://github.com/rajeshtaneja/moodle 2014-11-24 12:03:14 +00:00
Dan Poltawski
927da85285 Merge branch 'wip-mdl-48302' of https://github.com/rajeshtaneja/moodle 2014-11-24 11:56:56 +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
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
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
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
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
Petr Skoda
89e9321f96 MDL-47834 auth: Allow enforcing of login limits 2014-11-21 10:00:01 +13: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
Andrew Nicols
cb6e1d5270 MDL-46531 editor_atto: fontcolor -> backcolor 2014-11-20 10:46:04 +08: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
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
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
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
Andrew Nicols
494cf9b81c MDL-23839 navigation: Check for assignable course category roles 2014-11-19 08:54:53 +08:00
Sam Hemelryk
a74d4743e1 MDL-33606 event: moved upgrade notice 2014-11-19 09:38:55 +13:00
Sam Hemelryk
469c32955a Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle 2014-11-19 09:37:19 +13:00
Daniel Thies
3086c8cedb MDL-45867 atto_equation: Change preview update to asynchronous 2014-11-18 13:26:13 -06:00
Dan Poltawski
eb0acfa311 Merge branch 'wip_MDL-47800_m28_pwchange2' of git://github.com/skodak/moodle 2014-11-18 16:32:57 +00:00
Dan Poltawski
c8b01e0c7d Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle 
Conflicts:
	mod/book/version.php
	mod/book/db/upgrade.php
 2014-11-18 13:54:05 +00:00
Dan Poltawski
39da77774a Merge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle 2014-11-18 10:15:06 +00:00
Adrian Greeve
767d01cf39 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-18 14:17:24 +08:00
Eloy Lafuente (stronk7)
ea1720be99 Merge branch '48070-29' of git://github.com/samhemelryk/moodle 2014-11-18 03:41:28 +01:00
Petr Skoda
8064168e3c MDL-47803 Add report that lists user sessions 2014-11-18 13:55:11 +13:00
Sam Hemelryk
06404b0118 Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 10:48:31 +13:00
Sam Hemelryk
699f60c6f7 MDL-48070 navbar: ensure navigation initialised 2014-11-18 09:55:36 +13:00
Petr Skoda
866f03de46 MDL-47800 auth: Add option to logout on pw change 2014-11-18 09:51:52 +13:00
Daniel Thies
8bca3609ee MDL-48064 atto_editor: Expand event subscription for saving selection 2014-11-17 11:15:45 -06:00
Dan Poltawski
b4dd8e28cd Merge branch '48070-29' of git://github.com/samhemelryk/moodle 2014-11-17 16:22:26 +00:00
Tim Hunt
1b49f31df2 MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.6 2014-11-17 15:55:22 +00:00
Dan Poltawski
296e292413 Merge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle 2014-11-17 15:20:17 +00:00
Tim Hunt
4c3c1b5169 MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.1 2014-11-17 15:19:56 +00:00
Dan Poltawski
96ac6cb964 Merge branch 'MDL-42756' of git://github.com/aolley/moodle 2014-11-17 13:52:39 +00:00
Dan Poltawski
bb4013f5c7 Merge branch 'MDL-43987-master' of git://github.com/xow/moodle 2014-11-17 13:17:40 +00:00
Dan Poltawski
a020ddecf0 Merge branch 'MDL-46640-master' of git://github.com/FMCorz/moodle 2014-11-17 12:52:35 +00:00
David Monllao
d931574ff9 MDL-33606 course: Adding section info to course_viewed log 
Also changing references to section id to
section number, that it is what it really is.
 2014-11-17 15:18:18 +08:00
Frederic Massart
0209a85704 MDL-46640 navigation: Handle block contexts within a category 2014-11-17 12:41:41 +08:00
John Okely
c2a9bb3a9d MDL-43987 core: Remove port numbers in cleanremoteaddr 2014-11-17 09:48:26 +08:00