mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
66,445 Commits 36 Branches 519 Tags
Commit Graph

66445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
7480dbc5f2 Merge branch 'MDL-42505-Feedback-Inappropriate-use-of-fieldset-tags-around-cancel-button' of git://github.com/michael-milette/moodle 2014-02-11 14:13:39 +08:00
Sam Hemelryk
b73fd8608a Merge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js
 2014-02-11 14:10:52 +13:00
Eloy Lafuente (stronk7)
16b2fc5913 Merge branch 'MDL-43338-master' of https://github.com/jamiepratt/moodle 2014-02-11 00:26:29 +01:00
Sam Hemelryk
696195afee Merge branch 'MDL-43994-im' of git://github.com/andrewnicols/moodle 2014-02-11 00:06:44 +01:00
Sam Hemelryk
39a0509b68 Merge branch 'MDL-43929' of git://github.com/timhunt/moodle 2014-02-11 08:27:35 +13:00
Eloy Lafuente (stronk7)
395988e433 Merge branch 'MDL-44053' of git://github.com/timhunt/moodle 2014-02-10 16:48:26 +01:00
Marina Glancy
396548fad4 Merge branch '43977-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-02-10 18:15:57 +08:00
Sam Hemelryk
72d953e19e Merge branch 'MDL-44059-master' of git://github.com/ankitagarwal/moodle 2014-02-10 15:58:36 +13:00
Ankit Agarwal
807241b991 MDL-44059 libraries: Add a method to return html for row instead of just printing it 2014-02-10 10:44:20 +08:00
Sam Hemelryk
c9f5f0afd3 Merge branch 'wip_master_mdl-32724' of https://github.com/iarenaza/moodle 2014-02-10 15:26:05 +13:00
Sam Hemelryk
0527e02390 Merge branch 'MDL-43774_master' of https://github.com/totara/openbadges 2014-02-10 15:21:41 +13:00
Sam Hemelryk
52b7e8aa58 Merge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/moodle 2014-02-10 14:53:51 +13:00
Andrew Nicols
26df91ca57 MDL-43941 Behat: Section visibility tests should not check if activities are visible 
It should be possible for activities to be visible even when the section
they are in is hidden.

However, when a section is hidden, all activities in that section are also
then initially hidden. Therefore, this commit splits out the hidden test to
a new test so that the initial state of activities after hiding can still
be tested.
 2014-02-10 09:36:05 +08:00
Andrew Nicols
db6e9aa8d3 MDL-43941 Course: Allow AJAX show/hide of activities in hidden and orphaned sections 2014-02-10 09:21:31 +08:00
Sam Hemelryk
1c8c3a6db1 Merge branch 'MDL-40938-27' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-02-10 14:16:12 +13:00
Sam Hemelryk
1cb3c0facc Merge branch 'MDL-43200' of git://github.com/apsdehal/moodle 2014-02-10 14:11:25 +13:00
Andrew Nicols
8892ec2b2d MDL-43994 Blocks: Hide the move icon when blocks are docked on Afterburner too 2014-02-10 08:50:29 +08:00
Sam Hemelryk
5e45f31d83 Merge branch 'MDL-42882-master' of git://github.com/danpoltawski/moodle 2014-02-10 13:12:57 +13:00
Sam Hemelryk
c6c9b1d799 MDL-44056 question: added new default property to unit tests 2014-02-10 12:56:36 +13:00
Sam Hemelryk
e9eb744f6d Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle 2014-02-10 11:32:13 +13:00
Sam Hemelryk
f0c4d4d22e Merge branch 'MDL-44056' of git://github.com/timhunt/moodle 2014-02-10 11:30:12 +13:00
Sam Hemelryk
cda0ebf042 Merge branch 'MDL-43838_master' of git://github.com/dmonllao/moodle 2014-02-10 11:27:00 +13:00
Sam Hemelryk
f10418699d Merge branch 'MDL-43969-master' of git://github.com/andrewnicols/moodle 2014-02-10 09:48:19 +13:00
Sam Hemelryk
db00b9c882 Merge branch 'MDL-43992-master' of git://github.com/andrewnicols/moodle 2014-02-10 09:40:13 +13:00
Sam Hemelryk
872b051fa3 Merge branch 'MDL-44020-MASTER' of git://github.com/jleyva/moodle 2014-02-10 09:30:57 +13:00
Sam Hemelryk
52aa25fd41 Merge branch 'MDL-44046' of https://github.com/merrill-oakland/moodle 2014-02-10 09:28:08 +13:00
Sam Hemelryk
fbf1f6fdea Merge branch 'MDL-43978_master' of https://github.com/totara/openbadges 2014-02-10 09:23:51 +13:00
Sam Hemelryk
002a736eee MDL-43994 theme_bootstrapbase: consistent commenting between themes 2014-02-10 09:10:20 +13:00
Sam Hemelryk
642ad27297 Merge branch 'MDL-43994-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-02-10 09:06:31 +13:00
Sam Hemelryk
98396c2327 MDL-43804 theme: amended upgrade.txt with more information 2014-02-10 09:04:54 +13:00
Sam Hemelryk
179ddd105b Merge branch 'MDL-43804-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-02-10 08:50:23 +13:00
Sam Hemelryk
705c5e0aed Merge branch 'MDL-44029-quiz-group-delete-handler-bug' of https://github.com/mpetrowi/moodle 2014-02-10 08:44:39 +13:00
Sam Hemelryk
065bc30c8d Merge branch 'MDL-43946' of https://github.com/merrill-oakland/moodle 2014-02-10 08:42:55 +13:00
Sam Hemelryk
2ea3e43342 MDL-43977 theme_bootstrapbase: small fix to make custom menu work with JS disabled 2014-02-10 08:37:06 +13:00
Tim Hunt
029870ee95 MDL-44053 question restore from 2.0: fix regression from MDL-43670 2014-02-09 17:49:03 +00:00
Tim Hunt
9a59691237 MDL-44056 questions: restore essay attempts from 2.0 notice. 2014-02-09 17:47:39 +00:00
Mary Evans
97080d53ee MDL-40938 theme_bootstrapbase: Fix for text fields in login block. 2014-02-09 00:45:46 +00:00
Tim Hunt
1eb470fc42 MDL-43929 question manual grading: keep comment when validation fails. 
If the validation failed, so the manual grading page was re-displayed
with a validation error, then any comment that had just been typed in
was getting lost. This fixes that.
 2014-02-07 21:55:05 +00:00
Eric Merrill
2f31de4515 MDL-44046 gradebook Reduce duplicates returned during sortorder fixing. 2014-02-07 09:29:12 -05:00
Juan Leyva
925f4d6b16 MDL-44020 Add core_calendar_get_calendar_events function to the moodle mobile core service 2014-02-07 12:23:33 +01:00
Andrew Nicols
e14e17029c MDL-43994 Blocks: Hide the move icon when blocks are docked 2014-02-07 17:39:36 +08:00
Andrew Nicols
7e804d0cb4 MDL-43992 Javascript: Remove <return> key listener for confirmation 
The listener was previously confirming, even when the cancel or 'No'
buttons were selected. However, having the default action as 'Confirm'
seems dangerous in this situation, so removing this option entirely.
 2014-02-07 16:35:49 +08:00
Andrew Nicols
d4e438718e MDL-43969 Forms: Adjust ARIA attributes for short forms 
The aria-live="polite" attribute is incorrectly added to the fieldset,
causing the entire fieldset to be read out on change in some browsers. This
is unnecessary.
It also does not announce the current state of the fieldset (collaped or
open) and should.
 2014-02-07 16:17:13 +08:00
Andrew Nicols
8659df93f9 MDL-43267 Javascript: Improve focus before and after drag/drop 2014-02-07 15:10:09 +08:00
James Pratt
c3e2e754dd MDL-43338 quiz statistics : refactoring question statistics code 
to improve readability and maintainability.
 2014-02-07 13:35:20 +07:00
Andrew Nicols
02839a35f0 MDL-43267 Javascript: Remove aria drag/drop related attributes for drag/drop 
Since we provide an alternative interface rather than describing the
locations for each drop, we should not add aria-grabbed, or
aria-dropeffect.
 2014-02-07 13:36:41 +08:00
Andrew Nicols
34bcc6a95c MDL-43267 Javascript: Improve accessibility of keyboard move 
Change the keyboard move descriptions to allow for more detailed
descriptions such as:
* "After 'X'"; or
* "To top of section 'Y'"
 2014-02-07 13:36:41 +08:00
Sam Hemelryk
974c2cdc03 weekly release 2.7dev 2014-02-07 11:46:00 +13:00
Sam Hemelryk
b1733dc795 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-02-07 11:45:55 +13:00
Yuliya Bozhko
3193b97e05 MDL-43978 badges: Fix lang string 2014-02-07 09:11:15 +13:00