mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity
70,451 Commits 37 Branches 536 Tags
Commit Graph

70451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
2b187a479e MDL-46921 User: Add @core_user to new behat test. 2014-10-09 11:20:44 +08:00
Marina Glancy
8c2fc797a0 MDL-47583 atto_managefiles: correctly decode filename 2014-10-09 10:59:33 +08:00
Marina Glancy
c84d8cc452 MDL-47583 tinymce_managefiles: correctly decode filename 2014-10-09 10:59:21 +08:00
Sam Hemelryk
71900d9202 Merge branch 'MDL-47194-master-fixes' of git://github.com/andrewnicols/moodle 2014-10-09 15:44:04 +13:00
Andrew Nicols
262abe63fd MDL-46284 tool_messageinbound: Fail with warning if handler disabled 
If a handler is disabled, the user should be informed of this issue.

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-10-09 10:40:38 +08:00
Damyon Wiese
e6b00f032d Merge branch 'wip-MDL-46921-master' of git://github.com/abgreeve/moodle 2014-10-09 09:57:58 +08:00
Adrian Greeve
28127d8897 MDL-46921 lib: behat tests for alternate name sorting. 2014-10-09 08:19:49 +08:00
Adrian Greeve
95065006c6 MDL-46921 lib: Sorting on additional fields, admin, enrolment pages. 2014-10-09 08:19:49 +08:00
Adrian Greeve
e622b1a14b MDL-46921 lib: Update get_all_user_name_fields() plus unit tests. 2014-10-09 08:07:44 +08:00
Adrian Greeve
143aacaea0 MDL-46921 lib: Add sorting on additional name fields 
A thank you to Yishe Choden for creating a patch for this issue.
 2014-10-09 08:07:44 +08:00
Sam Hemelryk
b92a7dd0d8 Merge branch 'MDL-46984_master' of https://github.com/markn86/moodle 2014-10-09 09:16:40 +13:00
Sam Hemelryk
9ff13804e5 Merge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-09 08:51:40 +13:00
Dan Poltawski
66689366a0 Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/grade.less
	theme/bootstrapbase/style/moodle.css
 2014-10-08 15:49:58 +01:00
Dan Poltawski
da88accb5f Merge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle 2014-10-08 15:33:46 +01:00
Dan Poltawski
aeb47dd84a Merge branch 'MDL-47536' of git://github.com/stronk7/moodle 2014-10-08 15:24:14 +01:00
Damyon Wiese
d55b326cbc Merge branch 'wip-mdl-46987' of https://github.com/rajeshtaneja/moodle 2014-10-08 22:00:20 +08:00
Dan Poltawski
ea594eb10e Merge branch 'MDL-47084-master' of git://github.com/jleyva/moodle 2014-10-08 14:43:13 +01:00
Damyon Wiese
6b58a6a445 Merge branch 'MDL-46458-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2014-10-08 21:14:39 +08:00
Marina Glancy
a351493846 Merge branch 'MDL-47298-master' of git://github.com/FMCorz/moodle 2014-10-08 19:58:43 +08:00
Tim Hunt
d7a2a11e67 MDL-47497 qformats gift and xml: basic test of export. 
Really, this is just to test the new behat setps, as much as anything.

Note that the details of what is written to the export files is tested in
the unit tests.
 2014-10-08 19:43:10 +08:00
Tim Hunt
cb7db63b5d MDL-47497 behat: steps for basic download testing. 
These steps were created by sam marshall and Jes Ackland-Snow at the Open
University. I just altered them to make them a bit more generic, and
submitted them to Moodle core, at the point when I wanted to reuse them
in another plugin.

This commit introduces two new steps:

Then following "XXX" should download "YY" bytes
Then following "XXX" should download between "YY" and "ZZ" bytes

At the moment, this only works for links with href attributes.
 2014-10-08 19:43:09 +08:00
Marina Glancy
885b889dc0 MDL-47297 libraries: upgrade note about Google API update 2014-10-08 19:22:14 +08:00
Frederic Massart
28cdc0439f MDL-47297 repository_googledocs: Use the newer Google API 2014-10-08 19:15:09 +08:00
Frederic Massart
27bd4e4b86 MDL-47297 libraries: Update Google API to v1.0.5-beta 2014-10-08 19:15:00 +08:00
Dan Poltawski
8b2d52b88d Merge branch 'MDL-47389-master' of git://github.com/jleyva/moodle 2014-10-08 11:08:29 +01:00
Dan Poltawski
73c07a7c97 Merge branch 'MDL-45893-master-fixup' of https://github.com/FMCorz/moodle 2014-10-08 10:42:20 +01:00
Dan Poltawski
f2b4b2ad3c MDL-46658 - fix trailing whitespace 2014-10-08 10:28:31 +01:00
Dan Poltawski
e462093201 Merge branch 'MDL-46658-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/grade.less
	theme/bootstrapbase/style/moodle.css
 2014-10-08 10:26:13 +01:00
Frederic Massart
dcb59c872c MDL-45893 my: Specifically follow My home from block in Behat tests 2014-10-08 16:59:41 +08:00
Damyon Wiese
e5d5bfdc4f Merge branch 'MDL-38540' of git://github.com/jmvedrine/moodle 2014-10-08 16:46:12 +08:00
Dan Poltawski
7b2945b847 Merge branch 'MDL-46284-master-fix' of git://github.com/andrewnicols/moodle 2014-10-08 08:54:07 +01:00
Dan Poltawski
006c84f3e7 Merge branch 'MDL-40697_master_alt_usergraded' of https://github.com/markn86/moodle 2014-10-08 08:39:31 +01:00
Andrew Nicols
a6019c2910 MDL-46284 tool_messageinbound: Handle checkboxes correctly 
When a checkbox is not checked, it does not submit in the form, therefore
this must be an !empty() test instead of an (int) casting.

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-10-08 15:19:17 +08:00
Marina Glancy
9f1088d482 MDL-47543 core_grades: behat changes, also MDL-47541 2014-10-08 15:03:37 +08:00
Marina Glancy
eb84b77923 MDL-47543 core_grades: improve navigation menu in grade administration 2014-10-08 15:03:36 +08:00
Marina Glancy
2be0d5c3ed MDL-47541 core_grades: hints about aggregation settings on setup page 
Also do not indicate 'Natural' aggregation method
 2014-10-08 15:03:32 +08:00
Frederic Massart
70e7b634e4 MDL-46481 backup: Reposition one-click backup button 2014-10-08 13:45:24 +08:00
Jean-Michel Vedrine
ce3cfc8f92 MDL-38540 Lesson: import images in question answers 2014-10-08 06:07:02 +02:00
Dan Poltawski
c5d4fd7ddf MDL-38106 lesson: fix tests introduced in MDL-32870 2014-10-08 11:51:21 +08:00
Marina Glancy
54f7d2d7f4 MDL-47572 libraries: modify unittest to avoid random timing fail 
Thanks to Nigel Cunningham
 2014-10-08 11:32:10 +08:00
Mark Nelson
ba8024665d MDL-40697 mod_*: fixed unit tests so they pass 2014-10-07 19:08:35 -07:00
Mark Nelson
828b71d845 MDL-40697 core: added unit test for grade_deleted event 2014-10-07 19:08:35 -07:00
Mark Nelson
b310c9a1fe MDL-40697 core: added more unit tests for the user_graded event 2014-10-07 19:08:35 -07:00
Mark Nelson
2e0b3490f0 MDL-40697 core_grades: trigger the grade_deleted event 2014-10-07 19:08:35 -07:00
Mark Nelson
acd25c133c MDL-40697 core_grades: trigger the user_graded event 2014-10-07 19:08:35 -07:00
Mark Nelson
c09e6fa3e3 MDL-40697 core_grades: removed existing user_graded event triggers 2014-10-07 19:04:10 -07:00
Mark Nelson
3419a38980 MDL-40697 core_grades: changed user_graded event name 2014-10-07 19:04:10 -07:00
Mark Nelson
b0f844388b MDL-40697 core: added grade_deleted event 2014-10-07 19:04:09 -07:00
Damyon Wiese
140f46a238 MDL-28484 Libraries: Update comments to suggest using new is_https() 2014-10-08 09:54:05 +08:00
Damyon Wiese
0d474cb2b4 Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle 2014-10-08 09:53:53 +08:00