mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
71,218 Commits 36 Branches 519 Tags
Commit Graph

71218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Sam Hemelryk
6d84f28553 Merge branch 'MDL-48064-master' of https://github.com/dthies/moodle 2014-11-24 14:54:16 +13: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
Sam Hemelryk
74cb9073d0 Merge branch 'MDL-35494_master' of https://github.com/markn86/moodle 2014-11-24 10:06:00 +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
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
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
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
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
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
Rajesh Taneja
e1d138a74f MDL-46865 report_log: Fixed site name in behat step 2014-11-19 10:17:32 +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