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

19026 commits

Author SHA1 Message Date
Marina Glancy
2522b260e6 Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle 2014-04-16 14:42:15 +08:00
Dan Poltawski
c312e59e7d Merge branch 'wip-mdl-44979' of https://github.com/rajeshtaneja/moodle 2014-04-16 13:56:37 +08:00
Frederic Massart
935448edb1 MDL-41975 repository_alfresco: Updating details about Alfresco URL and timestamps 2014-04-16 13:47:24 +08:00
Michael Woods
e0c8ddba33 MDL-41975 repository_alfresco: Ensure Moodle sends GMT time to Alfresco 2014-04-16 13:46:50 +08:00
Andrew Nicols
234ead3461 MDL-44798 editor_atto: Backport a fix for HTML5Shiv 
This is a backport of the Rangy workaround for a bug in HTML5Shiv, which
breaks document.createElement by returning nodes which have parent nodes.

HTML5Shiv refuses to fix this bug so Rangy has had to work around it.

For more information see:
* https://code.google.com/p/rangy/issues/detail?id=104; and
* https://github.com/aFarkas/html5shiv/issues/64.
 2014-04-16 12:14:28 +08:00
Marina Glancy
8662cd767e Merge branch 'MDL-45081-master' of git://github.com/FMCorz/moodle 2014-04-16 11:51:57 +08:00
Dan Poltawski
0dda3b10ea Merge branch 'MDL-44295' of https://github.com/scyrma/moodle 2014-04-16 11:33:14 +08:00
Sam Hemelryk
7747557d03 MDL-45123 atto_equation: improvements to ajax.php 2014-04-16 15:12:03 +12:00
Damyon Wiese
37477af87a Merge branch 'MDL-45062' of git://github.com/jleyva/moodle 2014-04-16 10:57:46 +08:00
Damyon Wiese
63c61733f0 MDL-45062 webservices: fix unit test for update_grades 
This fixes the broken unit test (which exposes a fail) and
the next patch from Juan fixes the fail.
 2014-04-16 10:55:58 +08:00
Damyon Wiese
0cbd1f913d Merge branch 'MDL-45055-master' of git://github.com/ankitagarwal/moodle 2014-04-16 10:41:17 +08:00
Dan Poltawski
21f2bad26c Merge branch 'MDL-44941-master' of git://github.com/FMCorz/moodle 2014-04-16 10:30:47 +08:00
Sam Hemelryk
c87a54102e Merge branch 'w16_MDL-45100_m27_coursecontext' of https://github.com/skodak/moodle 2014-04-16 11:43:48 +12:00
Sam Hemelryk
d668060fdc Merge branch 'MDL-45034-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
 2014-04-16 09:23:30 +12:00
Daniel Neis Araujo
37032563b5 MDL-44658 Make userid,fieldid unique in user_info_data 2014-04-15 17:48:13 -03:00
David Monllao
25a49eb660 MDL-44621 behat: Adding text selector 
Same behaviour than I should see step,
it looks for the text in the node + descendants,
but, to get the lower level match discards the
nodes with children that also contains the
same text.
 2014-04-15 20:13:44 +07:00
Marina Glancy
4ba9490813 MDL-44826 atto: re-shifted js 2014-04-15 18:07:10 +08:00
Juan Leyva
ccc165fd8e MDL-45062 web services: Description of method result value for update_grades_return is invalid 2014-04-15 11:59:44 +02:00
Marina Glancy
2e68bf6136 Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle 2014-04-15 17:55:30 +08:00
Frederic Massart
f0031a7c15 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:25:47 +08:00
Damyon Wiese
d3931a7d4d MDL-45034 Atto: Image dialogue improvements. 
1. Fix Nan bugs in auto width / height
2. Allow percentages in auto width / height
3. Change dialogue title
4. Prevent preview image resizing from changing the height of the dialogue.
5. Change wording to "Auto size"
6. Auto adjust size when the "Auto size" checkbox is toggled.
7. Add img-responsive to images with the original aspect ratio.
8. If the width and height fields are left blank, revert them to the image size.
 2014-04-15 16:43:27 +08:00
Damyon Wiese
7bbc64b88f MDL-44826 Atto: Set default image alignment to 'bottom' 2014-04-15 15:47:52 +08:00
Petr Škoda
aa386d2929 MDL-45100 fix course_context classname PHPDdos typo in context API 2014-04-15 15:46:19 +08:00
Petr Škoda
875d1e30e9 MDL-45035 add missing @since to \core\event\unknown_logged class 2014-04-15 14:56:51 +08:00
Damyon Wiese
f2fb8b09c2 Merge branch 'w16_MDL-45070_m27_ubuntumaria' of https://github.com/skodak/moodle 2014-04-15 14:46:40 +08:00
Marina Glancy
c733401634 Merge branch 'MDL-45035-master' of git://github.com/ankitagarwal/moodle 2014-04-15 14:34:36 +08:00
Tony Levi
800e902813 MDL-44908: Fix upgrade_grade_item_fix_sortorder performance 2014-04-15 14:26:48 +08:00
Sam Hemelryk
00719eefd7 Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle 2014-04-15 16:42:12 +12:00
Damyon Wiese
d28af3d4aa MDL-44826 Atto: Image alignment options 
If an image has custom alignment or margins - don't overwrite
them unless a new alignment option is chosen.
 2014-04-15 12:23:31 +08:00
Jonathon Fowler
6b2b72d6f9 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:18:55 +10:00
Jetha Chan
f0ddce4df1 MDL-44758 editor-atto: prevent table-in-table creation 
Prevent new table creation, displaying table context menu instead when cursor is within caption, when multiple cells are selected, when selection contains both nodes within and outside of the table, and when selection contains nodes from multiple tables.
 2014-04-15 11:39:57 +08:00
Dan Poltawski
ca4554402d Merge branch '44354-27' of git://github.com/samhemelryk/moodle 2014-04-15 10:26:06 +08:00
Sam Hemelryk
564a413367 Merge branch 'MDL-45040-master' of git://github.com/jethac/moodle 2014-04-15 12:31:44 +12:00
Sam Hemelryk
92f4d00e5d Merge branch 'MDL-45086-master' of git://github.com/danpoltawski/moodle 2014-04-15 09:50:38 +12:00
Frederic Massart
5b98627ae6 MDL-45081 curl: Prefer usage of CURLFile over @file arguments 2014-04-14 17:39:30 +08:00
Marina Glancy
300735e95e Merge branch 'w16_MDL-44911_m27_unknownevent' of git://github.com/skodak/moodle 2014-04-14 17:09:49 +08:00
Dan Poltawski
78b00793e8 MDL-45086 lib: force upgrade 
The availability changes change the course query for front page.
 2014-04-14 16:36:02 +08:00
Petr Škoda
169ccfa442 MDL-45049 improve debugging output in error log for NO_DEBUG_DISPLAY scripts 2014-04-14 13:16:41 +08:00
Petr Škoda
d409944a95 MDL-44911 use unknown_logged class when viewing unknown events in reports 2014-04-14 11:59:00 +08:00
Ankit Agarwal
9634712a37 MDL-45055 events: Add debugging notice to events_trigger() 2014-04-14 11:51:37 +08:00
Damyon Wiese
390365e696 Merge branch 'MDL-44936-master' of git://github.com/FMCorz/moodle 2014-04-14 11:38:46 +08:00
Damyon Wiese
313ae82ec0 Merge branch 'MDL-44844-master' of git://github.com/andrewnicols/moodle 2014-04-14 10:32:00 +08:00
Andrew Nicols
e41b0e7543 MDL-44674 editor_atto: Remove the ability to prevent callback wrapping 
The callback wrapping handles various important ARIA options and should not
be so easily preventable.
 2014-04-14 10:09:14 +08:00
Andrew Nicols
040e13010d MDL-44906 atto_collapse: Keep focus on the collapse button on toggle 2014-04-14 09:51:50 +08:00
Petr Škoda
6b7da257af MDL-45070 relax the mariaDB version checker to work with long Ubuntu versions 
Example of Ubuntu version: 5.5.5-10.0.10-MariaDB-1~saucy-log
 2014-04-14 09:44:45 +08:00
Tim Lock
1349800dd7 MDL-45012: Enable support for wma files within tinymce Moodle Media plugin 2014-04-14 08:31:17 +09:30
sam marshall
90c3ffe3a3 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:00:25 +01:00
Dan Poltawski
34f7e31ffb Merge branch 'MDL-40063_master' of https://github.com/markn86/moodle 2014-04-11 14:31:27 +08:00
Ankit Agarwal
3610ad436c MDL-45035 events: Fix @package and @since tags in Moodle 2.7 events 2014-04-11 13:45:33 +08:00
Ankit Agarwal
9638600bbb MDL-45035 events: Fix @package and @since tags in Moodle 2.6 events 2014-04-11 13:32:33 +08:00