Commit graph

64945 commits

Author SHA1 Message Date
rwijaya
4bbacb8607 MDL-42147 filepicker: fixed dialog box css issue on IE9.
This patch fix the following issue repository icon size, dialog title bar background color and rounded corner for dialog box.

Conflicts:

	theme/bootstrapbase/style/moodle.css
2013-11-04 16:06:21 +08:00
Rajesh Taneja
d61d3e82d0 MDL-42537 calendar: locale charset on windows will come from calendartype
date_format_string() will now convert date on windows based on calendar type used
2013-11-04 15:54:19 +08:00
Ankit Agarwal
e5eff0b626 MDL-42287 behat: Use string from scorm content, instead of scorm structure 2013-11-04 15:52:42 +08:00
Damyon Wiese
2bd27878db MDL-42350 assign: Test group submission + drafts 2013-11-04 15:50:26 +08:00
Sam Hemelryk
7a47babb9e MDL-42350 mod_assign: fixed display of submission button 2013-11-04 15:50:25 +08:00
Dan Poltawski
32bf2cfc64 MDL-42111 fix trailing whitespace 2013-11-04 15:35:19 +08:00
Dan Poltawski
466fa368b5 Merge branch 'MDL-42111' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-04 15:32:34 +08:00
Petr Škoda
372154ff15 MDL-42512 finally fix the indentation of filter management page 2013-11-04 08:28:51 +01:00
Petr Škoda
137f573cfd MDL-42512 fix and cleanup filter management page 2013-11-04 08:24:28 +01:00
Damyon Wiese
f6015bbf02 Merge branch 'MDL-34654-master' of git://github.com/sammarshallou/moodle 2013-11-04 15:22:43 +08:00
Dan Poltawski
b763a03ddb Merge branch 'MDL-42494-workshop-exception' of git://github.com/mudrd8mz/moodle 2013-11-04 14:51:16 +08:00
Marina Glancy
23f13c5304 Merge branch 'MDL-42429_master' of https://github.com/markn86/moodle 2013-11-04 17:27:57 +11:00
Sam Hemelryk
8e23283cbb Merge branch 'wip-MDL-42577-master' of git://github.com/marinaglancy/moodle 2013-11-04 14:24:46 +08:00
Marina Glancy
197ab6efef Merge branch 'MDL-42566_master' of https://github.com/markn86/moodle 2013-11-04 17:22:45 +11:00
Dan Poltawski
afc33a9ad1 MDL-42286 fix trailing whitespace 2013-11-04 14:14:30 +08:00
Dan Poltawski
fa5b21216f Merge branch 'MDL-42286_behat' of https://github.com/andyjdavis/moodle 2013-11-04 14:13:27 +08:00
Sam Hemelryk
acdb2159fb Merge branch 'MDL-42648_M26' of git://github.com/lazydaisy/moodle 2013-11-04 14:00:30 +08:00
Frederic Massart
37b6c65dfe MDL-41807 repository_filesystem: Coding style clean up 2013-11-04 13:35:04 +08:00
Frederic Massart
5df695d221 MDL-41807 repository_filesystem: Prevent access to parent directories 2013-11-04 13:34:59 +08:00
Damyon Wiese
e45910aff3 Merge branch 'MDL-42489-master' of git://github.com/ankitagarwal/moodle 2013-11-04 13:17:15 +08:00
Marina Glancy
753ce05b8c Merge branch 'MDL-42617' of git://github.com/jleyva/moodle 2013-11-04 16:14:35 +11:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Marina Glancy
ad5a1a5d48 Merge branch 'MDL-42633-master' of git://github.com/ankitagarwal/moodle 2013-11-04 15:59:27 +11:00
Marina Glancy
78d877d40b Merge branch 'MDL-42402-master' of git://github.com/damyon/moodle 2013-11-04 15:53:22 +11:00
Dan Poltawski
9261a3b0d1 Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle 2013-11-04 12:30:12 +08:00
Marina Glancy
feb09881fb Merge branch 'MDL-38664' of git://github.com/rwijaya/moodle 2013-11-04 15:13:42 +11:00
Dan Poltawski
92dc72a6b5 Merge branch 'MDL-40515' of git://github.com/aolley/moodle 2013-11-04 12:10:39 +08:00
Damyon Wiese
42fb49ae0b Merge branch 'MDL-35146_master' of https://github.com/markn86/moodle 2013-11-04 11:53:40 +08:00
Petr Škoda
1555e10cdf MDL-41941 clean message text 2013-11-04 11:40:13 +08:00
Damyon Wiese
6178bb2091 Merge branch 'MDL-40722-master' of git://github.com/andrewnicols/moodle 2013-11-04 11:33:04 +08:00
Jerome Mouneyrac
7c2efc115c MDL-40874 Retire MyMobile as a standard theme 2013-11-04 14:18:41 +11:00
Tim Hunt
78a492330d MDL-41820 XSS in the quiz responses report.
Thanks to Michael Hess for finding this bug and reporting it to us.
2013-11-04 11:12:42 +08:00
Damyon Wiese
f859f6b4e6 Merge branch 'MDL-42521_master' of git://github.com/grabs/moodle 2013-11-04 10:56:12 +08:00
Damyon Wiese
0d0b93ce2f Merge branch 'MDL-42663_master' of git://github.com/dmonllao/moodle 2013-11-04 10:49:06 +08:00
Damyon Wiese
b804196502 Merge branch '42452-26' of git://github.com/samhemelryk/moodle 2013-11-04 10:37:59 +08:00
Sam Hemelryk
ed7e6593db MDL-42452 actionmenu: improved constraint code 2013-11-04 10:25:25 +08:00
Marina Glancy
f19aab1565 Merge branch 'MDL-42664-performance_measuring_filter_manager' of git://github.com/mudrd8mz/moodle 2013-11-04 13:17:58 +11:00
Marina Glancy
d0a91156ab Merge branch 'MDL-42583-master' of git://github.com/ankitagarwal/moodle 2013-11-04 12:52:15 +11:00
Damyon Wiese
23cd687d72 Merge branch 'MDL-38850' of git://github.com/rwijaya/moodle 2013-11-04 09:38:38 +08:00
Andrew Nicols
d248b44c33 MDL-42452 ActionMenu: Change constrains mechanism to show the entire menu 2013-11-04 09:38:00 +08:00
Andreas Grabs
73bbdce8c6 MDL-42521 mod_feedback - Feedback does not show line graphs in Clean theme 2013-11-03 19:11:27 +01:00
Sam Hemelryk
ae3fd8eb76 MDL-42452 block: action menu is now constrained to the block container 2013-11-03 16:42:40 +08:00
Damyon Wiese
f21531eb77 Merge branch 'MDL-42546-master' of git://github.com/danpoltawski/moodle 2013-11-02 22:39:37 +08:00
Damyon Wiese
6ff3923ba8 Merge branch 'w45_MDL-42497_m26_orphanedplugins' of https://github.com/skodak/moodle 2013-11-02 22:34:16 +08:00
Damyon Wiese
e0c14e5018 Merge branch 'w45_MDL-42387_m26_filelifetime' of https://github.com/skodak/moodle 2013-11-02 22:24:19 +08:00
Mary Evans
0664129b46 MDL-42648 lib: Clean theme throws exception if set_pagelayout is called too late. 2013-11-02 00:43:48 +00:00
Damyon Wiese
e9a20b4703 Merge branch 'wip-MDL-28463-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-11-01 21:31:57 +08:00
Petr Škoda
4cf944c6bc MDL-42044 minor add-on installer unit tests cleanup 2013-11-01 10:43:14 +01:00
Petr Škoda
99456a5559 MDL-42044 standardise list of unzipped files in add-on installer 2013-11-01 10:43:13 +01:00
Petr Škoda
0c431257e9 MDL-42387 standardise file lifetime handling 2013-11-01 10:42:18 +01:00