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

19034 commits

Author SHA1 Message Date
Dan Poltawski
2eb4176242 Merge branch 'MDL-45496-m' of https://github.com/micaherne/moodle 2014-05-20 15:54:25 +08:00
Frederic Massart
a71ece3757 MDL-45563 message: Inverting IDs in description of event message_viewed 2014-05-20 15:51:07 +08:00
Damyon Wiese
4e8a350c35 Merge branch 'MDL-45618' of git://github.com/timhunt/moodle 2014-05-20 14:59:48 +08:00
Marina Glancy
4cc89d51eb Merge branch 'MDL-43669-m' of git://github.com/micaherne/moodle 2014-05-20 14:12:38 +08:00
Dan Poltawski
287a42e49a Merge branch 'MDL-45571_master' of https://github.com/markn86/moodle 2014-05-20 14:06:42 +08:00
Dan Poltawski
959599a929 Merge branch 'MDL-45501-master' of git://github.com/ankitagarwal/moodle 2014-05-20 13:23:35 +08:00
Frederic Massart
93f05f049d MDL-45545 csslib: Chunking handles commas in media query definitions 2014-05-20 12:21:45 +08:00
Dan Poltawski
3bd9c97774 Merge branch 'MDL-45605-master' of git://github.com/damyon/moodle 2014-05-20 10:51:16 +08:00
Dan Poltawski
06a689b761 Merge branch '44711-28' of git://github.com/samhemelryk/moodle 2014-05-20 10:15:11 +08:00
Sam Hemelryk
7be0b69893 Merge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle 2014-05-20 13:09:34 +12:00
Sam Hemelryk
a3abb19716 Merge branch 'MDL-45535-master' of https://github.com/sammarshallou/moodle 2014-05-20 11:55:35 +12:00
Frederic Massart
e722133aee MDL-45474 atto_undo: Remove notice when undo stack is empty 2014-05-20 10:47:32 +12:00
Tim Hunt
5bcfd504df MDL-45618 Fix @since PHPdoc tags. 2014-05-19 17:03:04 +01:00
Damyon Wiese
495243f35c Merge branch 'MDL-45130-master' of git://github.com/FMCorz/moodle 2014-05-19 21:20:10 +08:00
Damyon Wiese
e9e12c97fe Merge branch 'MDL-45472-master' of git://github.com/andrewnicols/moodle 2014-05-19 20:52:19 +08:00
Damyon Wiese
e1a83b8327 Merge branch 'MDL-45447-master' of git://github.com/FMCorz/moodle 2014-05-19 20:18:59 +08:00
Damyon Wiese
2b3a371239 Merge branch 'MDL-45527-27' of git://github.com/FMCorz/moodle 2014-05-19 20:04:50 +08:00
Michael Aherne
8561492010 MDL-43669 messaging Enable sending email only from no-reply address 2014-05-19 09:24:26 +01:00
Andrew Nicols
1ce043614f MDL-45239 editor_atto: The editor cannot be active if it is not the active element 
FireFox thinks that you can have an active selection on an element which
currently does not have focus. How this can be the case is a mystery.

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-05-19 16:15:09 +08:00
Andrew Nicols
17f253faeb MDL-45468 editor_atto: Check that the common ancestor is within the editor 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-05-19 16:14:03 +08:00
Dan Poltawski
18b12e7b60 Merge branch 'MDL-41109-master' of git://github.com/andrewnicols/moodle 2014-05-19 15:07:36 +08:00
Damyon Wiese
9febfdc56d MDL-32543 upgrade: Increment the version bump 
Conflicts:
	version.php
 2014-05-19 13:03:27 +08:00
Damyon Wiese
fc6b66c913 Merge branch 'MDL-32543' of https://github.com/danielneis/moodle 
Conflicts:
	version.php
 2014-05-19 13:02:48 +08:00
Damyon Wiese
b3eea60ecb Merge branch 'MDL-45533-27' of git://github.com/FMCorz/moodle 2014-05-19 12:25:56 +08:00
Mark Nelson
99627fb3d1 MDL-45607 events: changed the context passed to the user_profile_viewed event 2014-05-18 20:54:13 -07:00
Damyon Wiese
726b011050 MDL-45605 Phpunit: Do not call gc_collect_cycles as part of reset. 
This takes 25% of the time in running tests and there is no benefit. The
behaviour of destructors is the same before/after the patch.
 2014-05-19 10:37:16 +08:00
Sam Hemelryk
817d39b8aa MDL-44711 navigation: better handling of course expansion exception 2014-05-19 08:41:14 +12:00
Andrew Nicols
679af35722 MDL-41109 dndupload: Add missing error string 2014-05-16 13:45:30 +08:00
Mark Nelson
10dbb4bae0 MDL-45571 events: included enrolment method in the 'user_enrolment_created' event description 2014-05-15 14:48:26 -07:00
Ankit Agarwal
9d59d9e39e MDL-45501 availability: Add uninstall support for conditional plugins 2014-05-15 14:04:52 +08:00
Frederic Massart
9389ff572b MDL-45533 editor_atto: Default paragraph is removed from empty Atto 2014-05-15 11:10:54 +08:00
Andrew Nicols
f366221309 MDL-45479 atto_image: Improve the preview area 
This changes the preview area:
* to show the image at the requested size; and
* to fix the scaling issues.
 2014-05-15 10:36:41 +08:00
sam marshall
fbe79e4937 MDL-45535 CSS chunking breaks media rules if CSS invalid (IE) 
Invalid CSS with extra } symbols, which previously (by fluke)
worked, was broken by recent chunking improvements. This change
makes the chunking code robust against this (stupid) situation.
 2014-05-14 12:08:27 +01:00
David Monllao
b28b374f2e MDL-45192 behat: Replacing specific-selector steps by a generic one 
Having a I click on we can use all our selectors rather
than having multiple steps for the same purpose. This
step allow us to manage JS native dialogues without
having to fail a scenario.

Credit for Mohamed Alsharaf.
 2014-05-13 20:21:49 +07:00
Mohamed Alsharaf
bcad873102 MDL-45192 assign: added behat script & new definitions to handle alert dialog 
The behat script is to test the batch action to lock and unlock submissions.
The new definitions are to prevent the "unexpected alert open" error in Selenium.
 2014-05-13 20:10:53 +07:00
Frederic Massart
da6b4b9bf9 MDL-45527 task: Already deleted unconfirmed users are ignored 2014-05-13 17:11:18 +08:00
Daniel Neis Araujo
d277c441da MDL-32543 Make sure the action and url fields of log table have correct sizes 2014-05-12 12:05:25 -03:00
Frederic Massart
4d2b346997 MDL-45130 editor_atto: Remove debugging messages for missing plugins 
This is no longer required as the toolbar configuration prevents
missing plugins from being set. However, even if we do not output
any notice, we ignore missing plugins to prevent errors in case
one was uninstalled but left in the editor toolbar.
 2014-05-12 16:08:14 +08:00
Andrew Nicols
72704adf03 MDL-44486 core: Rewrite JavaScript progressbar 2014-05-12 15:29:47 +08:00
Rajesh Taneja
20503d1572 MDL-45514 behat: Fixed should_not_exist timout param 2014-05-12 14:12:10 +08:00
Michael Aherne
8bf91fb893 MDL-45496 core Added space to logged in as line 2014-05-09 16:30:05 +01:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release 
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
 2014-05-09 02:12:28 +02:00
Marina Glancy
585ff7eaec Merge branch 'MDL-45462-master' of git://github.com/FMCorz/moodle 2014-05-08 19:50:13 +08:00
Andrew Nicols
83e8f495f2 MDL-45472 AJAX: Whitelist prototype values form JS Error in exception dialogue 2014-05-08 16:44:11 +08:00
Andrew Nicols
079c3a9446 MDL-45444 editor_atto: Fix vertical alignment of editor buttons 2014-05-08 12:33:12 +08:00
Frederic Massart
6f6345e327 MDL-45462 flickr: Requests are now done over HTTPS 2014-05-08 11:27:36 +08:00
Dan Poltawski
d1a316373f Merge branch 'MDL-45425-master' of git://github.com/andrewnicols/moodle 2014-05-08 11:05:20 +08:00
Dan Poltawski
327c382c47 MDL-43312 tinymce: bump plugin version 2014-05-08 10:52:36 +08:00
Dan Poltawski
dac2e286da Merge branch 'MDL-43312-master' of git://github.com/damyon/moodle 2014-05-08 10:51:51 +08:00
Sam Hemelryk
1c17e19a5c MDL-45457 phpdoc: fixed up a couple of @package typos 2014-05-08 08:14:10 +12:00