mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 10:00:31 +01:00
Code Issues Projects Releases Wiki Activity
75,313 Commits 36 Branches 527 Tags
Commit Graph

20606 Commits

Author SHA1 Message Date
Damyon Wiese
7fa6b58762 MDL-51532 libraries: Update htmlpurifier to 4.7.0 2015-09-30 11:55:03 +08:00
Eloy Lafuente (stronk7)
f95452b84f Merge branch 'MDL-51371-master' of git://github.com/jleyva/moodle 2015-09-24 15:38:14 +02:00
Juan Leyva
c515849937 MDL-51371 course: New Web Service core_course_get_course_module 2015-09-23 15:32:15 +02:00
Andrew Nicols
3678dd00c2 Merge branch 'MDL-51222-master-fix' of https://github.com/andrewnicols/moodle 2015-09-23 11:43:15 +08:00
Andrew Nicols
57884502bc MDL-51222 Javascript: Reapply YUI config after adding modules 2015-09-23 10:49:59 +08:00
Andrew Nicols
b8ceed62d2 Merge branch 'MDL-51423-master-cliout' of git://github.com/mudrd8mz/moodle 2015-09-23 09:42:29 +08:00
Eloy Lafuente (stronk7)
201a26bbaa Merge branch 'MDL-47494' of git://github.com/timhunt/moodle 
Note: Fixed some minor grunt and EOF whitespace issues while merging.
 2015-09-22 18:38:27 +02:00
Dan Poltawski
5c7c9ea99a Merge branch 'MDL-51107-master' of git://github.com/FMCorz/moodle 2015-09-22 15:11:10 +01:00
Frederic Massart
61ce548a71 MDL-51107 navigationlib: Plugins can extend navigation category settings 2015-09-22 21:58:50 +08:00
Dan Poltawski
b7a87899c5 Merge branch 'MDL-50541-master' of git://github.com/jleyva/moodle 2015-09-22 14:37:22 +01:00
Dan Poltawski
f43194ab36 Merge branch 'MDL-50349-master' of git://github.com/jleyva/moodle 2015-09-22 13:17:03 +01:00
Dan Poltawski
df44776afd Merge branch 'MDL-50536-master' of git://github.com/jleyva/moodle 2015-09-22 12:55:46 +01:00
Dan Poltawski
79eb3afa9b Merge branch 'MDL-50132-master' of git://github.com/jleyva/moodle 2015-09-22 12:46:39 +01:00
Dan Poltawski
2e3b61fc4a MDL-50917 navigation: fix incorrect @since 2015-09-22 09:36:06 +01:00
Dan Poltawski
b3e959497e Merge branch 'wip-MDL-50917-master' of git://github.com/abgreeve/moodle 2015-09-22 09:15:57 +01:00
Dan Poltawski
16d08d465b Merge branch 'MDL-51412_qtype_index' of git://github.com/davosmith/moodle 2015-09-22 09:00:00 +01:00
Damyon Wiese
4e8afd56d5 MDL-51222 javascript: Merge all the YUI instances 
We previously had a global Y (simpleyui) and a separate Y created
to put Y in scope for all our modules. This meant that we had 2
separate sandboxes for YUI, which means that modules are duplicated,
and events do not fire across YUI instances.

This change merges the 2 instances, so any code refering to Y will
get the same instance of YUI (amd code, yui modules, static init code etc).

Thanks to Andrew Nicols!
 2015-09-22 15:56:40 +08:00
Damyon Wiese
28de777199 MDL-51222 Javascript: Trigger events for filters on DOM insertion 
When nodes are added to the dom, they may need to be re-processed by a JS based
filter. To do this we need to trigger the legacy YUI event filter-content-updated.

To make this easier I added some wrappers to template that will insert the node, run any
JS and trigger the event.

I also changed existing yui code to call the amd function to trigger the event. This way
all jquery and yui listeners will always be notified.
 2015-09-22 15:40:51 +08:00
Dan Poltawski
74ede2d89a Merge branch 'MDL-46157-master' of git://github.com/cameron1729/moodle 2015-09-22 08:15:01 +01:00
Adrian Greeve
508e364f5e MDL-50917 navigation: Unit test for viewing preference page. 2015-09-22 10:57:52 +08:00
Adrian Greeve
0305ee2781 MDL-50917 navigation: Allow users with permission to access preferences. 2015-09-22 10:57:51 +08:00
Andrew Nicols
eed34b118a Merge branch 'MDL-51190-master' of https://github.com/pauln/moodle 2015-09-22 07:53:27 +08:00
Dan Poltawski
f3164da6cf Merge branch 'MDL-51330-master' of https://github.com/sammarshallou/moodle 2015-09-21 12:10:35 +01:00
Dan Poltawski
ee3ca2d71b Merge branch 'MDL-51052_master' of https://github.com/dmonllao/moodle 2015-09-21 10:53:29 +01:00
Juan Leyva
bae627b276 MDL-50541 mod_imscp: New Web Service mod_imscp_get_imscps_by_courses 2015-09-21 09:30:59 +02:00
Juan Leyva
580a14c265 MDL-50536 mod_book: New WS mod_book_get_books_by_courses 2015-09-21 09:30:06 +02:00
Juan Leyva
f07a2bb09b MDL-50132 mod_choice: New WS mod_choice_get_choices_by_courses 2015-09-21 09:27:42 +02:00
Andrew Nicols
f19aaed3ea Merge branch 'MDL-50790-master' of git://github.com/cameron1729/moodle 2015-09-21 14:31:49 +08:00
Cameron Ball
c052d84d3c MDL-50790 tests: Fix outlook fixture. 2015-09-21 14:25:21 +08:00
Cameron Ball
691a2e1a68 MDL-50790 inbound: Stop incorrect amount of lines getting removed. 
Too many lines were being removed for GMail senders. The function was
also removed because it is no longer used, and guessing the client
and cutting accordingly is a poor approach and will probably lead
to issues similar to this one.
 2015-09-21 14:25:21 +08:00
Dan Poltawski
d13dd5bdfd MDL-50790 messageinbound: fixture for gmail 2015-09-21 14:25:12 +08:00
Andrew Nicols
28eca8cf5b Merge branch 'MDL-46878-master' of git://github.com/FMCorz/moodle 2015-09-21 12:05:32 +08:00
Andrew Nicols
b7fd9a0d25 Merge branch 'MDL-51311-master' of git://github.com/damyon/moodle 2015-09-21 11:32:55 +08:00
Damyon Wiese
031152cc83 MDL-47494 qtype: Fix the behat tests for OU dd question types 2015-09-18 07:56:27 +01:00
Tim Hunt
6e28e15092 MDL-47494 questions: update plugin_manager with the new qtypes 2015-09-18 07:51:42 +01:00
David Monllao
2bdeb8ef30 MDL-51052 dml: More info about mysql and case & accent sensitiveness 2015-09-18 11:45:53 +08:00
Frederic Massart
d569c0dae2 MDL-46878 blocklib: Testing blocks_delete_instances() 2015-09-18 11:40:09 +08:00
Frederic Massart
ad347f6874 MDL-46878 my: Allow admins to reset everyone's dashboard 2015-09-18 11:40:09 +08:00
Charles Fulton
3d47155643 MDL-51052 dml: support for sql_like() under utf8_bin 2015-09-18 09:56:43 +08:00
David Mudrák
c0e8a8a526 MDL-51423 clilib: Fix the hard-coded English text with proper string 
The string already exists and is part of the install language packs.
This was just forgotten TODO.
 2015-09-17 21:12:46 +02:00
David Mudrák
028bbc5b17 MDL-51423 clilib: Introduce cli_write() and cli_writeln() functions 
These are supposed to provide unified API for outputting texts from the
CLI scripts, without the need to mix other cli_* functions with echo()
and manually concatenated end-of-line character.
 2015-09-17 21:12:46 +02:00
Juan Leyva
91ea3678a9 MDL-50349 scorm: New WS mod_scorm_get_scorms_by_courses 2015-09-17 18:16:22 +02:00
Juan Leyva
6b5e69ebe6 MDL-50557 mod_scorm: New WS mod_scorm_get_scorm_sco_tracks 2015-09-16 23:18:39 +02:00
Juan Leyva
6b4ceb24cf MDL-50353 scorm: New Web Service mod_scorm_insert_scorm_tracks 2015-09-16 22:07:34 +02:00
Juan Leyva
822e9df70d MDL-50352 scorm: New Web Service mod_scorm_get_scorm_user_data 2015-09-16 19:25:19 +02:00
Juan Leyva
dfe927c8d6 MDL-50351 scorm: New Web Service mod_scorm_get_scorm_scoes 2015-09-16 19:25:17 +02:00
Marina Glancy
0f7f30021a MDL-51217 auth: check if recaptcha enabled for current plugin 2015-09-16 15:30:04 +08:00
Marina Glancy
a853f15fc3 MDL-46705 admin: Validate unique shortname for frontpage course 2015-09-16 14:38:52 +08:00
David Monllao
13a2aff3f9 Merge branch 'MDL-49561_master' of git://github.com/markn86/moodle 
Conflicts:
	lib/bennu/readme_moodle.txt
 2015-09-16 09:57:22 +08:00
David Monllao
b3ec8cf95e Merge branch 'MDL-46705-master' of git://github.com/dkns/moodle 2015-09-16 09:44:37 +08:00