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

69840 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Hemelryk
b87711a0dc Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle 2014-09-29 14:21:39 +13:00
Sam Hemelryk
503324d241 Merge branch 'MDL-39190' of https://github.com/pauln/moodle 2014-09-29 14:19:52 +13:00
Sam Hemelryk
a93039706c Merge branch 'MDL-20250_grade_settings2' of https://github.com/andyjdavis/moodle 2014-09-29 14:10:30 +13:00
Eloy Lafuente (stronk7)
9288030937 Merge branch 'MDL-47411-master-submodules' of git://github.com/mudrd8mz/moodle 2014-09-29 01:42:32 +02:00
Sam Hemelryk
e0533f2633 Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle 2014-09-29 11:35:23 +13:00
Sam Hemelryk
cec3ac8baf Merge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle 2014-09-29 11:21:19 +13:00
Sam Hemelryk
51606b8e63 Merge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle 2014-09-29 11:19:06 +13:00
Jean-Michel Vedrine
d92f768baa MDL-32870 mod_lesson: added support for files to question answers and responses 2014-09-29 11:00:28 +13:00
Sam Hemelryk
29b72af1b2 Merge branch 'MDL-43566' of https://github.com/willylee/moodle 2014-09-29 09:51:35 +13:00
Sam Hemelryk
d672e25b6c Merge branch 'MDL-47395' of git://github.com/nebgor/moodle 2014-09-29 09:11:25 +13:00
Sam Hemelryk
3604d399e3 Merge branch 'MDL-47381' of git://github.com/timhunt/moodle 2014-09-29 09:06:35 +13:00
Sam Hemelryk
c8674e5ca5 Merge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle 2014-09-29 09:02:52 +13:00
Sam Hemelryk
50dfb7cf38 MDL-47252 mod_forum: fixed whitespace 2014-09-29 08:44:43 +13:00
Sam Hemelryk
a038c1e0a3 Merge branch 'MDL-47252-master' of git://github.com/gurgus/moodle 2014-09-29 08:43:51 +13:00
Eloy Lafuente (stronk7)
cfbd81253b MDL-47242 theme_bootstrapbase: Fixed whitespace (take2) 
Seems that previous whitespace fix was not ok.
 2014-09-28 18:27:40 +02:00
sam marshall
5298d02f6e MDL-42974 UI: Modal dialogs do not work in IE8 2014-09-26 15:47:36 +01:00
sam marshall
38584d1167 MDL-47380 Availability: Editing interface broken in IE8 2014-09-26 15:47:00 +01:00
Tim Hunt
02643dafe7 MDL-47381 qformat: Behat tests have wrong plugin type. 2014-09-26 11:46:06 +01:00
Andrew Davis
3f02391834 MDL-36929 mod_forum: added bolding of discussion titles on the recent activity page 2014-09-26 10:48:57 +08:00
Andrew Davis
0e99979638 MDL-20250 core_grade: added some settings to disable or hide gradebook functionality 2014-09-26 10:19:00 +08:00
David Mudrák
a5d08dce93 MDL-47411 admin: Check if the plugin is a git submodule on uninstalling 
Credit goes to PJ King. I was trying to add unit tests for this new
behaviour but it turned out there are many hard-coded dependencies and
it's not easy to make the whole machinery support alternative location
of testable (fake) plugins.
 2014-09-25 21:17:53 +02:00
Willy Lee
14cea3164f MDL-43566 course: add delete icon to search returns in course management listings 2014-09-25 05:56:11 -07:00
Dan Poltawski
d07b0302a9 weekly release 2.8dev 2014-09-25 11:17:51 +01:00
Dan Poltawski
3f87d42707 NOBUG: Fixed SVG browser compatibility 2014-09-25 11:17:48 +01:00
Dan Poltawski
ce0ce99c72 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-09-25 11:17:47 +01:00
Sam Hemelryk
587d709145 MDL-47242: Fixed whitespace 2014-09-25 12:19:18 +12:00
Dan Poltawski
79cf14b327 MDL-47378 mod_assign: prevent debugging notice 
Parameters come out of get_user_preferences as strings.
 2014-09-24 15:41:04 +01:00
Aparup Banerjee
eb60c78c77 MDL-47395 added cli_error() visual cue 2014-09-24 17:37:43 +08:00
Pavel Sokolov
5ae56c6e44 MDL-37707 mod_assign: Prevent user from switching to and from team submissions 2014-09-24 16:07:01 +08:00
Jetha Chan
5332483146 MDL-47242 theme_bootstrapbase: inverted color and RTL fixes 2014-09-24 15:53:42 +08:00
Eloy Lafuente (stronk7)
d3e70202fc Merge branch 'MDL-47248-master-rsssitelogo' of git://github.com/mudrd8mz/moodle 2014-09-24 01:37:22 +02:00
Eloy Lafuente (stronk7)
aec2b1c2da Merge branch 'MDL-47224' of git://github.com/aolley/moodle 2014-09-24 01:26:52 +02:00
Marina Glancy
cf10649795 MDL-45336 lesson: copied used strings from quiz 
AMOS BEGIN
 CPY [false,mod_quiz],[false,mod_lesson]
 CPY [fractionsaddwrong,mod_quiz],[fractionsaddwrong,mod_lesson]
 CPY [fractionsnomax,mod_quiz],[fractionsnomax,mod_lesson]
 CPY [notenoughsubquestions,mod_quiz],[notenoughsubquestions,mod_lesson]
 CPY [true,mod_quiz],[true,mod_lesson]
AMOS END
 2014-09-24 01:22:59 +02:00
Marina Glancy
e0c22222b6 MDL-45336 questionbank: use core strings instead of quiz 
AMOS BEGIN
 CPY [categories,mod_quiz],[categories,question]
 CPY [unusedcategorydeleted,mod_quiz],[unusedcategorydeleted,question]
 CPY [export,mod_quiz],[export,core_question]
 CPY [import,mod_quiz],[import,core_question]
AMOS END
 2014-09-24 01:22:59 +02:00
Marina Glancy
8766d1981c MDL-45336 qtype_numerical: use own strings instead of mod_quiz 
These strings have already been copied from mod_quiz to qtype_numerical but
in the qtype_numerical plugin code the translations from mod_quiz were used.
Even though the strings were already present we copy the translations.

AMOS BEGIN
 CPY [invalidnumericanswer,mod_quiz],[invalidnumericanswer,qtype_numerical]
 CPY [multiplier,mod_quiz],[qtype_numerical]
 CPY [invalidnumerictolerance,mod_quiz],[qtype_numerical]
AMOS END
 2014-09-24 01:22:59 +02:00
Marina Glancy
5a0221f7c0 MDL-45336 question: moved used string from quiz plugin 
AMOS BEGIN
 MOV [erroritemappearsmorethanoncewithdifferentweight,quiz_statistics],[erroritemappearsmorethanoncewithdifferentweight,question]
AMOS END
 2014-09-24 01:22:58 +02:00
Marina Glancy
5639baa843 MDL-45336 scorm: copied used string from quiz 
AMOS BEGIN
 CPY [deleteselected,quiz_overview],[deleteselected,mod_scorm]
AMOS END
 2014-09-24 01:22:58 +02:00
Marina Glancy
634a5c0b81 MDL-45336 choice: removed unused code 
function prepare_choice_show_results() is never called with the 5th argument,
forming of html has been moved to the renderer in MDL-20508, when function
choice_show_results() was transformed into prepare_choice_show_results() but
not all code was deleted from the funciton.
 2014-09-24 01:22:58 +02:00
Marina Glancy
3a58e7ebc5 MDL-45336 backup: moved the string from quiz to core 
AMOS BEGIN
 CPY [timetaken,mod_quiz],[timetaken,backup]
AMOS END
 2014-09-24 01:22:58 +02:00
Eloy Lafuente (stronk7)
011ff9f8fb MDL-47180 qformat_webct: whitespace cleanup 2014-09-24 00:56:40 +02:00
Eloy Lafuente (stronk7)
d50a73309b Merge branch 'MDL-47180' of git://github.com/jmvedrine/moodle 2014-09-24 00:40:40 +02:00
AMOS bot
54e7d715d2 Automatically generated installer lang files 2014-09-24 00:05:53 +08:00
Jean-Michel Vedrine
129f3c5190 MDL-47180 qformat_webct: Import of calculated questions broken 2014-09-23 14:45:07 +02:00
Dan Poltawski
4bcf64b053 Merge branch 'MDL-47240-master' of https://github.com/sammarshallou/moodle 2014-09-23 10:57:00 +01:00
Paul Nicholls
cb4987f858 MDL-39190 Javascript: Pop-up calendar days of week wrong 
The YUI2 calendar widget (still used via 2in3) uses midnight as the time
component of its Date objects, which triggers a Safari bug resulting in
11pm Saturday being returned instead of midnight Sunday when subtracting
days to get the last few days of the previous month.  This shows up ONLY
on the month after DST begins, if DST begins on the last Sunday of a given
month (and the Calendar widget is set to Sunday as the first day of the
week).  The fix/workaround of using noon instead of midnight is employed
by YUI3 and others.
 2014-09-23 16:50:58 +12:00
Sam Hemelryk
4356012960 Merge branch 'MDL-46811-master' of git://github.com/danpoltawski/moodle 2014-09-23 16:36:05 +12:00
Sam Hemelryk
7fca0ced0a Merge branch 'MDL-47244-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/responsive.less
	theme/bootstrapbase/style/moodle.css
 2014-09-23 16:32:09 +12:00
Sam Hemelryk
b32e1778bb Merge branch 'wip-MDL-46937-master' of git://github.com/marinaglancy/moodle 2014-09-23 15:26:06 +12:00
Dave Cooper
12cf8140a2 MDL-47252 mod_forum: Ensure guest users can't subscribe to discussions 2014-09-23 10:52:55 +08:00
Sam Hemelryk
be91dff8bb Merge branch 'MDL-47242-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-23 12:23:08 +12:00