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

57825 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
f95fb4b600 Merge branch 'wip-MDL-36825-m24' of git://github.com/samhemelryk/moodle 2012-11-27 13:37:49 +08:00
Dan Poltawski
e0c9b42ff7 Merge branch 'MDL-36752-master' of git://git.luns.net.uk/moodle 2012-11-27 13:32:34 +08:00
Dan Poltawski
513c64c303 Merge branch 'MDL-36806' of git://github.com/timhunt/moodle 2012-11-27 13:26:38 +08:00
Dan Poltawski
f285889157 Merge branch 'MDL-36442_master' of git://github.com/lazydaisy/moodle 2012-11-27 13:18:20 +08:00
Dan Poltawski
e7705abdde Merge branch 'MDL-36775-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/upgrade.txt
 2012-11-27 13:10:27 +08:00
Dan Poltawski
5d6aca6e1a Merge branch 'MDL-36784-master' of git://github.com/FMCorz/moodle 2012-11-27 13:06:32 +08:00
Dan Poltawski
23510ab2e8 Merge branch 'MDL-36550-master' of git://github.com/FMCorz/moodle 2012-11-27 13:00:44 +08:00
Frederic Massart
d2ced94bff MDL-36550 theme: Fixed syntax error in CSS rules 2012-11-27 12:37:13 +08:00
Aparup Banerjee
720ee26d4a Merge branch 'wip-mdl-36767' of git://github.com/rajeshtaneja/moodle 2012-11-27 12:19:52 +08:00
Dan Poltawski
dcb58f9d06 Merge branch 'MDL-36802-master' of git://github.com/FMCorz/moodle 2012-11-27 12:14:05 +08:00
Frederic Massart
58f46a0e66 MDL-36470 usability: Course legacy files uses the folder icon 2012-11-27 12:11:19 +08:00
Aparup Banerjee
ec03ca7272 Merge branch 'MDL-36710-master' of git://github.com/ankitagarwal/moodle 2012-11-27 12:02:14 +08:00
Dan Poltawski
783c4779df Merge branch 'MDL-36636-master' of git://github.com/FMCorz/moodle 2012-11-27 11:55:21 +08:00
Rajesh Taneja
09153efa90 MDL-36767 Administration: user_filter_yesno use different name for sql filter 
user_filter_yesno extends user_filter_simpleselect, so if user bulk action filter has both
user_filter_simpleselect and user_filter_yesno, they use the same filter name but counter is
different as they are different classes. Hence using different filter name will avoid confilts
 2012-11-27 11:52:53 +08:00
Aparup Banerjee
0319316444 Merge branch 'MDL-36305-master' of git://github.com/FMCorz/moodle 2012-11-27 11:52:50 +08:00
Dan Poltawski
f6399f7547 Merge branch 'MDL-36631-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/upgrade.txt
 2012-11-27 11:39:21 +08:00
Dan Poltawski
e8d7f57e8c Merge branch 'MDL-36630-master' of git://github.com/FMCorz/moodle 2012-11-27 11:25:10 +08:00
Peter Bulmer
1c65f683dc MDL-36838 moodle->mahara mnet SSO failure in FF17 
In MDL-36838 Firefox 17 users are unable to sso from moodle to mahara.

Firefox 17 uses a different user agent (UA) string for Moodle sites than it
does for Mahara or other sites.
This patch relaxes the check which previously required that the UA string
being presented to the SP on landing matched the UA string presented to the IP
when jumping.
Likewise, checks associated with logout calls have been relaxed
 2012-11-27 16:17:43 +13:00
Dan Poltawski
73da0c6e1d MDL-36742 - Add IE svg fixes 2012-11-27 10:57:49 +08:00
Dan Poltawski
8204e57309 Merge branch 'MDL-36559-master-int' of git://github.com/FMCorz/moodle 2012-11-27 10:50:31 +08:00
Dan Poltawski
673c671be0 MDL-36623 - IE9 svg fixes 2012-11-27 10:44:42 +08:00
Dan Poltawski
981f72be5e Merge branch 'MDL-36623-master-int' of git://github.com/FMCorz/moodle 2012-11-27 10:40:24 +08:00
Dan Poltawski
2c59d2ca8c Merge branch 'MDL-36550-master' of git://github.com/FMCorz/moodle 2012-11-27 10:36:59 +08:00
Dan Poltawski
70c53d3ece MDL-36628 - IE svgtool fix 2012-11-27 10:13:47 +08:00
Dan Poltawski
713a49298f Merge branch 'MDL-36628-master' of git://github.com/FMCorz/moodle 2012-11-27 10:10:04 +08:00
Mary Evans
3f370e3a51 MDL-36442 theme_boxxie: Adds definition to block header command icons 2012-11-27 01:38:11 +00:00
Sam Hemelryk
b144e12feb MDL-36768 cache: Fixed regression in cache stores by reordering classes 2012-11-27 12:14:48 +13:00
Sam Hemelryk
0aa6247168 Merge branch 'MDL-36826-master' of git://github.com/damyon/moodle 2012-11-27 11:38:57 +13:00
Sam Hemelryk
a28e3a6007 Merge branch 'wip-MDL-36795-master' of git://github.com/abgreeve/moodle 2012-11-27 11:22:08 +13:00
Sam Hemelryk
7ad3fc1f80 Merge branch 'MDL-35760_master' of git://github.com/markn86/moodle 2012-11-27 11:10:37 +13:00
Sam Hemelryk
fa8d78a485 Merge branch 'MDL-36829' of https://github.com/kastashov/moodle 2012-11-27 11:05:40 +13:00
Sam Hemelryk
75ca9964a5 Merge branch 'MDL-36760' of git://github.com/timhunt/moodle 2012-11-27 10:41:41 +13:00
Sam Hemelryk
e4f71b7c8f MDL-36825 cachestore_file: fixed isready condition check 2012-11-27 10:16:08 +13:00
Frederic Massart
e40bd74620 MDL-36550 usability: CSS updates on course page 2012-11-26 17:00:29 +08:00
Dan Poltawski
ae8530e854 MDL-35717|NOBUG - fix trailing whitespace problems 2012-11-26 15:01:31 +08:00
Adrian Greeve
341bfedf90 MDL-36795 - lib / administration: maxsections now limits the default setting for numsections. 
In the default course settings, setting the maximum number topics / weeks  to 0 would not
change the default number of sections on the same page as any other number would.
A more appropriate check has been put in place.

This also incorporates a fix for MDL-28584. The course edit screen now also checks to see
if maxsections is set or numeric. If it is not set or numeric then it defaults to 52.
 2012-11-26 14:41:50 +08:00
Kirill Astashov
398a414801 MDL-36829: Fix outcome value not being saved when grading a submission 2012-11-26 16:23:02 +10:30
Damyon Wiese
41d3bc0ca0 MDL-36826: Group assignment - Feedback files are not sent entire group 2012-11-26 13:33:13 +08:00
Dan Poltawski
939a43e426 Merge branch 'MDL-35717-quiz-attempt-checkstate' of git://github.com/mpetrowi/moodle 
Conflicts:
	mod/quiz/tests/generator/lib.php
 2012-11-26 12:07:04 +08:00
Dan Poltawski
b4272e0005 Merge branch 'wip-MDL-36066-master' of git://github.com/marinaglancy/moodle 2012-11-26 11:42:35 +08:00
Marina Glancy
d9c91ffc9e MDL-36066 Removed accidentally added image file causing wrong filemanager display 2012-11-26 10:32:08 +08:00
Damyon Wiese
63f57b2b3c MDL-36728: Assignment - submission statement default - Add a langstring fix 2012-11-26 10:30:37 +08:00
Damyon Wiese
a2d5581730 MDL-36728: Assignment - Improve usability of require submission statement setting. 
This change will hide the setting "Require that students accept the submission statement" at
the assignment level if no submission statement has been configured for a site. It also includes a
change to the help text to separate the assignment level setting from the site level setting. This
change also sets a default assignment submission statement.

AMOS BEGIN
 CPY [requiresubmissionstatement,mod_assign],[requiresubmissionstatementassignment,mod_assign]
AMOS END
 2012-11-26 15:06:22 +13:00
Sam Hemelryk
8a423efda9 Merge branch 'MDL-36609_master' of git://github.com/markn86/moodle 2012-11-26 14:58:13 +13:00
Sam Hemelryk
4d9e8469e1 Merge branch 'MDL-35569-master' of git://git.luns.net.uk/moodle 2012-11-26 14:46:25 +13:00
Sam Hemelryk
1762071194 Merge branch 'wip-MDL-36551-master' of git://github.com/abgreeve/moodle 2012-11-26 14:44:40 +13:00
Eloy Lafuente (stronk7)
155bd5d54a Merge branch 'wip-MDL-36819-m24-rb' of git://github.com/samhemelryk/moodle 2012-11-26 02:29:58 +01:00
Eloy Lafuente (stronk7)
f725158ea6 Merge branch 'wip-MDL-36768-m24-r2' of git://github.com/samhemelryk/moodle 2012-11-26 02:28:12 +01:00
Sam Hemelryk
2b274ad001 MDL-36819 cache: implemented cache_is_configurable interface 2012-11-26 14:27:44 +13:00
Sam Hemelryk
75cde6b9ac MDL-36768 cache: replaced cache_store interface with abstract class 2012-11-26 14:11:01 +13:00