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

19241 Commits

Author SHA1 Message Date
Damyon Wiese
1a847ddaf8 Merge branch 'MDL-47646' of git://github.com/timhunt/moodle 2014-10-15 14:26:49 +08:00
Damyon Wiese
b51c2c4f8c Merge branch 'wip-MDL-47572-master' of git://github.com/marinaglancy/moodle 2014-10-15 13:58:32 +08:00
Damyon Wiese
5d70f2303a Merge branch 'wip-MDL-47583-master' of git://github.com/marinaglancy/moodle 2014-10-15 13:46:28 +08:00
Dan Poltawski
4f639ec86b Merge branch 'MDL-47463-master' of git://github.com/FMCorz/moodle 2014-10-14 19:11:57 +01:00
Dan Poltawski
1b07195b28 Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle 2014-10-14 19:00:28 +01:00
Dan Poltawski
3be2f6ac0b Merge branch 'MDL-47649' of git://github.com/timhunt/moodle 2014-10-14 13:14:19 +01:00
Helen Foster
a1b152f5db MDL-47140 atto: improved wording of error message 2014-10-14 12:20:58 +01:00
Marina Glancy
acab649e06 Merge branch 'MDL-47189-master-2nd' of git://github.com/FMCorz/moodle 2014-10-14 18:34:14 +08:00
Tim Hunt
a866538b9b MDL-47649 csvlib: must not leave files open 
I added a destructor to csv_import_reader ensure the file is closed.

I also ensured that the gradeimport_csv unit tests did not hold onto a
reference to the csv_import_reader object while the phpunit framework
tries to tidy up moodledata.

Finally, to stop CiBoT complaining, I fixed up the PHP4-style
declarations in the CSV import class.
 2014-10-14 10:36:25 +01:00
Frederic Massart
00fd3c1aad MDL-47189 my: Fix the addition of default blocks to my/ page 
Fixing the upgrade script so that they attach the new blocks
to the right my_pages entry. An upgrade script has also been
added to fix the existing bad data.
 2014-10-14 16:03:12 +08:00
Frederic Massart
09171b955e MDL-38732 gradereport_grader: Handle simultaneous graders 2014-10-14 13:52:42 +08:00
Tim Hunt
90048c7cfa MDL-47646 CURL redirect unit test: handle broken servers 2014-10-13 15:52:04 +01:00
Dan Poltawski
bb29fe900e Merge branch 'wip-MDL-46819-master' of git://github.com/abgreeve/moodle 2014-10-13 11:02:59 +01:00
Dan Poltawski
7c50998039 Merge branch 'MDL-47140-master' of git://github.com/gurgus/moodle 2014-10-13 09:54:02 +01:00
Frederic Massart
21dd684207 MDL-47463 core_grades: Behat checks the contribution of scales 2014-10-13 16:01:32 +08:00
Dave Cooper
b6da971b4a MDL-47140 editor_atto: Improved error handling 2014-10-13 10:51:17 +08:00
Adrian Greeve
0cf122171b MDL-46819 core_grades: Negative weights are changed to 0 
Negative weights in the natural aggregation are not currently permitted.
Any figure below zero is changed to a zero.
 2014-10-13 08:19:24 +08:00
Dan Poltawski
54f2db7226 NOBUG: Fixed file access permissions 2014-10-10 12:09:18 +01:00
Adrian Greeve
7970c21751 MDL-46576 core_grades: Fix upgrade to natural weight. 
When upgrading from 'Sum of grades' to natural aggregation the
weights were no automatically assigned and the grade totals were
wrong. This has now been rectified.
 2014-10-10 16:08:25 +08:00
Marina Glancy
6fd0b781e1 MDL-36014 cohorts: fix error in SQL query 2014-10-09 15:33:49 +08:00
Dan Poltawski
0835816f9e Merge branch 'MDL-46647-master' of git://github.com/FMCorz/moodle 2014-10-09 07:05:09 +01: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
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
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
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
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
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
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
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
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
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
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