mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity
78,827 Commits 36 Branches 519 Tags
Commit Graph

78827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frederic Massart
c2f430a813 MDL-53687 core_media: Edge does not yet support WebM and OGG 2016-05-23 16:20:15 +08:00
Eloy Lafuente (stronk7)
2c952b2f38 weekly back-to-dev release 3.2dev 2016-05-22 02:46:17 +02:00
Eloy Lafuente (stronk7)
268abfacc5 Moodle release 3.1 v3.1.0 2016-05-21 23:51:54 +02:00
Eloy Lafuente (stronk7)
cd1c8d2132 Merge branch 'wip-MDL-54666-master' of git://github.com/marinaglancy/moodle 2016-05-21 12:36:51 +02:00
Eloy Lafuente (stronk7)
446e0299b9 Merge branch 'MDL-54672-master-given-i-enrol' of git://github.com/mudrd8mz/moodle 2016-05-21 12:26:01 +02:00
Marina Glancy
4ca17b63a1 MDL-54666 modedit: use default values when modgrade element is frozen 2016-05-21 12:37:46 +08:00
Eloy Lafuente (stronk7)
973641fe13 MDL-54666 tests: Verify that any activity keeps the settings 
This was affecting both to rateable (forum...) and not rateable
(assignment...) activities. So tests have been completed to verify
that now saving is performed and the correct scale values stored.
 2016-05-20 23:48:25 +02:00
David Mudrák
ac5dad467d MDL-54672 behat: Fix i_enrol_user_as() step in non-js sessions 
During the recent reimplementation of the step (eb9ca848), we did not
notice that javascript variant uses the string `assignroles` while the
non-js variant uses string `assignrole`. This caused any "Given I enrol"
steps to fail in non-javascript sessions.
 2016-05-20 20:37:28 +02:00
Dan Poltawski
30c8ed5c16 Moodle release 3.1rc2 v3.1.0-rc2 2016-05-20 10:10:15 +01:00
David Monllao
ee5c60c53a Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle 2016-05-20 13:53:26 +08:00
Jun Pataleta
920d3a95a1 MDL-54623 mod_assign: Fix for unit test 
Fix mod_assign_external_testcase::test_list_participants_returns_user_property_types()
to avoid using hardcoded user properties.
 2016-05-20 12:38:29 +08:00
Andrew Nicols
04c3fef12f Merge branches 'MDL-53988-master-fix3' and 'MDL-53988-master-fix3' of https://github.com/xow/moodle 2016-05-20 12:23:36 +08:00
John Okely
e1e1aad183 MDL-53988 mod_lti: Remove popup for duplicate url 
If creating a proxy fails, we will show an error using the
notification API. So we can remove the notification.exception call.
But modify the docs for ToolProxy.create so that future developers
will know they need to handle failures themselves.
 2016-05-20 12:06:03 +08:00
David Monllao
2be707cb5e Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle 2016-05-20 10:36:07 +08:00
Jun Pataleta
5684c89b93 MDL-54623 mod_assign: Fetch correct types for user properties 
Utilising core_user_external::user_description() to fetch the correct
types for the user properties.
 2016-05-20 10:30:29 +08:00
David Monllao
3d562d19b9 Merge branch 'MDL-54609-master' of git://github.com/junpataleta/moodle 2016-05-20 09:22:07 +08:00
Andrew Nicols
2a1400b1b8 Merge branch 'wip-mdl-54632' of https://github.com/rajeshtaneja/moodle 2016-05-20 09:17:47 +08:00
Rajesh Taneja
c14701a2ce MDL-53988 behat: Fixed modified error string 2016-05-20 09:12:48 +08:00
Andrew Nicols
658fc5f0fa Merge branch 'wip-mdl-54574' of https://github.com/rajeshtaneja/moodle 2016-05-20 09:07:54 +08:00
David Monllao
c879ff69f4 Merge branch 'MDL-54640_master' of git://github.com/dmonllao/moodle 2016-05-20 09:04:05 +08:00
Rajesh Taneja
442a3651ec MDL-54640 behat: add 1 sec delay before running tasks 
Also just execute task, as running whole cron is not
required
 2016-05-20 09:02:11 +08:00
Eloy Lafuente (stronk7)
5ba78f6231 Merge branch 'MDL-54644-master' of git://github.com/merrill-oakland/moodle 2016-05-19 18:57:04 +02:00
Eric Merrill
0a0dc5d035 MDL-54644 search: Fix typo in Solr search size setting 2016-05-19 08:47:53 -04:00
Jun Pataleta
d4b91dab8a MDL-54609 blocks_navigation: Fix display of navigation nodes 
* Used jQuery.append() instead of jQuery.text() to append the node's
  name so that it won't be escaped twice since the name is already being
  escaped in the server side via htmlentities.
 2016-05-19 20:43:54 +08:00
Dan Poltawski
5d84a61419 Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle 2016-05-19 13:00:34 +01:00
Eloy Lafuente (stronk7)
536c4e920a Merge branch 'MDL-54643-master' of git://github.com/jleyva/moodle 2016-05-19 13:50:47 +02:00
David Mudrák
929727e3ef MDL-54633 tinymce: Sync editors' iframe to textarea on form submit 
The previous commit "Automatically sync editor with its textarea" was
found a not good solution as the onchange event is triggered way less
often than needed for our needs. So this reverts commit 34321d49.

Instead, we add a hack to the formslib so that when there are some
TinyMCE editors used at the page, we explicitly save them before
triggering the form validation. This simply calls save() on all editors
on the page - see the API reference:
http://archive.tinymce.com/wiki.php/API3:method.tinymce.triggerSave

Having TinyMCE hardcoded like this on this core level does not make me
happy. But it seems to be most effective solution for now (and
definitely more efficient than the previous solution). Plus there is a
precedence - we already use window.tinyMCE in formchangechecker.js YUI
module, for example.
 2016-05-19 13:44:41 +02:00
Dan Poltawski
c9f85a1014 MDL-54641 enrol: fix trailing whitespace in upgrade.txt 2016-05-19 11:34:38 +01:00
Dan Poltawski
0677018ec5 Merge branch 'MDL-54641_master' of https://github.com/snake/moodle 2016-05-19 11:33:53 +01:00
Dan Poltawski
c56d14be37 Merge branch 'MDL-54627_master' of git://github.com/dmonllao/moodle 2016-05-19 10:59:06 +01:00
Dan Poltawski
71dadd6d26 MDL-53988 lti: build js 2016-05-19 10:57:47 +01:00
Dan Poltawski
e2b58a90fd Merge branch 'MDL-53988-master-fix2' of https://github.com/xow/moodle 2016-05-19 10:56:01 +01:00
Juan Leyva
b4baee42e2 MDL-54643 tool_mobile: Fix dependencies check 2016-05-19 11:55:14 +02:00
Jake Dallimore
992365f8d5 MDL-54641 enrol: Consolidate 3.1 changes into correct section header. 2016-05-19 17:38:35 +08:00
John Okely
0450f5e081 MDL-53988 mod_lti: Improve error handling and user interface 
Only show one, more helpful error instead of two non-helpful errors.
Don't show the 'no configured tools' message if there is a proxy there.
Return to the Tool configure page when editing a proxy if you came
from it.
 2016-05-19 17:10:00 +08:00
Dan Poltawski
b887c81907 Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle 2016-05-19 09:00:12 +01:00
Jun Pataleta
7150323ecd MDL-54623 mod_assign: Unit test for list_participants() 2016-05-19 15:36:44 +08:00
Andrew Nicols
9f59bc5b2c Merge branch 'MDL-54632-master' of git://github.com/andrewnicols/moodle 2016-05-19 15:17:03 +08:00
Marina Glancy
bff0a28894 MDL-54632 mod_lti: separate show as preconfigured and in activitychooser 2016-05-19 15:15:46 +08:00
David Monllao
8af3e3abb2 Merge branch 'MDL-54630_master' of git://github.com/markn86/moodle 2016-05-19 15:03:14 +08:00
Mark Nelson
1e03d74cfa MDL-54630 core_tags: preserve 'timemodified' when moving tags 2016-05-19 14:50:12 +08:00
David Monllao
ca7b16fa70 Merge branch 'MDL-54638' of git://github.com/stronk7/moodle 
Conflicts:
	mod/lti/version.php
 2016-05-19 13:47:22 +08:00
David Monllao
505ce88467 MDL-54627 search: Ensure that all format_string strings are text. 
All user input that is usually displayed through format_strings with
filters like mulitlang applied should be converted to text as well.
 2016-05-19 13:16:01 +08:00
Andrew Nicols
9dfee70f6b Merge branch 'MDL-53988-master-fix' of https://github.com/xow/moodle 2016-05-19 11:58:16 +08:00
John Okely
b1c8a860cb MDL-53988 mod_lti: Add language string for unactivated proxies 2016-05-19 11:55:17 +08:00
Andrew Nicols
9e550d5804 Merge branch 'MDL-54542-master-fixup' of https://github.com/FMCorz/moodle 2016-05-19 11:52:29 +08:00
Andrew Nicols
367c85d78c Merge branch 'MDL-53988-master' of https://github.com/xow/moodle 2016-05-19 11:43:27 +08:00
Frederic Massart
d309f3e218 MDL-54542 competency: Really handle false negatives in plans to review 2016-05-19 11:42:15 +08:00
David Monllao
a1643e66b0 Merge branch 'MDL-54578_m31v2' of https://github.com/sbourget/moodle 2016-05-19 11:41:21 +08:00
David Monllao
89fc74508b Merge branch 'MDL-54613-m' of https://github.com/micaherne/moodle 2016-05-19 11:20:58 +08:00