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

66868 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
86702277af MDL-45154 user profiles: avoid redirection warnings 2014-04-17 14:53:44 +08:00
Frederic Massart
0c30255b32 MDL-42761 badges: Remove H2s from help popup 2014-04-17 12:46:42 +08:00
Andrew Nicols
422737c54e MDL-45119 editpdf: Do not load quick comments in read-only mode 2014-04-17 11:48:58 +08:00
Andrew Nicols
9bab08a4e6 MDL-45119 ajax: Correct use of COUNT in exception dialogue 2014-04-17 11:48:58 +08:00
Andrew Nicols
ab38ff96e5 MDL-45119 ajax: AJAX exceptions need a String in the Link 2014-04-17 11:48:57 +08:00
Sam Hemelryk
1a5748b258 Merge branch 'MDL-44616_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-17 08:52:10 +12:00
Sam Hemelryk
d947f5d08f Merge branch 'wip-MDL-45116-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_STABLE 2014-04-17 08:39:39 +12:00
Eloy Lafuente (stronk7)
1e1acdfa77 Merge branch 'MDL-45132-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-16 19:09:58 +02:00
sam marshall
9deb25b785 MDL-27459 Completion: When ratings off, disallow grade completion 
For activities that use ratings, there is no grade unless ratings
are enabled. The completion system still lets you select 'complete
when user gets a grade', which leads to later errors.

This change simply disables the 'completion on grade' field if
ratings are enabled for the activity, but not turned on in the form.
 2014-04-16 15:06:00 +01:00
Kevin Wiliarty
395d730013 MDL-45116: Workshop submission title displays behind author picture 2014-04-16 09:07:12 -04:00
Frederic Massart
40cf8f62b9 MDL-45132 curl: Unit Tests for file uploads 2014-04-16 17:35:45 +08:00
Marina Glancy
65b84ebe7d Merge branch 'MDL-44951-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-16 14:45:00 +08:00
Dan Poltawski
8ce6a7dfd3 Merge branch 'wip-mdl-44977-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE 2014-04-16 14:35:01 +08:00
Frederic Massart
8fe97a4be4 MDL-41975 repository_alfresco: Updating details about Alfresco URL and timestamps 2014-04-16 13:57:09 +08:00
Michael Woods
0ca5c122aa MDL-41975 repository_alfresco: Ensure Moodle sends GMT time to Alfresco 2014-04-16 13:57:09 +08:00
Dan Poltawski
63a9c2522c Merge branch 'wip-mdl-44979-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE 2014-04-16 13:56:39 +08:00
Marina Glancy
29088f4bf5 Merge branch 'MDL-45081-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-16 11:52:16 +08:00
Dan Poltawski
9b7456b82e Merge branch 'MDL-44295_v26' of https://github.com/scyrma/moodle into MOODLE_26_STABLE 2014-04-16 11:39:50 +08:00
Damyon Wiese
edaf96a19a Merge branch 'MDL-43277-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-04-16 11:13:12 +08:00
Dan Poltawski
f588d0efad Merge branch 'MDL-44941-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-16 10:30:45 +08:00
Dan Poltawski
1c5bdb54b7 Merge branch 'MDL-45076-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-16 09:10:32 +08:00
Sam Hemelryk
5c3c27ac6a Merge branch 'w16_MDL-45100_m26_coursecontext' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-04-16 11:43:59 +12:00
Eloy Lafuente (stronk7)
1f405407fc weekly release 2.6.2+ 2014-04-15 16:33:02 +02:00
Frederic Massart
74b89ac031 MDL-44941 core: Removing irrelevant assertion causing failures 
The timemodified property is not called when the user logs in, and
so we should not be checking if its value matches the current time.
 2014-04-15 17:28:00 +08:00
David Monllao
be6583cfef MDL-44616 behat: Adding steps to test MDLQA-1709 and MDLQA-62 
- In an assignment with file submissions enabled,
  students can upload a set number of files.
- In assignments with file uploading enabled
  the Student can use File Picker to upload files.
 2014-04-15 16:03:54 +07:00
Petr Škoda
d6a3f86b2e MDL-45100 fix course_context classname PHPDdos typo in context API 2014-04-15 15:47:01 +08:00
Damyon Wiese
060c55b39a Merge branch 'w16_MDL-45098_m26_mariaenv' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-04-15 15:03:38 +08:00
Marina Glancy
28ff871c4a Merge branch 'MDL-45035-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE 2014-04-15 14:34:48 +08:00
Tony Levi
08ab12bd48 MDL-44908: Fix upgrade_grade_item_fix_sortorder performance 2014-04-15 14:27:54 +08:00
Nadav Kavalerchik
e3d3ed5afd MDL-40674 - Main menu's "sub menu" should open to the left in RTL mode (theme/clean , bootstrapbase) 2014-04-15 17:07:48 +12:00
Frederic Massart
5054d25aa2 MDL-45076 theme_bootstrapbase: Clean up participants controls LESS 
Conflicts:

	theme/bootstrapbase/style/moodle.css
 2014-04-15 12:21:00 +08:00
Frederic Massart
ea96ccb2e4 MDL-45076 theme_bootstrapbase: Select placement in participants page 
Usually the group selector is aligned with the label, but as we want
it to be consistent with the rest of the selects in the participants
page we need an override.

Conflicts:

	theme/bootstrapbase/style/moodle.css
 2014-04-15 12:20:58 +08:00
Jonathon Fowler
911d3e9f0b MDL-44270 files: handle drag-drop js error when event has null types 
This can happen when the 'dragover' event fires as has been observed
in Safari. When the dataTransfer.types property of the event is null,
accessing types.length throws a JavaScript error.
 2014-04-15 14:20:01 +10:00
Dan Poltawski
8240dc0f01 Merge branch 'MDL-45003-26' of git://github.com/jamiepratt/moodle into MOODLE_26_STABLE 2014-04-15 10:33:16 +08:00
Dan Poltawski
812bee0f4f Merge branch '44354-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-04-15 10:27:09 +08:00
Andrew Nicols
570affa81b MDL-43277 block_navigation: Trim from the left for long names 2014-04-15 10:25:48 +08:00
Petr Škoda
52e403c1a3 MDL-45098 backport support for MariaDB 10.x 
This will allow admins to verify 2.7 compatibility from existing 2.6 sites.
 2014-04-15 09:44:30 +08:00
Nadav Kavalerchik
50333ecb3b MDL-41891 Theme: Bullets and Numbering are missing from lists, When in RTL mode (theme/clean) 2014-04-15 11:27:58 +12:00
Frederic Massart
f984420e48 MDL-45081 curl: Prefer usage of CURLFile over @file arguments 2014-04-14 17:43:25 +08:00
Dan Poltawski
8939d65608 Merge branch 'wip-MDL-43719-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE 2014-04-14 15:23:18 +08:00
Petr Škoda
c4f6292cc8 MDL-45049 improve debugging output in error log for NO_DEBUG_DISPLAY scripts 2014-04-14 13:17:53 +08:00
Damyon Wiese
da4533bcd4 Merge branch 'MDL-44936-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-14 11:47:45 +08:00
Adrian Greeve
7a1d3e4db8 MDL-45037 gradebook: Allow dashes in xml grade values to be ignored. 
This was delivering an error message when trying to import an exported
xml file (from Moodle).
 2014-04-14 10:48:42 +08:00
Dan Poltawski
951ba5e8a6 Merge branch 'MDL-45048-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-14 10:02:01 +08:00
Mark Nelson
55a579c960 MDL-45071 mod_quiz: retrieve all the name fields when deleting a user override 2014-04-13 18:42:24 -07:00
Tim Lock
6769f7302b MDL-45012: Enable support for wma files within tinymce Moodle Media plugin 2014-04-14 08:32:11 +09:30
Andrew Nicols
b3cf6fa12a MDL-43145 dock: Enable regions before the drag operation starts 2014-04-13 18:27:09 +08:00
Sam Hemelryk
edb5a21285 MDL-43145 dock: fixed up region_completely_docked code to ignore empty regions 2014-04-13 18:27:00 +08:00
Gareth J Barnard
1f8f7aea0a MDL-45045 block theme: Fake blocks show empty region when editing and clicked. 
Conflicts:
	lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
 2014-04-11 13:17:05 +01:00
sam marshall
10d98c1b73 MDL-44991 Behat: step to check if attribute does not contain text 
The step checks that an attribute exists, but doesn't contain the
specified text.

Example:
Then the "class" attribute of "#mydiv" "css_element" should
not contain "accesshide"
 2014-04-11 11:26:46 +01:00