Commit graph

58321 commits

Author SHA1 Message Date
Sam Hemelryk
4d7259e53d Merge branch 'MDL-36592-master' of git://github.com/ankitagarwal/moodle 2012-11-20 16:42:52 +13:00
Ankit Agarwal
366e3dfaaf MDL-36592 calendar: Parse all line endings
Conflicts:

	lib/bennu/iCalendar_components.php
2012-11-20 11:38:24 +08:00
Dan Poltawski
32f741edea Merge branch 'MDL-26439_message_search' of git://github.com/andyjdavis/moodle 2012-11-20 11:20:43 +08:00
Eloy Lafuente (stronk7)
9e3f733f8a Merge branch 'MDL-36683' of git://github.com/timhunt/moodle 2012-11-20 01:33:39 +01:00
Jean-Michel Vedrine
334783a796 MDL-33863 question restore: better hint identification.
This is very similar to what MDL-30018 did for question_answers.
2012-11-19 23:27:44 +00:00
Sam Hemelryk
0d463df072 Merge branch 'wip-mdl-36352' of git://github.com/rajeshtaneja/moodle 2012-11-20 11:55:12 +13:00
Sam Hemelryk
41d17e48c7 Merge branch 'wip-mdl-36351' of git://github.com/rajeshtaneja/moodle 2012-11-20 11:51:13 +13:00
Petr Škoda
4f5789eae8 MDL-36703 very basic support for enrolments in data generator 2012-11-19 23:15:29 +01:00
Sam Hemelryk
cb33680c22 Merge branch 'MDL-36615-master' of git://github.com/ankitagarwal/moodle 2012-11-20 10:25:04 +13:00
Tim Hunt
acb9f7f47d MDL-36683 qtype match restore: better subq indentification.
This is very similar to what MDL-30018 did for question_answers.
2012-11-19 17:46:25 +00:00
Tim Hunt
8a7d763c77 MDL-36571 qtype multichoice: don't corrupt unicode characters.
It seems that \s includes non-breaking space, and the typical one-byte
representation of that is the same as some parts of multibyte unicode
characters. Therefore, you need to include the u modifer on the regular
expressions.

Also, remove any number of <br /> at the end of the answer.

Thanks to Joseph Rézeau and Jean-Michel Vedrine for working out what the
problem was, and how to fix it.
2012-11-19 17:21:00 +00:00
Paul Verrall
5f89e88dea MDL-36696 - filepicker: remove superfluous comma
It causes problems with older versions of IE.
2012-11-20 00:04:52 +08:00
Frederic Massart
ebc583e4a3 MDL-36659 usability: Adjust main menu block CSS 2012-11-19 20:23:42 +08:00
Frederic Massart
b621848c3b MDL-36636 usability: Comment delete icon repositioned 2012-11-19 18:02:41 +08:00
Mark Nelson
62d210515c MDL-36609 javascript: ensure HTML element exists before attempting to perform JS functionality 2012-11-19 15:43:46 +08:00
Dan Poltawski
1ffe4aefb1 Merge branch 'MDL-36655' of git://github.com/netspotau/moodle-mod_assign 2012-11-19 15:01:48 +08:00
Dan Poltawski
98d11a8c83 Merge branch 'w47_MDL-36682_m24_mcache' of git://github.com/skodak/moodle 2012-11-19 14:50:48 +08:00
Frederic Massart
3b59311047 MDL-36624 theme: Better look and feel on my page 2012-11-19 14:13:42 +08:00
Ankit Agarwal
7133a88d06 MDL-36614 calendar: Add event type field to the database 2012-11-19 13:14:57 +08:00
Ankit Agarwal
f5b20ea317 MDL-36615 calendar: The type of event should be named site not global for consistencies 2012-11-19 12:05:09 +08:00
Dan Poltawski
1ae8e2f963 Merge branch 'MDL-36415-master-int' of git://github.com/FMCorz/moodle
Conflicts:
	theme/upgrade.txt
2012-11-19 10:51:54 +08:00
Dan Poltawski
380186484b Merge branch 'MDL-34204' of git://github.com/timhunt/moodle 2012-11-19 10:33:25 +08:00
Dan Poltawski
542f68b022 Merge branch 'm24_MDL-36512_Purging_file_cachestore_does_not_purge_anything' of https://github.com/scara/moodle 2012-11-19 10:20:00 +08:00
Barbara Ramiro
8f8f8f5a1e MDL-36564 usability: New icon docs 2012-11-19 10:03:50 +08:00
Frederic Massart
510ccc5521 MDL-36564 usability: Repositioned help/info icon 2012-11-19 10:03:50 +08:00
Sam Hemelryk
41439e6c8d Merge branch 'MDL-36589' of git://github.com/rwijaya/moodle 2012-11-19 14:58:48 +13:00
Andrew Davis
f91528d985 MDL-26439 core_message: switched the message search over to displaying smallmessage instead of fullmessage which contains boilerplate we dont want 2012-11-19 09:32:13 +08:00
Andrew Davis
058dadb059 MDL-36162 core_message: string clean up 2012-11-19 09:16:25 +08:00
Andrew Davis
5e008d36ee MDL-36162 core_message: removed the unnecessary and confusing course URL parameter as well as fixing the broken breadcrumb 2012-11-19 09:16:25 +08:00
Petr Škoda
0b37fe466a MDL-36682 remove old unused shared memory caching support 2012-11-18 14:46:31 +01:00
Jean-Michel Vedrine
bedbfd6dfa MDL-32865 Backwards compatibility, deal with the old image tag 2012-11-17 16:38:03 +01:00
Jean-Michel Vedrine
7c86628de6 MDL-32865 CLOZE Questions imported from another course end up with broken image links 2012-11-17 16:38:02 +01:00
Andreas Grabs
95a6ed773d MDL-35158 - Random Glossary block returns an error when you delete the linked glossary 2012-11-17 12:06:39 +01:00
Petr Škoda
5705796638 MDL-36211 fix log message typo
Credit goes to Dan Poltawski, thanks.
2012-11-17 10:42:47 +01:00
Petr Škoda
61c651c379 MDL-36211 try to not update session record on every request 2012-11-17 10:42:47 +01:00
Petr Škoda
46a86dbbc2 MDL-36211 do not lock sessions for guests and not-logged-in users 2012-11-17 10:42:47 +01:00
Petr Škoda
f28af1dd13 MDL-36229 whitelist more search engines and add tests 2012-11-17 10:37:51 +01:00
Petr Škoda
46453565f3 MDL-36547 do not use modinfo when creating new modules, improve coding style 2012-11-17 09:05:29 +01:00
Petr Škoda
b4126b0c8b MDL-36547 add test for section number when generating modules 2012-11-17 09:05:29 +01:00
Matt Petro
8e771aed93 MDL-35717 quiz: fix overdue attempt processing 2012-11-16 21:32:09 -05:00
Andrew Robert Nicols
3186c12412 MDL-36640 Logging: Correct testing of log->info.
log->info sometimes contains additional information which can be looked up
from other tables. This should only be attempted if the field is numeric,
but the CSV, XLS, and ODS outputs were not making this check.

There is an additional case for the print_mnet_log function which has not
been covered - this is because the mnet logging is currently broken beyond
the scope of this bug rendering this section untestable. These issues are
raised in MDL-36642.
2012-11-16 11:21:29 +00:00
Matteo Scaramuccia
942be4a574 MDL-36512 purge_by_*() must initialise the cache implementing a store.
Indeed, given the current stores implementation, purge will not take effect in case of a file store.
2012-11-16 10:49:12 +01:00
Matteo Scaramuccia
fb8305dec7 MDL-36512 Purging a file store actually purges nothing 2012-11-16 10:43:15 +01:00
Dan Poltawski
2d7c5eeeea on demand release 2.4beta+ 2012-11-16 16:27:08 +08:00
Dan Poltawski
381230cc70 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-11-16 16:25:59 +08:00
Dan Poltawski
7d1f162a36 on demand release 2.4beta+ 2012-11-16 16:22:30 +08:00
Rajesh Taneja
39bd8a5c59 MDl-36352 Calendar: Moved poll interval next to url field for accessibility 2012-11-16 15:57:21 +08:00
Rajesh Taneja
3e2efe3b05 MDl-36352 Calendar: Poll interval will be disabled for calendar file import 2012-11-16 15:55:45 +08:00
Rajesh Taneja
4e3ce3464d MDL-36351 Calendar: Poll interval for existing subscriptions will update
Pollinterval option value was not set, which was returning string, expected is int.
Added int as pollinterval option value.
2012-11-16 15:44:00 +08:00
Dan Poltawski
bc8f1957a4 Merge branch 'm24_MDL-36364_Improve_the_deletion_logic' of https://github.com/scara/moodle
Conflicts:
	cache/stores/file/lib.php
2012-11-16 15:24:24 +08:00