Commit graph

63747 commits

Author SHA1 Message Date
Damyon Wiese
70b4027b52 MDL-36002 javascript: Fix keyboard drag/drop not opening win
This was caused by changes in MDL-39851.
2013-08-14 14:49:13 +08:00
Dan Poltawski
178d901cf9 MDL-41019 bump redirect_if_major_upgrade_required() 2013-08-14 14:24:30 +08:00
Damyon Wiese
fdfaa5a586 MDL-39851 javascript: Add behat fix for filepicker
The filepicker was changed to use M.core.dialogue - this
patch updates the behat suite to search the changed dom for
the file picker windows closed event.
2013-08-14 11:15:41 +08:00
Dan Poltawski
d20b0aa567 MDL-41157 calendar: improve calendar_get_course_cached
The function get_course() introduced in 2.5.1 will use $COURSE and
$SITE to avoid an uncessary DB query, simplifying the logic of this
function and improving perf.
2013-08-14 11:05:27 +08:00
Dan Poltawski
3607961d8f MDL-41157 calendar: add unit tests for calendar_get_course_cached 2013-08-14 11:05:27 +08:00
Sam Hemelryk
0b7e4a1474 Merge branch 'MDL-4908-m' of git://github.com/andrewnicols/moodle
Conflicts:
	version.php
2013-08-14 09:15:00 +12:00
Andrew Nicols
2eb67dfa6c MDL-4908 Forum: Add backup/restore steps for per-forum digest settings 2013-08-13 14:46:11 +01:00
Andrew Nicols
3d4cf54820 MDL-4908 Forum: Add help for profile maildigest setting 2013-08-13 14:46:11 +01:00
Andrew Nicols
b28118f673 MDL-4908 Forum: Add a digest option link to outgoing forum mails 2013-08-13 14:46:11 +01:00
Andrew Nicols
8e08c731eb MDL-4908 Forum: per-forum digests 2013-08-13 14:46:10 +01:00
Sam Hemelryk
5f619cd61d weekly release 2.6dev 2013-08-13 14:46:01 +01:00
AMOS bot
51473a1938 Automatically generated installer lang files 2013-08-13 14:46:01 +01:00
AMOS bot
9bfd9f1731 Automatically generated installer lang files 2013-08-13 14:46:00 +01:00
AMOS bot
3f22a0117a Automatically generated installer lang files 2013-08-13 14:46:00 +01:00
Mark Nelson
783e8636f5 MDL-40662 block_course_overview: added addinstance capability string 2013-08-13 14:46:00 +01:00
Frederic Massart
25a66af722 MDL-39956 cohort: Event clean up and made ready for integration
* Added more PHP Documentation
* Localised strings for get_name()
* get_legacy_eventname() is now static
* get_legacy_eventdata() is now protected
* Testing legacy event data
* Added missing defined('MOODLE_INTERNAL') checks
* Added missing call to add_record_snapshot()
2013-08-13 17:41:03 +08:00
Dan Poltawski
4fece33d9a MDL-39956 cohort: Add tests for new events 2013-08-13 17:31:07 +08:00
Dan Poltawski
04aee04a25 MDL-39956 cohort: Convert to new events
* \core\event\cohort_created
* \core\event\cohort_updated
* \core\event\cohort_deleted
* \core\event\cohort_member_added
* \core\event\cohort_member_removed
2013-08-13 17:30:58 +08:00
Brian King
831ca534f4 MDL-29004 Wiki: display images in printer-friendly view 2013-08-13 10:00:46 +02:00
Dan Poltawski
aae18d2af4 MDL-31836 upgrade.txt: add a note about encrypt change 2013-08-13 14:57:25 +08:00
Dan Poltawski
26e5090f9e Merge branch 'wip-MDL-31836-m26' of git://github.com/samhemelryk/moodle 2013-08-13 14:57:23 +08:00
Dan Poltawski
f9b5915bc0 Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle 2013-08-13 13:23:31 +08:00
Damyon Wiese
048422dd8e MDL-41159 theme: Remove z-index from file manager context menu icon 2013-08-13 11:31:21 +08:00
Dan Poltawski
387d040b7b Merge branch 'MDL-40668-master' of git://github.com/damyon/moodle 2013-08-13 11:14:37 +08:00
Dan Poltawski
4dca09b177 Merge branch 'MDL-39851-master-squashed' of git://github.com/damyon/moodle 2013-08-13 10:56:26 +08:00
Damyon Wiese
0c0dfa8fbd MDL-40668 tinymce: Remove collapsable editor options
We have an alternative (pdw toolbars)
Also, allow tinymce to be collapsed down to a single row.
2013-08-13 10:54:36 +08:00
Dan Poltawski
ed07242713 MDL-39507 qtype_essay: hacky fix for unit tests
This is just to get the tests passing for integration purposes. Tim
may want to do a robust fix and revert this.
2013-08-13 10:47:19 +08:00
Damyon Wiese
bf7c86cfcf MDL-39851 M.core.dialogue: Various fixes
Items addressed
* Get rid of custom attribute srcNode
* Change extraClasses to a config only parameter.
* Change attribute fullscreen to a method.
* Restore the original window overflow value.
* Use setStyles instead of setStyle for performance.
* Tinymce end the zindex wars
* Prevent fullscreen dialogs in an iframe (tinymce managefiles plugin).
* tinymce: Cross browser fix for zindex on popups
* Use CSS for overflow changes (easier to keep track of the previous state).
* Fix Coding style for css changes
2013-08-13 10:42:01 +08:00
Damyon Wiese
c4bb131928 MDL-39851 filepicker: Fix for toolbar display wrapping on small screens 2013-08-13 10:39:52 +08:00
Damyon Wiese
c402943a33 MDL-39851 forms: Convert filemanager popups to M.core.dialogue 2013-08-13 10:39:36 +08:00
Damyon Wiese
d61c96b6b4 MDL-39851 javascript: Full screen dialogs on small screens
This change adds support to M.core.dialogue for showing fullscreen
dialogs on small screen sizes. There are 2 new configuration values that
can be set to control this when creating a dialog (responsive and responsiveWidth).

Setting responsive to false will disable this functionality completely (old behaviour).
Setting responsiveWidth controls the screen width that the dialog will switch to
fullscreen mode. Try not to think of the device that will be accessing the dialog,
but the width at which the content of the dialog needs to be displayed differently.

The activity chooser and the filepicker are the two dialogs that have been converted
in this patch. The filepicker first had to be converted to use M.core.dialog and not
Y.Panel.
2013-08-13 10:37:32 +08:00
Sam Hemelryk
969de2a200 Merge branch 'wip-mdl-39955' of git://github.com/rajeshtaneja/moodle 2013-08-13 14:13:13 +12:00
Dan Poltawski
f37c923d14 MDL-19171 fix trailing whitespace 2013-08-13 10:06:34 +08:00
Dan Poltawski
41e337dd82 Merge branch 'MDL-19171' of https://github.com/bostelm/moodle 2013-08-13 09:57:52 +08:00
Dan Poltawski
942a0e37d4 Merge branch 'MDL-39507' of git://github.com/timhunt/moodle 2013-08-13 09:52:35 +08:00
Rajesh Taneja
1cb1e5fe32 MDL-39955 completion: Added unittest for course_completed event 2013-08-13 09:43:38 +08:00
Rajesh Taneja
06f8ea7bf4 MDL-39955 completion: Added course_completed event 2013-08-13 09:43:38 +08:00
Sam Hemelryk
c0dfd035c4 Merge branch 'wip_MDL-40077' of https://github.com/jamiepratt/moodle 2013-08-13 10:49:12 +12:00
Sam Hemelryk
0c0efd71a1 Merge branch 'MDL-38191-master' of git://github.com/sammarshallou/moodle 2013-08-13 10:26:26 +12:00
Sam Hemelryk
615cf2d15a Merge branch 'MDL-41045-master' of git://github.com/sammarshallou/moodle 2013-08-13 10:19:34 +12:00
Sam Hemelryk
49c7794dcf Merge branch 'MDL-41082-master' of git://github.com/FMCorz/moodle 2013-08-13 10:16:14 +12:00
Sam Hemelryk
717d68544d Merge branch 'MDL-41004-master' of git://github.com/sammarshallou/moodle 2013-08-13 09:46:17 +12:00
Sam Hemelryk
acf6a06d5e Merge branch 'master_MDL-40773' of git://github.com/danmarsden/moodle 2013-08-13 09:45:03 +12:00
Sam Hemelryk
0ade13532b Merge branch 'MDL-39691' of git://github.com/jmvedrine/moodle 2013-08-13 09:41:27 +12:00
Sam Hemelryk
defb89c30c Merge branch 'MDL-41091' of git://github.com/timhunt/moodle 2013-08-13 09:38:40 +12:00
Sam Hemelryk
90fb4f39fd Merge branch 'MDL-41100-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2013-08-13 09:37:02 +12:00
Sam Hemelryk
6648f17384 Merge branch 'wip-MDL-41114-master' of git://github.com/marinaglancy/moodle 2013-08-13 09:32:48 +12:00
Sam Hemelryk
bbf434b639 Merge branch 'MDL-41050-master' of git://github.com/sammarshallou/moodle 2013-08-13 09:27:50 +12:00
Sam Hemelryk
23b7f1dfcf Merge branch 'MDL-41033' of git://github.com/rwijaya/moodle 2013-08-13 09:24:12 +12:00
Sam Hemelryk
61f2c458d5 Merge branch 'MDL-40711-master' of git://github.com/ankitagarwal/moodle 2013-08-13 09:12:24 +12:00