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
78,853 Commits 36 Branches 519 Tags
Commit Graph

78853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
6a74e76fb8 weekly on-sync release 3.2dev 2016-05-26 02:15:53 +02:00
Eloy Lafuente (stronk7)
ea051ef170 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-05-26 02:15:50 +02:00
David Monllao
3f59e20eeb Merge branch 'MDL-54059-master' of git://github.com/andrewnicols/moodle 2016-05-25 16:17:44 +08:00
Andrew Nicols
c366cb08cf MDL-54059 testing: Add grunt test 2016-05-25 10:44:36 +08:00
Andrew Nicols
a24aff4edf MDL-54059 testing: Simplify travis output 2016-05-25 10:44:01 +08:00
AMOS bot
0fcfcd8327 Automatically generated installer lang files 2016-05-25 00:04:41 +08:00
Andrew Nicols
979d5c0603 Merge branch 'MDL-54715-master' of git://github.com/marinaglancy/moodle 2016-05-24 14:53:24 +08:00
Marina Glancy
3e9437f412 MDL-54715 core_question: fixed bug when importing questions with tags 
Thanks to WangYang for original patch
 2016-05-24 14:37:53 +08:00
David Monllao
4024b94d17 Merge branch 'MDL-54675-forum-highlight' of https://github.com/brendanheywood/moodle 2016-05-24 14:20:13 +08:00
David Monllao
7b7b990e43 Merge branch 'MDL-54582' of git://github.com/timhunt/moodle 2016-05-24 11:17:08 +08:00
Brendan Heywood
d0d6902a72 MDL-54675 forum: Fixed bug with multiple adjacent hash anchors 2016-05-24 13:07:07 +10:00
Andrew Nicols
13c6946d92 MDL-53687 core_media: Comment fix 2016-05-24 09:02:36 +08:00
Andrew Nicols
939f2b31f9 Merge branch 'MDL-53687-master' of git://github.com/FMCorz/moodle 2016-05-24 08:59:47 +08:00
AMOS bot
bcb51b8c87 Automatically generated installer lang files 2016-05-24 00:04:21 +08:00
Frederic Massart
c2f430a813 MDL-53687 core_media: Edge does not yet support WebM and OGG 2016-05-23 16:20:15 +08:00
David Monllao
21eef94436 Merge branch 'MDL-54642-master' of git://github.com/ryanwyllie/moodle 2016-05-23 14:52:54 +08:00
David Monllao
287074207f Merge branch 'MDL-46934-master' of git://github.com/FMCorz/moodle 2016-05-23 14:38:01 +08:00
David Monllao
ec7ade95db Merge branch 'MDL-54661-master' of git://github.com/junpataleta/moodle 2016-05-23 14:23:57 +08:00
David Monllao
170402cb4e Merge branch 'MDL-54664-master' of git://github.com/junpataleta/moodle 2016-05-23 09:50:44 +08:00
David Monllao
2eb57cf7a2 Merge branch 'MDL-54677' of git://github.com/stronk7/moodle 2016-05-23 09:13:40 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Eloy Lafuente (stronk7)
7a3a3246fa MDL-54676 backup: Bump release to 3.2 2016-05-23 00:23:31 +02: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
Frederic Massart
4700c44c01 MDL-46934 webservice_rest: Fixed undefined index on XML output 2016-05-20 17:03:23 +08:00
Jun Pataleta
16fb3f4505 MDL-54664 blocks_lp: Set the layout of to review pages to standard 2016-05-20 16:58:54 +08:00
Jun Pataleta
7af009633a MDL-54661 mod_assign: Unescape course name in grading nav template 2016-05-20 15:28:37 +08: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
Ryan Wyllie
3fdc542fe4 MDL-54642 tool_lp: Fix learning plan button layout in FF 
The learning plan buttons are floating left but the table below it wasn't
clearning floating elements so it was appearing on the same line.
 2016-05-20 02:35:11 +00: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