mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 15:10:05 +01:00
Code Issues Projects Releases Wiki Activity
70,277 Commits 36 Branches 527 Tags
Commit Graph

70277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
852ff0372f MDL-47499 tasks: Scheduled tasks custom schedule is reset on upgrade. 
Add a unit test for reset_scheduled_tasks_for_component and make sure it doesn't clear
customised schedules for existing tasks.
 2014-10-14 14:59:24 +08:00
Dan Poltawski
ec72585d64 Merge branch 'MDL-47603' of git://github.com/timhunt/moodle 2014-10-13 13:33:56 +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
42b0ce301d Merge branch 'wip-MDL-46546-master' of git://github.com/abgreeve/moodle 2014-10-13 10:57:17 +01:00
Dan Poltawski
7c50998039 Merge branch 'MDL-47140-master' of git://github.com/gurgus/moodle 2014-10-13 09:54:02 +01:00
Dave Cooper
b6da971b4a MDL-47140 editor_atto: Improved error handling 2014-10-13 10:51:17 +08:00
Adrian Greeve
a2809ae2c9 MDL-46546 core_grades: Notice display for bad import. 
If the initial import of csv data is bad, a notification
will be displayed to the user.
 2014-10-13 10:36:38 +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
Tim Hunt
84b45a24a1 MDL-47603 quiz edit: qbank popup preview icon needs new window 
Also, ensure that clicking the + icon adds the question on the right
page.

Bit of this fix are a bit hacky, but we have to deal with the fact there
is not a good general solution to MDL-47604.
 2014-10-10 13:40:16 +01:00
Dan Poltawski
d3ff82257e Moodle release 2.8beta 
jabber bot fighting edition.
v2.8.0-beta 		2014-10-10 12:09:33 +01:00
Dan Poltawski
54f2db7226 NOBUG: Fixed file access permissions 2014-10-10 12:09:18 +01:00
Dan Poltawski
fe272dee55 NOBUG: Fixed SVG browser compatibility 2014-10-10 12:09:15 +01:00
Dan Poltawski
0a96a3e0d6 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-10-10 12:09:14 +01:00
Tim Hunt
8ac5c115e0 MDL-43089 quiz editing: don't pop up qbank on initial page load. 2014-10-10 11:00:12 +01:00
Dan Poltawski
fd93980a1c Merge branch 'wip-MDL-46576-master-upgrade-fix' of https://github.com/abgreeve/moodle 2014-10-10 09:20:30 +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
Helen Foster
7c8edb452e MDL-40351 course overview block: improved strings 2014-10-10 08:30:58 +01:00
Andrew Nicols
72ece42858 MDL-46658 gradereport_grader: Remove max-width for RTL 
For some reason, Safari behaves incorrectly when dealing with RTL content
where the table has a max-width of 100%.

This issue is a part of the MDL-25544 Epic.
 2014-10-10 12:24:03 +08:00
Andrew Nicols
1bd4817ada MDL-46658 gradereport_grader: Fix minor RTL style issues 
This issue is a part of the MDL-25544 Epic.
 2014-10-10 11:20:44 +08:00
Andrew Nicols
b55d37f08b MDL-46658 gradereport_grader: Style the ajax editing error 
This issue is a part of the MDL-25544 Epic.
 2014-10-10 10:29:16 +08:00
Andrew Nicols
1e646afd3c MDL-47353 gradereport_grader: Only respect fixed headers 
Even if the navbar is in a static header, it should only be respected if it
is fixed still.

This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
 2014-10-10 09:02:57 +08:00
Tim Hunt
aec2a725a8 MDL-43089 quiz editing: fix some qbank popup JS issues. 2014-10-09 17:22:22 +01:00
AMOS bot
e9c2a84708 Automatically generated installer lang files 2014-10-10 00:05:27 +08:00
Tim Hunt
ad6a1455a4 MDL-43089 quiz editing: fix RTL 
As part of this, I tweaked the LTR style a bit, in a way that is both an
improvement (I hope) and also to reduce the amount of RTL-specific code
required. (Thanks to Fred for spotting some of the problems.)

Also, I changed one course style in boostrapbase, where the RTL rule was
different from the LTR rule.

Finally, I saw some repeated RTL rules in the quiz styles.css, and so
eliminated the the duplicate rules.
 2014-10-09 16:34:38 +01:00
Dan Poltawski
68cf8d118e Merge branch 'MDL-46481-master-fixup' of https://github.com/FMCorz/moodle 2014-10-09 12:16:43 +01:00
Frederic Massart
fef943738d MDL-46481 backup: Ensure one-click backup is not displayed on restore 2014-10-09 18:45:32 +08:00
Dan Poltawski
15ba6a0ded Merge branch 'MDL-47556' of git://github.com/timhunt/moodle 2014-10-09 10:54:19 +01:00
Marina Glancy
6fd0b781e1 MDL-36014 cohorts: fix error in SQL query 2014-10-09 15:33:49 +08:00
Dan Poltawski
0993f24df0 Merge branch 'MDL-47509' of https://github.com/stronk7/moodle 2014-10-09 07:13:18 +01:00
Dan Poltawski
0835816f9e Merge branch 'MDL-46647-master' of git://github.com/FMCorz/moodle 2014-10-09 07:05:09 +01:00
Damyon Wiese
2b187a479e MDL-46921 User: Add @core_user to new behat test. 2014-10-09 11:20:44 +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