moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68220 commits 37 branches 540 tags 1.3 GiB
Commit graph

68220 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
d0144cd38e Merge branch 'MDL-44972-master' of git://github.com/damyon/moodle 2014-05-05 17:17:11 +08:00
Marina Glancy
b9c5bae5b1 Merge branch '45231-27-2' of git://github.com/samhemelryk/moodle 2014-05-05 17:16:52 +08:00
Damyon Wiese
c1660772b1 MDL-44972 Atto dialogues: Change M.core.dialogue attribute name to "focusOnShowSelector" 
And some minor cleanups.
 2014-05-05 16:27:36 +08:00
Ankit Agarwal
5793538a59 MDL-45409 conditional_activity: Do not iterate over deprecated properties 2014-05-05 16:26:35 +08:00
Marina Glancy
16feb870d4 Merge branch 'MDL-45357_master' of git://github.com/markn86/moodle 2014-05-05 16:09:53 +08:00
Mark Nelson
c5cfb3ca98 MDL-45357 events: changed event descriptions to ensure consistency in core 2014-05-05 00:55:50 -07:00
Damyon Wiese
e5ddec38cd MDL-44972 Atto: Focus on the first input field in forms in dialogues. 2014-05-05 15:21:11 +08:00
Damyon Wiese
2372366f58 MDL-44224: outdent plugin - handle divs that have been silently switched for ps 
Also - fix a shifter warning.
 2014-05-05 14:07:02 +08:00
Sam Hemelryk
b16c2ec5c8 MDL-44224 atto_indent: converts blockquotes to div indents 2014-05-05 14:07:01 +08:00
Ankit Agarwal
2b34a377ea MDL-45201 recent_activity: Fix set type notice in recent activity form 2014-05-05 13:29:51 +08:00
Damyon Wiese
3917871e90 Merge branch 'MDL-45290-master' of git://github.com/jethac/moodle 2014-05-05 10:43:15 +08:00
Damyon Wiese
7da3113b7b Merge branch 'MDL-45382-master' of git://github.com/FMCorz/moodle 2014-05-05 10:35:28 +08:00
Marina Glancy
a128a24fca Merge branch 'wip-MDL-45127-master' of git://github.com/abgreeve/moodle 2014-05-05 10:18:03 +08:00
Sam Hemelryk
31a8eddc24 MDL-45231 theme_clean: default navbar to absolute when running behat 2014-05-05 08:11:46 +12:00
Dan Poltawski
0401143193 Moodle release 2.7rc1 2014-05-02 17:41:54 +08:00
Dan Poltawski
94d5dc0b98 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-05-02 17:41:51 +08:00
Adrian Greeve
028f535fd9 MDL-45127 mod_lesson: Behat test for reviewing a lesson. 2014-05-02 16:09:06 +08:00
Adrian Greeve
0aec842e58 MDL-45127 mod_lesson: Fixed reviewing lesson answers changing the lesson grade. 2014-05-02 16:09:06 +08:00
Adrian Greeve
20685b287d MDL-45127 mod_lesson: Updated question edit screen with more help text. 
Unless the custom scores is selected in the lesson settings the score section
in the question settings will be disabled. A help link has been added with
a description similar to this one.
 2014-05-02 16:09:05 +08:00
Dan Poltawski
f25e8c4133 Merge branch 'MDL-45054-master' of https://github.com/sammarshallou/moodle 2014-05-02 14:59:25 +08:00
Jetha Chan
73eb9f4339 MDL-45290 rubric: visual fixups 
Fixed up visual issues with rubric editor on Clean.
 2014-05-02 14:27:14 +08:00
Ankit Agarwal
200aeda661 MDL-34904 lti: Fix notice while using lti in frontpage 2014-05-02 14:05:13 +08:00
Andrew Nicols
e30506416b MDL-45338 editor_atto: Check for selection changes on touch-based devices too 2014-05-02 14:03:16 +08:00
Frederic Massart
ad9353be73 MDL-44174 theme_clean: Updating information in readme file 2014-05-02 12:56:00 +08:00
Ankit Agarwal
f20ae2c5d6 MDL-45342 book: Automate MDLQA-2423 - A teacher can create book chapters and subchapters 2014-05-02 12:13:42 +08:00
Frederic Massart
16c6440dcb MDL-45382 atto_link: Missing context when finding anchors 2014-05-02 12:02:36 +08:00
Andrew Davis
08b90682e4 MDL-45314 core_grade: a JS fix for the grader report 2014-05-02 11:13:45 +08:00
Marina Glancy
e2c3c3e080 Merge branch 'MDL-45237-master' of git://github.com/danpoltawski/moodle 2014-05-02 11:13:06 +08:00
Dan Poltawski
39f332972b Merge branch 'MDL-45362-master' of https://github.com/sammarshallou/moodle 2014-05-02 10:59:29 +08:00
Dan Poltawski
eb72c1ff05 Merge branch '44729-27' of git://github.com/samhemelryk/moodle 2014-05-02 09:44:49 +08:00
Sam Hemelryk
09d5cfadc5 MDL-44729 theme_bootstrapbase: override the maintenance renderer 
This patch overrides the maintenance renderer in the bootstrapbase
theme in order to override the notification method in the same way
we override the core renderer notification method.
This ensures now that clean is standard that notifications during
maintenance tasks (install, upgrade etc) look pretty.
 2014-05-02 13:42:22 +12:00
AMOS bot
2d5ffd51ed Automatically generated installer lang files 2014-05-02 00:39:03 +00:00
sam marshall
1710973161 MDL-45376 Completion: Form locking is still not working right 
On submit of the form, it called 'freeze' on the completion-related
fields (even though they shouldn't have been frozen because you
already clicked the unlock button).
 2014-05-01 18:08:46 +01:00
Marina Glancy
3409fac5ef Merge branch 'MDL-45273' of git://github.com/timhunt/moodle 2014-05-01 21:17:01 +08:00
Marina Glancy
097efb8b41 Merge branch 'wip-MDL-43557-master' of https://github.com/abgreeve/moodle 2014-05-01 21:16:47 +08:00
sam marshall
f67dd62820 MDL-45054 Conditional availability: HTML structure improvements 
1. Changed the 'delete' and 'eye' buttons to use an <a> link
tag so that it works without custom tabindex and shows a correct
mouse cursor. This also reduces the code slightly.

2. Changed the Cancel button on the dialog to use the mdl-align
class which is used in Atto dialogs. This results in the button
being centered, consistent with those dialogs.
 2014-05-01 12:22:38 +01:00
sam marshall
a3a2423982 MDL-45362 Availability: Behat test fails on first of month 2014-05-01 11:18:06 +01:00
Tim Hunt
0e8fe7de3d MDL-45273 quiz fixup settings initialisation. 2014-05-01 11:09:05 +01:00
Adrian Greeve
6522afdfa4 MDL-43557 events: Update of webservice function called string. 2014-05-01 18:00:39 +08:00
Dan Poltawski
bff7fab342 Merge branch 'MDL-36836-master' of git://github.com/jethac/moodle 2014-05-01 16:34:21 +08:00
Damyon Wiese
6e4c18522d Revert "MDL-45239 editor_atto: The editor cannot be active if it is not the active element" 
This reverts commit 05a7f9e749.
 2014-05-01 16:22:41 +08:00
Jetha Chan
13e118ca65 MDL-36836 filepicker: alfresco select box fix 
Adjusted position of alfresco select box; amended border/background application in base.
 2014-05-01 16:08:02 +08:00
Dan Poltawski
066f0395a6 Merge branch 'MDL-45365-master' of git://github.com/damyon/moodle 2014-05-01 14:52:02 +08:00
Dan Poltawski
9d39960028 Merge branch 'MDL-43570' of https://github.com/KristerV/moodle 
Conflicts:
	version.php
 2014-05-01 14:43:22 +08:00
Dan Poltawski
c6b8b0a827 MDL-45237 report_loglive: prevent debug warnings 
The use of $PAGE necessitates the $PAGE params to be set. Really
the url shouldn't be necessary for this scenario as its enforced for
things like redirects. But this is the quick fix to keep our logs
clean.
 2014-05-01 14:21:41 +08:00
Marina Glancy
cb3cc79c82 Merge branch 'MDL-44398-master' of git://github.com/ankitagarwal/moodle 2014-05-01 14:21:39 +08:00
Damyon Wiese
6a20bfa06d MDL-45365 Courselib unit tests: cmid -> instanceid confusion 
Yet again an instanceid is being passed instead of a cmid.
 2014-05-01 14:00:40 +08:00
Dan Poltawski
5090038929 MDL-43319 phpdoc: fix too much ham consumption by developers 2014-05-01 13:34:20 +08:00
Andrew Nicols
0ef60744c3 MDL-45359 JS: Only change mask zIndex on modal dialogues 
When dealing with a non-modal dialogue within a modal dialogue, we should
not update the z-index of the underyling maskNode as it does not belong to
this dialogue.
 2014-05-01 12:33:44 +08:00
Damyon Wiese
0c3e0f4752 Merge branch 'MDL-45329-master' of git://github.com/andrewnicols/moodle 2014-05-01 12:29:55 +08:00