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

71966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
0d98b0f7ad Merge branch 'MDL-48491-master' of git://github.com/zbdd/moodle 2015-01-27 10:48:36 +08:00
Eloy Lafuente (stronk7)
c07962d56d Merge branch 'MDL-48916' of https://github.com/wesleysitu/moodle 2015-01-27 01:06:43 +01:00
Eloy Lafuente (stronk7)
681b57bd28 Merge branch 'MDL-48921-master-2nd' of git://github.com/FMCorz/moodle 2015-01-27 01:02:39 +01:00
Eloy Lafuente (stronk7)
0e134b76b5 Merge branch 'MDL-48946-master' of https://github.com/sammarshallou/moodle 2015-01-27 00:56:51 +01:00
Eloy Lafuente (stronk7)
65d2f8e3f9 Merge branch 'wip-MDL-48325-master' of git://github.com/abgreeve/moodle 2015-01-27 00:22:36 +01:00
Eloy Lafuente (stronk7)
3195a1f91f Merge branch 'MDL-48939-master' of git://github.com/andrewnicols/moodle 2015-01-26 23:57:33 +01:00
Eloy Lafuente (stronk7)
d82ab7bf22 Merge branch 'MDL-48616-master' of git://github.com/jethac/moodle 2015-01-26 23:47:14 +01:00
Eloy Lafuente (stronk7)
13abbea83b Merge branch 'MDL-48407-master' of git://github.com/gurgus/moodle 2015-01-26 23:41:17 +01:00
Eloy Lafuente (stronk7)
e6b1816588 MDL-48266 backup: make upgrade step to match current version bump. 2015-01-26 19:22:44 +01:00
Eloy Lafuente (stronk7)
16dafa5d9f Merge branch 'MDL-48266-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2015-01-26 19:19:35 +01:00
Eloy Lafuente (stronk7)
2a5ecfa975 Merge branch 'MDL-48720-master' of git://github.com/andrewnicols/moodle 2015-01-26 19:08:21 +01:00
Eloy Lafuente (stronk7)
50b7b15894 Merge branch 'MDL-40286' of git://github.com/jmvedrine/moodle 2015-01-26 18:32:43 +01:00
Eloy Lafuente (stronk7)
59a99b02ee Merge branch 'MDL-35765-master' of git://github.com/merrill-oakland/moodle 2015-01-26 17:27:54 +01:00
Eloy Lafuente (stronk7)
6c1a89f1f3 Merge branch 'MDL-36877' of git://github.com/jmvedrine/moodle 2015-01-26 16:04:29 +01:00
Eloy Lafuente (stronk7)
ec96b4b3d9 Merge branch 'MDL-48711-master' of git://github.com/merrill-oakland/moodle 2015-01-26 11:14:33 +01:00
Eloy Lafuente (stronk7)
b646a710ba Merge branch 'MDL-43421' of git://github.com/mr-russ/moodle 2015-01-26 10:24:51 +01:00
Jean-Michel Vedrine
ccf2a054ae MDL-36877 Lesson: final page not displayed if show gradebook set to no 2015-01-25 18:46:00 +01:00
Jean-Michel Vedrine
b69d512a90 MDL-40286 mod_lesson: non-editing teacher should see Grade analysis 2015-01-23 20:21:08 +01:00
Andrew Nicols
e0ae3519a1 weekly release 2.9dev 2015-01-23 08:27:32 +08:00
Andrew Nicols
3b76ea5c48 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-01-23 08:27:25 +08:00
Dan Poltawski
79d6c46df3 Merge branch 'MDL-48949' of git://github.com/timhunt/moodle 2015-01-22 17:52:20 +00:00
Tim Hunt
0065f02469 MDL-48949 mod_lti: tidy mod/lti/upgrade.txt 2015-01-22 17:28:08 +00:00
sam marshall
b3d7eb6ed4 MDL-48946 Files: New custom description format_string call 
The format_string call used when getting file type descriptions
does not specify a context. The page context is not always
available at this point, so for consistency it should specify
the system context.
 2015-01-22 13:27:50 +00:00
Frederic Massart
94b8c63635 MDL-48266 backup: Fix backup strorage misconfiguration 
Basically if the destination dir is empty then the storage
type should be set to the course backup area. This does
not affect the behaviour of the backups that lived with
misconfigured settings.
 2015-01-22 17:49:26 +08:00
Frederic Massart
9fdf16a0fc MDL-48266 backup: Validate backup_auto_storage config 2015-01-22 17:48:07 +08:00
Eloy Lafuente (stronk7)
6e91426e73 Merge branch 'MDL-48493-master-autodetect' of git://github.com/mudrd8mz/moodle 2015-01-22 10:17:56 +01:00
David Mudrák
ef86599e99 MDL-48493 admin: Fix PHP warning thrown if unable to detect component 
The method detect_plugin_component() returns false or string. The
normalize_component() expects strings only. Passing false to it
(typically when the plugin does not declare its component) caused the
PHP warning.

Credit goes to Ankit Agarwal for spotting this during testing.
 2015-01-22 10:02:01 +01:00
Andrew Nicols
2f19417319 MDL-48939 core: Depreacte search_generate_text_SQL 
This has never been used outside of forum, where it was introduced in
Moodle 1.8 and required manual creation of an index.
 2015-01-22 15:10:00 +08:00
Adrian Greeve
4cac2470bb MDL-48325 mod_data: Export to portfolio button uses capability. 
The Export to portfolio button now checks the mod/data:exportownentry
capability to see if the export button should be shown.
 2015-01-22 14:49:21 +08:00
Zachary Durber
530debc078 MDL-48491 enrolments: Paypal enrolments send email as support user. 2015-01-22 13:42:08 +08:00
Dave Cooper
b02f473cfb MDL-48407 mod_forum: Updated text email notification template 2015-01-22 13:28:18 +08:00
Andrew Nicols
1cb5f61213 Revert "Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle" 
This reverts commit e08f58288af17bea8d55b66dae697d9d917053f4, reversing
changes made to 782ea98c59945864cfcc3ab44a6f17d49a9ed39f.
 2015-01-22 12:13:35 +08:00
Eloy Lafuente (stronk7)
a82d1fc4be Merge branch 'MDL-48823_master' of git://github.com/dmonllao/moodle 2015-01-21 12:32:19 +01:00
Andrew Nicols
5f9997ae95 MDL-48720 mod_forum: Tidy up whitespace to comply with coding style 2015-01-21 12:15:12 +08:00
Andrew Nicols
9ddb376645 MDL-48720 mod_forum: Only copy discussion preferences when moving posts 
Rather than adding discussion preferences to a user based upon their
subscription to the source forum, only respect any actively selected
preference. That is to say that:
* if a user has opted into a discussion and following a move would be
  unsubscribed, re-subscribe them;
* if a user has opted out of a discussion and following a move would be
  subscribed once more, unsubscribe them; and
* if a user has not made an active choice, follow the discussion preference
  for the target forum.
 2015-01-21 12:15:12 +08:00
Andrew Nicols
e2a036b4a9 Merge branch 'MDL-348' of https://github.com/bostelm/moodle 2015-01-21 11:46:22 +08:00
Frederic Massart
cd5e627de8 MDL-48921 admin: Keep the search string in the URL after form submission 2015-01-21 11:33:03 +08:00
David Monllao
8babb9606b MDL-48823 admin: Just one admin tree reload after settings changes 2015-01-21 10:41:23 +08:00
Andrew Nicols
81a9b9cee3 Merge branch 'wip-mdl-48761' of https://github.com/rajeshtaneja/moodle 2015-01-21 10:21:24 +08:00
Rajesh Taneja
d58b0ad6f1 MDL-48761 behat: Added new step for debugging scenarios 2015-01-21 10:16:22 +08:00
David Monllao
59da38ef8a Merge branch 'MDL-28513-master' of git://github.com/andrewnicols/moodle 2015-01-21 09:52:55 +08:00
Andrew Nicols
da992717f4 MDL-28513 install: Add adminemail to the CLI installers 2015-01-21 09:42:51 +08:00
Wesley Situ
7be4cf1873 MDL-48916 atto_undo: Clarify text for "Undo/Redo" 2015-01-20 16:21:35 -08:00
Eloy Lafuente (stronk7)
6d33cf76cd Merge branch 'wip-MDL-48847-master' of git://github.com/marinaglancy/moodle 2015-01-21 00:28:30 +01:00
Eloy Lafuente (stronk7)
2d78593650 Merge branch 'MDL-48830-m' of https://github.com/micaherne/moodle 2015-01-21 00:03:56 +01:00
Eric Merrill
3f874a9d24 MDL-48711 gradebook: Properly compute extra-redit status for cat grades 
When seeing if a grade item for a category is computed for extra-credit
status, we need to use the *grandparent* of the item.
 2015-01-20 16:06:38 -05:00
Eric Merrill
4b4e41342a MDL-35765 availability: Use category total full names 2015-01-20 15:37:13 -05:00
Eloy Lafuente (stronk7)
298c45f2e3 Merge branch 'MDL-48873_master' of https://github.com/StudiUM/moodle 2015-01-20 19:23:05 +01:00
Eloy Lafuente (stronk7)
fac7cff3e2 Merge branch 'MDL-48813_m29' of git://github.com/sbourget/moodle 2015-01-20 19:20:26 +01:00
Eloy Lafuente (stronk7)
cb502499da Merge branch 'wip-mdl-48837' of https://github.com/rajeshtaneja/moodle 2015-01-20 18:52:00 +01:00