mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 00:12:42 +02:00
Code Issues Projects Releases Wiki Activity
66,424 Commits 36 Branches 529 Tags
Commit Graph

66424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
52b7e8aa58 Merge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/moodle 2014-02-10 14:53:51 +13: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
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
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
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
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
Matt Petro
74b3c4e58c MDL-44029 mod_quiz: Fixing group deleted handler so it does not remove user overrides. 2014-02-06 13:32:04 -05:00
Andrew Nicols
fd2e73abef MDL-43687 Javascript: Correct instantiation of the question-preview 
This addresses issues discovered during testing, including:
* inclusion of the M.core_question_preview metadata;
* inclusion of required strings; and
* correcting a function signature.
 2014-02-06 13:55:27 +08:00
Russell Smith
42e34c2882 MDL-43926 files: Unit tests cannot assume id values. 2014-02-06 09:34:56 +08:00
Sam Hemelryk
37a079acb5 Merge branch 'MDL-43936' of git://github.com/timhunt/moodle 2014-02-06 10:04:04 +13:00
Eric Merrill
51ec2e451f MDL-43946 gradebook upgrade Improve SQL to find duplicate sortorders. 2014-02-05 09:56:34 -05:00
Tim Hunt
c2f35e0b22 MDL-43936 questions: fix my lame spelling in upgrade.txt. 
Thanks to Mark Nelson for the suggested improvements.
 2014-02-05 11:23:42 +00:00
Marina Glancy
7f34b8e135 Merge branch 'MDL-42339' of git://github.com/rwijaya/moodle 2014-02-05 15:56:30 +08:00
Rossiani Wijaya
8c6ca6961a MDL-42339 - removed double formatting for set_title() and set_heading() 2014-02-05 14:47:23 +08:00
Dan Poltawski
6c704b1534 MDL-42882 upgrade: Improvements to upgrade code 
Suggested by Petr:
* Don't rely on single user for upgrade
* Make the pathnamehash generation a bit clearer (and add
  a test to verify its correctly formed).
 2014-02-05 14:38:39 +08:00
Marina Glancy
a76edd4961 MDL-42425 assign: bumping version for new web services to take effect 2014-02-05 14:32:27 +08:00
Marina Glancy
c71b7b7c44 Merge branch '38923-27' of git://github.com/samhemelryk/moodle 2014-02-05 12:49:02 +08:00
Sam Hemelryk
ee729af1e4 MDL-38923 theme_bootstrapbase: pre-integration fixups 
* Fixed the way we added the block class to the dock panel in dock.js
* Added a class to the h2 that is used to test dock title width
* Fixed RTL alignment issues as best I could at present
* Fixed overlap of dock + navbar on small screens
* Fixed the docked block width to be constrained to the available space
* Fixed hidden actions on docked blocks
 2014-02-05 15:07:44 +13:00
Sam Hemelryk
d9fece93d0 Merge branch 'MDL-41757-master' of https://github.com/jamiepratt/moodle 2014-02-05 12:36:52 +13:00
Sam Hemelryk
8213574043 Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2014-02-05 12:35:11 +13:00
Eloy Lafuente (stronk7)
9433b01c94 Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle 2014-02-04 23:56:27 +01:00
Sam Hemelryk
3ec0946e10 Merge branch 'MDL-43027-master' of git://github.com/jamiepratt/moodle 2014-02-05 11:44:49 +13:00
Sam Hemelryk
13de6099c1 Merge branch 'MDL-43952-master' of git://github.com/andrewnicols/moodle 2014-02-05 11:29:32 +13:00
Sam Hemelryk
abaae2a548 MDL-38923 dock: allowed for space before first time 2014-02-05 11:21:09 +13:00