mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-11 03:12:17 +02:00
Code Issues Projects Releases Wiki Activity
71,303 Commits 36 Branches 530 Tags
Commit Graph

71303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
9e921abaff Merge branch 'm29_MDL-48265' of https://github.com/totara/moodle 2014-11-25 09:42:46 +13:00
Sam Hemelryk
35ccccf368 Merge branch 'wip_MDL-48282_m29_firstaccess' of https://github.com/skodak/moodle 2014-11-25 09:39:33 +13:00
Sam Hemelryk
c7c397ca39 MDL-20365 auth_db: post integration tweaks 
* Fixes SQL indentation.
* Amended the new auth_dbsaltedcrypt string.
 2014-11-25 09:05:24 +13:00
Sam Hemelryk
9e9af6736a Merge branch 'MDL-20365_auth_db_salted_passwords' of https://github.com/MorrisR2/moodle 2014-11-25 08:19:04 +13:00
Dan Poltawski
1464bfe4be Merge branch '47832-29-removed' of git://github.com/samhemelryk/moodle 2014-11-24 17:29:33 +00:00
Dan Poltawski
1f182f95e7 Merge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle 2014-11-24 17:26:30 +00:00
Dan Poltawski
1d9eb92ff3 Merge branch 'MDL-45867-master' of https://github.com/dthies/moodle 2014-11-24 17:11:14 +00:00
Dan Poltawski
8030d84bbc Merge branch 'MDL-47601_master' of https://github.com/markn86/moodle 2014-11-24 17:02:09 +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
AMOS bot
58a582be9b Automatically generated installer lang files 2014-11-25 00:04:03 +08:00
Dan Poltawski
dca771127a Merge branch 'MDL-48274-master' of git://github.com/andrewnicols/moodle 2014-11-24 15:37:56 +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
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
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
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
Sam Hemelryk
74cb9073d0 Merge branch 'MDL-35494_master' of https://github.com/markn86/moodle 2014-11-24 10:06:00 +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
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
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
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