64100 Commits

Author SHA1 Message Date
Sam Hemelryk
73cc3bdeb0 Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle
Conflicts:
	course/yui/toolboxes/toolboxes.js
2013-09-30 16:15:53 +13:00
Sam Hemelryk
5e8331c814 NOBUG fixed up whitespace 2013-09-30 15:51:08 +13:00
Sam Hemelryk
4754755625 Merge branch 'wip-MDL-33416-master' of git://github.com/marinaglancy/moodle 2013-09-30 15:42:03 +13:00
Sam Hemelryk
00a2879412 Merge branch 'master_MDL-41848' of git://github.com/danmarsden/moodle 2013-09-30 12:09:50 +13:00
Sam Hemelryk
28a2ecc6c4 Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle 2013-09-30 11:55:19 +13:00
Sam Hemelryk
f88787b604 NOBUG: rebuilt bootstrap CSS 2013-09-30 11:10:21 +13:00
Sam Hemelryk
e2c4c4202d Merge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle 2013-09-30 10:48:36 +13:00
Sam Hemelryk
2f0a996b10 Merge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle 2013-09-30 10:38:11 +13:00
Sam Hemelryk
1582ee126f MDL-41997 cache: dummy store now uses static acceleration for session + request 2013-09-30 09:41:03 +13:00
Sam Hemelryk
7310a6637a MDL-41997 cache: added unit tests for disabled stores 2013-09-30 09:41:03 +13:00
Paul Charsley
e8b443df33 MDL-41738 added web service function mod_assign_set_user_flags 2013-09-30 08:20:52 +13:00
Mary Evans
0402812161 MDL-42017 theme_afterburner: Additional improvements to make afterburner fully responsive. 2013-09-29 01:40:40 +01:00
Mary Evans
c528917d3f MDL-33569 theme_bootsrapbase: adding re-compiled style/moodle.css 2013-09-28 16:26:01 +01:00
Mary Evans
336c57575b MDL-33569 themes: Labels create extra margin below content. 2013-09-28 15:07:22 +01:00
AMOS bot
7800935d19 Merge branch 'master' into install_master 2013-09-28 00:40:24 +00:00
Jamie Pratt
d50b05e696 MDL-41751 changes to api of question_response_analyser
and code refactoring and clean up.
2013-09-27 17:38:13 +07:00
Tim Hunt
0aa04a7faf MDL-16464 remove multichoice answers field.
This field is not used, but sometimes causes errors when we try to
instert a value that is too long to fit. Therefore remove it.

At the same time, rename tables and columns to match the coding
guidelines.
2013-09-27 10:57:58 +01:00
Jamie Pratt
59abb70716 MDL-41752 question statistics class moved and improved
quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.
2013-09-27 16:24:18 +07:00
Rossiani Wijaya
43601cdf73 MDL-41798 imscp module: fix heading levels. 2013-09-27 17:22:41 +08:00
Petr Škoda
5fed843324 MDL-41999 warn developers to not use $USER->password directly 2013-09-27 10:51:38 +02:00
Petr Škoda
2aaf332bb1 MDL-41999 do not use $USER->password directly 2013-09-27 10:51:13 +02:00
Petr Škoda
a9d2f1b414 MDL-41707 allow custom location of external test files used from unit tests 2013-09-27 10:47:56 +02:00
Marina Glancy
6b0b05b32f MDL-41942 course: Allow course listings to work with caches disabled 2013-09-27 18:34:20 +10:00
Petr Škoda
cf361a9501 MDL-41176 do not set description and pw fields in $USER when editing own profile 2013-09-27 10:33:48 +02:00
Petr Škoda
e113214618 MDL-41176 make sure fresh full user record is used when mailing email confirmation 2013-09-27 10:33:48 +02:00
Petr Škoda
6c3ad77ea5 MDL-41176 fix obvious bugs and typos in new user API 2013-09-27 10:33:48 +02:00
Marina Glancy
47164284f7 MDL-41921 mod_url: less restrictions on URL field
Restoring functionality from 2.4 accidentally removed in MDL-34311
2013-09-27 18:33:27 +10:00
Marina Glancy
ba3a8f3231 MDL-41676 Corrected logic when to dim the activity name and content 2013-09-27 18:29:36 +10:00
Marina Glancy
0fb7a8a3dd MDL-32773 Add a help icon for button 'Set main file' in filemanager 2013-09-27 18:12:11 +10:00
Jamie Pratt
515b3ae6a7 MDL-41752 question statistics class moved and improved
quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.
2013-09-27 14:10:53 +07:00
Jamie Pratt
522bef8030 MDL-41888 More comments 2013-09-27 14:08:16 +07:00
Jamie Pratt
933ac7497a MDL-41888 allow for a blank string as format to mean not to show stat
as in MDL-41929 which applies to older stable branches.
2013-09-27 14:08:16 +07:00
Jamie Pratt
7de1e35b75 MDL-41888 separate out quiz statistics calculations from report code
also code clean up.
2013-09-27 14:08:15 +07:00
Marina Glancy
e2a61ee3db MDL-33416 files: Remove unused reference fields in files table
Fields files.referencelastsync and files.referencelifetime just waste the space and actually duplicate the fields
files_reference.lifetime and files_reference.lastsync
2013-09-27 16:50:08 +10:00
Frederic Massart
31e571cdf0 MDL-42021 events: Debug message when objecttable set without an objectid 2013-09-27 14:29:21 +08:00
Frederic Massart
c8135e8b18 MDL-42001 mod_chat: Transforming handlers to observers 2013-09-27 13:38:27 +08:00
Marina Glancy
d45e65ccad weekly release 2.6dev 2013-09-27 14:23:44 +10:00
Marina Glancy
4de0c793b4 fix permissions 2013-09-27 14:21:20 +10:00
Dan Poltawski
75e19bf52b MDL-39653 enrol_imsenterprise: only mail admins on change
The existing beavhiour was sending useless emails to admins and
generating warnings.

Thanks to Matthew Orlando for the suggested fix.
2013-09-27 12:21:03 +08:00
Marina Glancy
212757a250 ie9 svg compatibility fixes 2013-09-27 14:17:23 +10:00
Mary Evans
a7611a7ccc MDL-35217 afterburner: applying orientations 2013-09-27 01:43:44 +02:00
Sam Hemelryk
322d9c8cda Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/db/upgrade.php
2013-09-27 11:32:05 +12:00
Dan Marsden
8d29a8c3bc MDL-39910 SCORM: set correct site level defaults. 2013-09-27 10:49:54 +12:00
Dan Marsden
18784adb12 MDL-39910 SCORM: set correct site level defaults. 2013-09-26 11:36:44 +02:00
Mark Nelson
14c992b4fc MDL-41995 calendar: changed the page layout for the export page 2013-09-26 16:51:32 +08:00
Frederic Massart
0a8b091d41 MDL-41039 mod_quiz: Renaming event to attempt_becameoverdue 2013-09-26 16:43:20 +08:00
Frederic Massart
d900f1dc05 MDL-41039 mod_quiz: Replace events_trigger to new events 2013-09-26 16:43:03 +08:00
Frederic Massart
05549cc5d0 MDL-42004 enrol_cohort: Convert handlers to observers 2013-09-26 16:23:25 +08:00
Frederic Massart
6ee51daf6b MDL-42003 mod_forum: Convert handlers to observers 2013-09-26 16:08:13 +08:00
Jason Fowler
0c9070c0a3 MDL-41989 Atto - Improving usability for non-touch devices 2013-09-26 15:31:04 +08:00