mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity
66,941 Commits 37 Branches 536 Tags
Commit Graph

66941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
5f2fcc388b Merge branch 'MDL-44345-master' of git://github.com/FMCorz/moodle 2014-03-13 18:32:54 +01:00
Sam Hemelryk
ee4655eec1 Merge branch 'MDL-41173' of https://github.com/danielneis/moodle 2014-03-13 18:32:52 +01:00
Dan Poltawski
9b9e2655d2 Merge branch 'MDL-44478-master' of git://github.com/andrewnicols/moodle 2014-03-13 18:32:49 +01:00
Eloy Lafuente (stronk7)
e649662489 Merge branch 'MDL-44534' of git://github.com/timhunt/moodle 
Conflicts:
	question/tests/behat/copy_questions.feature
 2014-03-13 18:32:41 +01:00
Dan Poltawski
454db7d467 Merge branch 'MDL-33653' of git://github.com/timhunt/moodle 2014-03-13 18:31:52 +01:00
Dan Poltawski
c6b7551c71 Merge branch 'MDL-40913_master' of https://github.com/markn86/moodle 2014-03-13 18:31:52 +01:00
Marina Glancy
e2cb3ffad6 MDL-43967 logging: references to the migrating dev docs 2014-03-13 18:31:52 +01:00
Dan Poltawski
7d1f141a44 Merge branch 'MDL-44095' of https://github.com/shashirepo/moodle 2014-03-13 18:31:49 +01:00
Dan Poltawski
a8aa086bf9 Merge branch 'wip-MDL-44337-master' of git://github.com/marinaglancy/moodle 2014-03-13 18:31:49 +01:00
Dan Poltawski
d8085046ba Merge branch 'wip-mdl-44458' of https://github.com/rajeshtaneja/moodle 2014-03-13 18:31:48 +01:00
Dan Poltawski
0fdb526f70 MDL-30085 bump version 2014-03-13 18:31:48 +01:00
Rajesh Taneja
f325a6eb67 MDL-44458 notes: Fixed url in events 2014-03-11 15:26:20 +08:00
Juan Leyva
ba1dc59721 MDL-44462 mobile: Add mod_assign functions to service definition 
To support new functionality in the Moodle Mobile app.
 2014-03-11 14:49:23 +08:00
Dan Poltawski
72e2a1d7eb Merge branch 'MDL-44480-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-03-11 14:35:51 +08:00
Dan Poltawski
234f953c44 Merge branch 'MDL-41855' of git://github.com/nobelium/moodle 2014-03-11 12:59:23 +08:00
Dan Poltawski
b027184f10 Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle 2014-03-11 12:42:27 +08:00
Dan Poltawski
8674c5e415 Merge branch 'MDL-44497-master' of https://github.com/jamiepratt/moodle 2014-03-11 12:35:57 +08:00
Dan Poltawski
5f3b4694b3 Merge branch 'wip-MDL-42870-master' of git://github.com/marinaglancy/moodle 2014-03-11 11:37:44 +08:00
Dan Poltawski
060aa628b3 Merge branch 'master_MDL-44066' of git://github.com/danmarsden/moodle 2014-03-11 11:28:56 +08:00
Dan Poltawski
c7cc278017 Merge branch 'wip-MDL-43966-master' of git://github.com/marinaglancy/moodle 2014-03-11 10:50:55 +08:00
David Monllao
6a0f3c4869 MDL-43236 behat: Fixing missing changes 
All "" "" should exists and "" "" should not exists
must be converted to the ones using exist rather than exists.
 2014-03-11 10:07:25 +08:00
Sam Hemelryk
1aefc90960 Merge branch 'wip-MDL-40721-master' of git://github.com/marinaglancy/moodle 2014-03-11 14:22:33 +13:00
Sam Hemelryk
8daf8cbc0a Merge branch 'w11_MDL-44451_m27_addonloc' of https://github.com/skodak/moodle 2014-03-11 14:18:08 +13:00
Eloy Lafuente (stronk7)
6d9ba13dc8 Merge branch '44547-27' of git://github.com/samhemelryk/moodle 2014-03-11 00:28:34 +01:00
Sam Hemelryk
8373c7e38e MDL-44547 repository_alfresco: version bump 2014-03-11 12:05:22 +13:00
Sam Hemelryk
e89fba41af MDL-44496 fixed renamed method ref in comment 2014-03-11 11:54:52 +13:00
Sam Hemelryk
509edd5624 Merge branch 'w11_MDL-44496_m27_eventbuffer' of https://github.com/skodak/moodle 2014-03-11 11:54:05 +13:00
Sam Hemelryk
421786ed61 Merge branch 'MDL-44334-master' of git://github.com/andrewnicols/moodle 2014-03-11 10:10:08 +13:00
Sam Hemelryk
2710ad2b52 Merge branch 'MDL-43721-master' of git://github.com/damyon/moodle 2014-03-11 09:19:44 +13:00
Sam Hemelryk
1fef3f6aac Merge branch 'wip-MDL-44471-master' of git://github.com/marinaglancy/moodle 2014-03-11 08:51:36 +13:00
Nobelium
39af2f4171 MDL-41855 SCORM form : Auto update frequency option under File manager 
Placing the Auto update frequency option underneath the File manager in /mod/scorm/mod_form.php
This changes the postion of the auto update freq option both while creating a new scorm object and while editing the scorm object.
 2014-03-10 14:03:33 +00:00
Tim Hunt
7b2a5e5663 MDL-44534 increase core_question Behat test robustness. 2014-03-10 12:32:39 +00:00
Dan Poltawski
4e1aad54b8 Merge branch 'wip-mdl-44017' of https://github.com/rajeshtaneja/moodle 2014-03-10 15:13:43 +08:00
Dan Poltawski
7f42ee92eb Merge branch 'MDL-44440_master' of git://github.com/dmonllao/moodle 2014-03-10 13:45:26 +08:00
David Monllao
1f631c7c63 MDL-44440 behat: Changing , for > as a navigation tree nodes separator 
Using greater than as seems a more natural separator
than the comma when separating nodes which have a
hierarchy relation.
 2014-03-10 13:35:40 +08:00
Dan Poltawski
c13c64b0e1 Merge branch 'MDL-43236_master' of git://github.com/dmonllao/moodle 2014-03-10 12:04:14 +08:00
Dan Marsden
538864dffd MDL-44066 Restore: Restore source field. 
Causes problems when restoring a SCORM pacakge that uses an alias.
 2014-03-08 21:09:30 +13:00
Dan Marsden
6573b07780 MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close. 2014-03-08 21:04:31 +13:00
Mark Nelson
7cd6abf28a MDL-40913 core_message: removed 'view' add_to_log call 2014-03-07 15:15:44 -08:00
Mark Nelson
5b09190975 MDL-40913 core_message: created 'message_read' event 2014-03-07 15:15:43 -08:00
Mark Nelson
ab1bc5d222 MDL-40913 core_message: replaced 'write' add_to_log call with an event 2014-03-07 15:15:43 -08:00
Mark Nelson
cd60936523 MDL-40913 core_message: replaced 'unblock contact' add_to_log call with an event 2014-03-07 15:15:43 -08:00
Mark Nelson
3f3d9521de MDL-40913 core_message: replaced 'block contact' add_to_log call with an event 2014-03-07 15:15:42 -08:00
Mark Nelson
5edf9f3bd3 MDL-40913 core_message: replaced 'remove contact' add_to_log call with an event 2014-03-07 15:15:42 -08:00
Mark Nelson
0d9bdf6185 MDL-40913 core_message: replaced 'add contact' add_to_log call with an event 2014-03-07 15:15:42 -08:00
Tim Hunt
8011be189e MDL-33653 fix preview links on calc qtype edit forms. 
Also, refactor how we render preview icons, to eliminate duplication.
 2014-03-07 19:46:56 +00:00
M Kassaei
7756e2bc85 MDL-33653 questions, a way to save changes and continue editing 2014-03-07 12:42:51 +00:00
James Pratt
185aae5dbe MDL-44497 quiz responses report : error when no attempts 2014-03-07 17:24:13 +07:00
David Monllao
75ddb69563 MDL-43236 behat: Step arguments normalization 
Updating step definitions arguments according to the
documentation page.
 2014-03-07 16:05:21 +08:00
David Monllao
759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00