Adrian Greeve
0c5bd8349d
MDL-36551 - mod_data: Onsite presets now retain the advanced search template.
...
Presets that were saved to the site would lose the advanced search template when being used.
The previous check was put in place to see if the advanced search template existed or not (presets pre 1.9),
This checked external files properly but not onsite files.
Now checks are being done on both internal and external preset files.
2012-11-21 10:03:00 +08:00
Damyon Wiese
7cc7277064
MDL-36167: Assignment quickgrading fix when there is no grade (ensure feedback still saves)
...
This patch modifies the previous on by Luke Tucker so that the lastmodified hidden field
is always added to the quickgrading form even if there is no grade for the assignment. This
ensures that the lastmodified checks still work (to prevent teachers overwriting each
others feedback) and feedback is saved when there is no grade.
Conflicts:
mod/assign/locallib.php
2012-11-21 09:33:14 +08:00
Luke Tucker
9e494233b0
MDL-36167: Update all users in assignment quickgrade form to ensure feedback is saved
2012-11-21 09:31:20 +08:00
Sam Hemelryk
fa99332779
Merge branch 'MDL-25552_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
2012-11-21 09:00:17 +13:00
Justin Filip
0c665d0063
MDL-36170 - mod/data - Don't display the blocks editing button within table HTML, use a standard API to create it.
2012-11-20 09:04:34 -05:00
Tim Hunt
a9258e46ae
MDL-30884 quiz: ARIA attribute for the coutdown timer.
2012-11-20 12:14:27 +00:00
Mark Nelson
13f8c06414
MDL-25552 mod_lesson: changing filepicker element to filemanager to allow the deletion of a file
2012-11-20 17:42:28 +08:00
Aparup Banerjee
8626068001
Merge branch 'wip-mdl-36707-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2012-11-20 16:28:00 +08:00
Dan Poltawski
3ec8f9f74a
Merge branch 'MDL-33863_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-11-20 16:16:41 +08:00
Dan Poltawski
728b702f4e
Merge branch 'MDL-36022-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE
2012-11-20 16:04:19 +08:00
Dan Poltawski
a91c6103f3
Merge branch 'MDL-30731-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-11-20 15:31:38 +08:00
Dan Poltawski
0299d83bc0
Merge branch 'MDL-36646_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-11-20 15:12:00 +08:00
Dan Poltawski
254d78b75f
Merge branch 'MDL-36571_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-11-20 15:01:38 +08:00
Frederic Massart
ac247b4e84
MDL-30731 calendar: Fixed display of images in event descriptions
2012-11-20 14:59:23 +08:00
Dan Poltawski
21082f7aed
Merge branch 'MDL-36548_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
2012-11-20 14:45:04 +08:00
Dan Poltawski
d7aec7342d
Merge branch 'wip-MDL-36453-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
2012-11-20 14:32:05 +08:00
Frederic Massart
f54b485abc
MDL-36305 theme: Forum reply button is not removed using MyMobile
2012-11-20 13:57:03 +08:00
Rajesh Taneja
84e47a8a3b
MDL-36707 Course: set conditionalhidden class properly, so it doesn't overlap with dimmed class
2012-11-20 13:45:11 +08:00
Dan Poltawski
d338726097
Merge branch 'MDL-36204_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
2012-11-20 12:45:32 +08:00
Dan Poltawski
81d1026d1c
Merge branch 'm23_MDL-36168' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
2012-11-20 12:38:33 +08:00
Dan Poltawski
aaf19f1ca3
Merge branch 'MDL-35158-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE
2012-11-20 12:28:59 +08:00
Dan Poltawski
042a79870c
Merge branch 'MDL-32865_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
2012-11-20 12:05:46 +08:00
Dan Poltawski
e81c1ad987
Merge branch 'MDL-30871-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-11-20 11:47:26 +08:00
Dan Poltawski
04821272ab
Merge branch 'MDL-26439_message_search_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
2012-11-20 11:20:51 +08:00
Eloy Lafuente (stronk7)
c7dcaf1324
Merge branch 'MDL-36683_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-11-20 01:33:49 +01:00
Jean-Michel Vedrine
e2ba9a1d70
MDL-33863 question restore: better hint identification.
...
This is very similar to what MDL-30018 did for question_answers.
2012-11-19 23:29:32 +00:00
Tim Hunt
f88bd546eb
MDL-36683 qtype match restore: better subq indentification.
...
This is very similar to what MDL-30018 did for question_answers.
2012-11-19 23:06:16 +00:00
Tim Hunt
4c1a35e34c
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 18:20:38 +00:00
Dan Poltawski
358f8debde
Merge branch 'MDL-36696-MOODLE_23_STABLE' of git://github.com/mrverrall/moodle into MOODLE_23_STABLE
2012-11-20 00:03:56 +08:00
Paul Verrall
4ca66b68f8
MDL-36696 - filepicker: remove superfluous comma
...
It causes problems with older versions of IE.
2012-11-19 15:48:23 +00:00
Mark Nelson
302808a37f
MDL-36609 javascript: ensure HTML element exists before attempting to perform JS functionality
2012-11-19 15:43:12 +08:00
Dan Poltawski
21c255093d
Merge branch 'MDL-36655-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE
2012-11-19 15:01:54 +08:00
Dan Poltawski
682661d87a
Merge branch 'MDL-34204_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-11-19 10:33:31 +08:00
Adrian Greeve
92aa8fe491
MDL-36668 - mod/data: Removed duplicate data_content join in simple searches.
...
Thanks to Patrick Pollet (patrick.pollet@insa-lyon.fr ) for his patch
2012-11-19 10:13:04 +08:00
Sam Hemelryk
99072482f6
Merge branch 'MDL-36589_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-11-19 14:55:22 +13:00
Jean-Michel Vedrine
58310f8845
MDL-32865 CLOZE Questions imported from another course end up with broken image links
2012-11-17 16:45:40 +01:00
Andreas Grabs
8199b8748e
MDL-35158 - Random Glossary block returns an error when you delete the linked glossary
2012-11-17 12:03:58 +01:00
Petr Škoda
2ded89d564
MDL-36547 fix section handling in precreate_course_module()
2012-11-17 09:06:12 +01:00
Petr Škoda
996db2f7ac
MDL-36547 add test for section number when generating modules
2012-11-17 09:06:11 +01:00
Andrew Robert Nicols
a0dd5e65b9
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:18:05 +00:00
Dan Poltawski
6548ce0915
weekly release 2.3.3+
2012-11-16 15:36:21 +08:00
Dan Poltawski
099c7f61da
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
2012-11-16 15:32:33 +08:00
Frederic Massart
0b674ddb42
MDL-26660 libraries: Improved XML validation before parsing
2012-11-16 12:14:04 +08:00
Damyon Wiese
62d70e07bc
MDL-36655: Assignment - do not add empty group to grading form when there is only one student
2012-11-16 11:00:05 +08:00
AMOS bot
01944afa45
Automatically generated installer lang files
2012-11-15 21:29:40 +00:00
Tim Hunt
877b243fed
MDL-36646 unit tests should not assume number of contexts.
2012-11-15 14:36:32 +00:00
Tim Hunt
1b36a754d0
MDL-34204 grader report: static call to non-static method.
2012-11-15 13:47:36 +00:00
Mary Evans
a94316030f
MDL-36608 theme_sky_high: Fixes missing background in sdmin pages by removing incorrect CSS in style/admin.css
2012-11-15 11:22:31 +00:00
Dan Poltawski
153f5eb3c7
MDL-36061 - remove master-only unit tests
2012-11-15 15:19:28 +08:00
Dan Poltawski
43c6aa915e
Merge branch 'MDL-36331_redirect_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
2012-11-15 14:40:56 +08:00
