mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-10 10:58:38 +01:00
Code Issues Projects Releases Wiki Activity
62,993 Commits 36 Branches 523 Tags
Commit Graph

62993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
0e4954ecff MDL-40830 Clear course cache in mod_assign generator 2013-08-15 21:44:05 +10:00
Dan Poltawski
838d78a9ff weekly release 2.6dev 2013-08-15 16:38:05 +08:00
Dan Poltawski
7031373ba8 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-08-15 16:37:59 +08:00
Dan Poltawski
5d5c1bb801 fix permissions 2013-08-15 16:37:27 +08:00
Andrew Nicols
0462b6a1a5 MDL-4908 Forum: Basic maildigest setting tests 2013-08-15 17:20:49 +12:00
Andrew Nicols
84869cb679 MDL-4908 Forum: Correctly check for appropriate login on maildigest changes 2013-08-15 15:24:15 +12:00
Sam Hemelryk
d333a3f2da Merge branch 'MDL-41200' of https://github.com/rwijaya/moodle 2013-08-15 15:16:19 +12:00
Damyon Wiese
fd782261de MDL-39851 javascript: Fixes for filepicker dialogs 
Fixes display issues with the filepicker dialogs that were
converted to M.core.dialogue.

Note: These dialogue use table based layouts and the table width is not
counted in the form that it sits in. I have changed the dialogues to have
a wider width but for really small screens this causes horizontal scrolling.

The only solution for that is to rewrite all the filepicker/filemanager dialogs
to use css for layout.
 2013-08-15 10:52:24 +08:00
Rossiani Wijaya
d8817b4a7f MDL-41200 Filepicker: Reduce the string length to fit the dialog size nicely. 2013-08-15 10:38:58 +08:00
Rossiani Wijaya
0a5c86ddef MDL-41200 filepicker: change header string to select. 
Add length limitation for header, so it fits nicely in mobile devices
 2013-08-15 10:28:56 +08:00
Sam Hemelryk
702d1f853e Revert "MDL-36002 core: Make drag and drop keyboard friendly" 
This reverts commit 7c271b9, 313e585, ade4695, and 70b4027

Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-08-15 13:59:06 +12:00
AMOS bot
e341bc4f96 Automatically generated installer lang files 2013-08-15 00:54:42 +00:00
Damyon Wiese
ae19c68c9c MDL-39851 javascript: More behat fixes for filepicker changes. 2013-08-14 17:12:03 +08:00
Dan Poltawski
260ea3d9a1 Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle 2013-08-14 15:38:37 +08:00
Frederic Massart
29b8b7c7ad MDL-39954 event: Fixed errors raised while triggering event 2013-08-14 15:29:12 +08:00
Frederic Massart
dde244c046 MDL-39954 event: Fixed namespace issue with \coding_exception 2013-08-14 14:53:08 +08:00
Dan Poltawski
02852c45b5 Merge branch 'MDL-36002-master-fix1' of git://github.com/damyon/moodle 2013-08-14 14:51:31 +08:00
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
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
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
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