moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70291 commits 37 branches 544 tags 1.3 GiB
Commit graph

70291 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Sam Hemelryk
ec39530d5f Merge branch 'wip_MDL-47477_m28_jqueryuitheme' of https://github.com/skodak/moodle 2014-10-08 14:35:02 +13:00
Andrew Nicols
7feac0aab6 MDL-46658 gradebook: Fix gradebook behat tests 
This issue is a part of the MDL-25544 Epic.
 2014-10-08 09:31:57 +08:00
Sam Hemelryk
6d3b83b9b4 Merge branch 'wip_MDL-47303_m28_jquery' of https://github.com/skodak/moodle 2014-10-08 14:31:40 +13:00
Sam Hemelryk
76d9337ced Merge branch 'MDL-47301-master' of git://github.com/FMCorz/moodle 2014-10-08 14:10:50 +13:00
Sam Hemelryk
9311301f44 Merge branch 'wip-MDL-47299-master' of git://github.com/marinaglancy/moodle 2014-10-08 14:07:57 +13:00
Eloy Lafuente (stronk7)
278432258f MDL-47509 Profile restriction: More oracle/text fixes 
1) Get rid of "uid" that is a reserved word.
2) Add cross-db support for text columns in the get_condition_sql() method
   by adding a new, defaulting to false for BC param and intensively using
   the sql_compare_text() helper to build the correct sql fragments.
 2014-10-08 01:45:29 +02:00
sam marshall
9634c60e7b MDL-47509 Profile restriction: Broken Oracle causes problem 2014-10-08 01:45:28 +02:00
Sam Hemelryk
252bd39983 Merge branch 'MDL-47470-master' of git://github.com/danpoltawski/moodle 2014-10-08 12:21:31 +13:00
Sam Hemelryk
ba2f9a9695 Merge branch 'MDL-47132' of git://github.com/timhunt/moodle 2014-10-08 12:01:42 +13:00