mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
75,298 Commits 36 Branches 519 Tags
Commit Graph

75298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
d26b770814 Merge branch 'MDL-50332_master-form-fix' of git://github.com/dmonllao/moodle 2015-09-23 11:50:29 +08: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
David Monllao
012d14e892 MDL-50332 enrol_self: Setting form url for guests 
Credit to Andrew Nicols.
 2015-09-23 09:52:04 +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
Andrew Nicols
be09ca85ef MDL-50664 mod_data: Fix for unit test failure 2015-09-23 09:27:30 +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
abd3fdc977 Merge branch 'wip-MDL-51108-master' of git://github.com/abgreeve/moodle 2015-09-22 11:48:49 +01:00
Dan Poltawski
0730ddc2ad Merge branch 'MDL-50664-master' of git://github.com/ryanwyllie/moodle 2015-09-22 10:39:33 +01:00
Dan Poltawski
11a83dbb1e Merge branch 'MDL-49973-master' of git://github.com/cameron1729/moodle 2015-09-22 09:44:44 +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
Andrew Nicols
a32cd742c3 Merge branch 'MDL-51413-master' of git://github.com/jleyva/moodle 2015-09-22 12:22:55 +08:00
Adrian Greeve
d64845996b MDL-50917 navigation: Behat tests for viewing user preference page. 2015-09-22 10:57:52 +08: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
524d037fa0 Merge branch 'MDL-51403-master-clilang' of git://github.com/mudrd8mz/moodle 2015-09-21 11:45:15 +01:00
Dan Poltawski
ee3ca2d71b Merge branch 'MDL-51052_master' of https://github.com/dmonllao/moodle 2015-09-21 10:53:29 +01:00
Dan Poltawski
c331e8f9c0 Merge branch 'MDL-48165-master-dimgrades' of git://github.com/mudrd8mz/moodle 2015-09-21 10:14:47 +01:00
Andrew Nicols
7e59e5d2d1 Merge branch 'MDL-50332_master' of git://github.com/dmonllao/moodle 2015-09-21 15:43:02 +08:00
David Monllao
8f338081cc MDL-50332 enrol_self: Formatting unavailable instances error messages 
Many thanks to Andrew Nicols as this patch is based on his
proposal. Thanks Andrew.
 2015-09-21 15:39:42 +08: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
Andrew Nicols
4b65342dba Merge branch 'MDL-51431' of https://github.com/andrewhancox/moodle 2015-09-21 08:09:38 +08:00
Eric Merrill
8bc1d28b1a MDL-47494 question General code cleanup 
Remove old browser CSS.
Fix code style problems.
Add many PHPdocs.
Set @package uniformly.
 2015-09-19 07:23:52 +01:00
Juan Leyva
ea5b910b3a MDL-51413 forum: Return additional field in get_forums_by_courses WS 2015-09-18 17:27:14 +02:00
Damyon Wiese
031152cc83 MDL-47494 qtype: Fix the behat tests for OU dd question types 2015-09-18 07:56:27 +01:00
Damyon Wiese
96a744babd MDL-47494 qtype: Bump the version numbers for OU DD qtypes 2015-09-18 07:56:26 +01:00
Damyon Wiese
5a22d35e8b MDL-47494 question_ddwtos: Remove @ou tags from behat. 2015-09-18 07:56:25 +01:00
Damyon Wiese
da98a64d91 MDL-47494 question_ddimageortext: Remove wrong @since tag 2015-09-18 07:56:25 +01:00
Damyon Wiese
5a1a082c93 MDL-47494 questions: Add transparency to new ou question type icons 2015-09-18 07:56:24 +01:00