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

56211 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
0d80d00494 Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE 2012-11-23 15:12:29 +08:00
Dan Poltawski
cc00f721d1 Merge branch 'MDL-36204-files-with-spaces_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE 2012-11-23 11:20:04 +08:00
David Mudrák
045053f641 MDL-36204 Improve moodle1 conversion of embedded files 
URL of files referenced in HTML fields via $@FILEPHP$@ are usually
encoded if they were linked using the HTML editor. So if they contain
spaces or plus signs in the name, their URL is encoded to use %20 and
%2B respectively.

Sometimes, for example when the HTML was edited manually in 1.9 without
the editor, non-encoded file names may be put into the HTML text. Such a
link used to work in 1.9 so we add an explicit support for it, too.

However, we do not support partially encoded URLs (e.g. only spaces are
encoded while plus signs are not). Such links are unmodified and will
rely on Legacy files support.
 2012-11-23 03:51:55 +01:00
Andrew Robert Nicols
0e88b7d94f MDL-35819 Improve performance of help tooltip 
Rather than using an event handler for each help link, we add the
'helpicon' class to them and delegate the display function.

In order for this to work, we modify the way that Y.io fetches the help to
use the intended target of the anchor rather than a value provided in the
add call. We also no longer modify this URL and instead add the ajaxurl
parameter to it using the Y.io data parameter.

This change is backwards compatible with people calling it without using
the help icon renderer.
 2012-11-22 11:45:34 +00:00
Andrew Robert Nicols
355b4f9dfa MDL-36763 Remove onclick event when creating activity left indent link 
The left indent onclick is now handled by a Y.delegate so there is no need
for a seperate event handler.
 2012-11-22 10:56:20 +00:00
AMOS bot
f4a048d771 Automatically generated installer lang files 2012-11-22 09:05:24 +00:00
Dan Poltawski
64ae757ee5 Merge branch 'wip-MDL-36668-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE 2012-11-22 10:33:15 +08:00
Petr Škoda
2b78a895fe MDL-36753 fix invalid sectionid in backup tests 2012-11-21 12:40:17 +01:00
Dan Poltawski
bbeafdbed1 Merge branch 'w47_MDL-36547_m23_sectiongen' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-11-21 15:34:22 +08:00
Dan Poltawski
105562e682 Merge branch 'MDL-30884_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-11-21 15:19:24 +08:00
Damyon Wiese
85b5e20cde MDL-35963: Assignment - do not accept empty submissions 
Conflicts:

	mod/assign/locallib.php
 2012-11-21 13:53:34 +08:00
Mark Nelson
03e403414e MDL-35760 filemanager: ensuring the dnd arrow displays in the center of the filemanager for all supported browsers 2012-11-21 12:03:54 +08:00
Damyon Wiese
80238a3cc2 MDL-36012: Assignment, Accessibility - Add user information to alt text for grade icon in grading table. 
Conflicts:

	mod/assign/lang/en/assign.php
 2012-11-21 12:03:45 +08:00
Dan Poltawski
c41d292bce Merge branch 'MDL-35675-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-11-21 12:02:58 +08:00
Dan Poltawski
19d964e07a Merge branch 'MDL-36289-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE 2012-11-21 12:01:03 +08:00
Dan Poltawski
8fb4c6e7c3 Merge branch 'MDL-30377_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE 2012-11-21 11:53:21 +08:00
Dan Poltawski
97c7facfe0 Merge branch 'MDL-36170_m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE 2012-11-21 11:47:39 +08:00
Rossiani Wijaya
879766ade2 MDL-36549 Lesson module: fixed strict standards errors 2012-11-21 11:32:42 +08:00
Damyon Wiese
fbd336f810 MDL-36184: Assignment quickgrading should only update lastmodified dates for modified submissions 2012-11-21 11:14:29 +08:00
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