mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-02 15:02:41 +02:00
Code Issues Projects Releases Wiki Activity
71,982 Commits 36 Branches 528 Tags
Commit Graph

71982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
73bf1119dd Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle 2015-01-27 21:18:24 +01:00
Eloy Lafuente (stronk7)
7615deba22 Merge branch 'MDL-48660-master' of https://github.com/sammarshallou/moodle 2015-01-27 21:11:27 +01:00
Neill Magill
8072628a67 MDL-48177 core: Plugin environment checks with no version of Moodle 
The environment.xml files in plugins force you to define the versions of Moodle that the checks should be carried out against.
For community plugins the environment requirements of the plugin seem unlikely to be dependant on the version of Moodle.

This patch will allow the environment.xml files to use a new <PLUGIN> tag in place of the <MOODLE version="> tag.

This solution has the following properties:

* The Environment file will not break versions of Moodle that do not support the PLUGIN syntax.
* Specific versioned MOODLE tags can still be defined for versions of Moodle that do not have this patch.
* If both MOODLE and PLUGIN tags exist the PLUGIN tag will be used in preference.
* The PLUGIN tag will not function in the main Moodle environment.xml file.
* The PLUGIN tag has a mandatory name attribute that must match the frankenstyle name of the plugin being tested.
 2015-01-27 13:08:47 +01:00
Eloy Lafuente (stronk7)
f271b113a6 Merge branch 'MDL-40285_master' of git://github.com/markn86/moodle 2015-01-27 12:09:58 +01:00
Eloy Lafuente (stronk7)
61b31b4e10 Merge branch 'MDL-48383-master' of git://github.com/FMCorz/moodle 2015-01-27 12:01:04 +01:00
sam marshall
6b40e5b2ec MDL-48660 Availability: filter_user_list() should respect 'view hidden' 
Updated filter_user_list and get_user_list_sql to account for
the viewhiddenactivities and viewhiddensections capabilities.
 2015-01-27 10:59:05 +00:00
Mark Nelson
d2e1c5f5fc MDL-40285 mod_assign: added extra group submissions behat scenario 
Thanks a lot to Jody Steele for providing the basis for the scenario.
 2015-01-27 00:36:49 -08:00
Mark Nelson
e43f1d514c MDL-40285 mod_assign: show details for all default group members 2015-01-27 00:36:49 -08:00
Andrew Nicols
6d5381a38f Merge branch 'MDL-47871_master' of https://github.com/markn86/moodle 2015-01-27 13:09:29 +08:00
Andrew Nicols
85099b388f MDL-46755 format_social: Minor corrections during integration 
* Add additional checks in behat tests to ensure ordering of information
  does not give false positives
* Typo in lang pack
* Comment correction
 2015-01-27 12:14:24 +08:00
Mark Nelson
bb286b6d5f MDL-47871 tool_monitor: allow teachers to duplicate site rules 2015-01-26 19:32:59 -08:00
Andrew Nicols
d927bc0f32 Merge branch 'MDL-46755_m29-2' of https://github.com/sbourget/moodle 2015-01-27 11:30:55 +08:00
Andrew Nicols
0d98b0f7ad Merge branch 'MDL-48491-master' of git://github.com/zbdd/moodle 2015-01-27 10:48:36 +08:00
David Monllao
58f2c3ca5c MDL-47159 atto_link: Adding prefix when url doesn't specify one 2015-01-27 10:43:29 +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
Frederic Massart
18247eb090 MDL-48383 task: Indicate when a task will not run if plugin is disabled 2015-01-22 11:07:52 +08:00
Stephen Bourget
7ce40bcb97 MDL-46755 format_social: behat test 2015-01-21 11:08:43 -05:00
Stephen Bourget
0d67ac8ea2 MDL-46755 format_social: Make discussion count configurable 2015-01-21 11:08:01 -05: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