mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-18 14:40:06 +01:00
Code Issues Projects Releases Wiki Activity
72,023 Commits 36 Branches 527 Tags
Commit Graph

72023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juan Leyva
60ab2e1bc4 MDL-48719 messages: New WS core_message_get_blocked_users 2015-01-29 13:04:43 +01:00
Eloy Lafuente (stronk7)
4c27f52d91 weekly release 2.9dev 2015-01-29 10:27:52 +01:00
Eloy Lafuente (stronk7)
c230ccb5ce Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-01-29 10:27:40 +01:00
Andrew Nicols
6738ad643b MDL-8626 mod_data: Only show select/delete options when entries present 2015-01-29 10:26:44 +08:00
Andrew Nicols
5310179939 Merge branch 'MDL-36877' of https://github.com/jmvedrine/moodle 2015-01-29 09:08:53 +08:00
Eloy Lafuente (stronk7)
c5c34b4019 Revert "Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle" 
This reverts commit 73bf1119ddc19181f02fac81c7d7c3def9f5e28f, reversing
changes made to 7615deba22cfae9076a79fc8ce902b24815c1fff.
 2015-01-28 21:13:42 +01:00
Jean-Michel Vedrine
59d7a9dc75 MDL-36877 mod_lesson: Fix while MDL-38578 is not solved 2015-01-28 20:54:38 +01:00
Eloy Lafuente (stronk7)
74bc0178ea Merge branch 'MDL-48855_master' of https://github.com/dmonllao/moodle 2015-01-28 12:41:06 +01:00
Eloy Lafuente (stronk7)
941ea6b2ff Merge branch 'MDL-48898' of git://github.com/timhunt/moodle 2015-01-28 12:27:07 +01:00
Eloy Lafuente (stronk7)
8f2e522735 Merge branch 'wip-MDL-48978-master' of git://github.com/marinaglancy/moodle 2015-01-28 11:58:50 +01:00
David Monllao
17031f764f Merge branch 'MDL-48914' of git://github.com/rtcn2/moodle 2015-01-28 17:44:05 +08:00
Marina Glancy
17d33eec66 MDL-48978 user: fixed regression from MDL-37704 2015-01-28 16:47:50 +08:00
Andrew Nicols
06c2753115 MDL-48542 user_menu: Handle invalid strings better 2015-01-28 15:39:15 +08:00
Damyon Wiese
af9a7937cc MDL-48980 Security: Always clean the result from min_get_slash_argument 
The result from this function is used in send_file calls and if unclean
(windows dir separators, or .. path components) it could expose sensitive
files (e.g. .php files). Now we always clean the result from this function
even if it means double cleaning.

I also fixed the unit test for this function and added a new test for this cleaning.

I also updated the comments to point to get_file_argument as the full version of
min_get_slash_argument.
 2015-01-28 14:38:29 +08:00
Andrew Nicols
e5d0b0492e Merge branch 'MDL-48266_master-fix2' of git://github.com/markn86/moodle 2015-01-28 14:09:30 +08:00
Andrew Nicols
aeb108d226 Merge branch 'MDL-41026-fixes' of git://github.com/andrewnicols/moodle 2015-01-28 13:57:10 +08:00
Andrew Nicols
60d807811f MDL-41026 webservices: Correct unit tests 2015-01-28 13:50:57 +08:00
Mark Nelson
6c85571902 MDL-48266 core: fixed backup upgrade 2015-01-27 21:32:07 -08:00
Andrew Nicols
99a9ac6538 MDL-48620 JavaScript: Correct sorting after new options 2015-01-28 13:23:55 +08:00
Andrew Nicols
ade0072379 MDL-48542 user_menu: Increment index for all menu items 
The invalid type was not causing the idx to incremented, thus missing off
the final divider.
 2015-01-28 12:09:23 +08:00
Andrew Nicols
8b7ca27d48 MDL-48542 user_menu: Improve user menu tests 
Add additional test cases, and actually test that the output is roughly
what we expect.
 2015-01-28 12:09:22 +08:00
Andrew Nicols
0977d3d404 Merge branch 'MDL-48542-master' of git://github.com/jethac/moodle 2015-01-28 12:02:28 +08:00
Andrew Nicols
be15d38b79 Merge branch 'MDL-41026-master' of git://github.com/ankitagarwal/moodle 2015-01-28 10:05:31 +08:00
Stephen Bourget
5bc12ca265 MDl-47104 Calendar: Make 'calendar_lookahead' more flexible 2015-01-28 02:24:36 +01:00
John Okely
5cb440f936 MDL-8626 database: Move search and sort controls to top of page 
Credit to Andrew Walbran for the patch.
 2015-01-28 09:06:30 +08:00
Eloy Lafuente (stronk7)
8181ab5865 Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
 2015-01-28 01:02:54 +01:00
Eloy Lafuente (stronk7)
215c37097e Merge branch 'MDL-48685-master' of git://github.com/andrewnicols/moodle 2015-01-28 00:36:14 +01:00
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
AMOS bot
45b6276ef6 Automatically generated installer lang files 2015-01-28 00:04:21 +08: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
Jerome Mouneyrac
09ca18a47e MDL-41026 webservices: use correct param format in external apis 2015-01-27 10:06:09 +05:30
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
Andrew Nicols
96a5463119 MDL-48685 core_useragent: Correct IE 5.0 issues 2015-01-27 08:36:20 +08:00
Andrew Nicols
83af132901 MDL-48685 tests: Add testing for supports_json_contenttype 2015-01-27 08:36:20 +08:00
Andrew Nicols
5ee4f58134 MDL-48685 tests: Add additional User Agents 
* Firefox 33; Mac OS X 10.10
* Chrome 39; Mac OS X
* Safari; iPhone 6 Plus; iOS 8.1; Build 12B411
* Opera 12.15 (Build 1748); Mac OS X
 2015-01-27 08:36:20 +08:00
Andrew Nicols
7c10ad334d MDL-48685 tests: Rewrite useragent tests 2015-01-27 08:36:19 +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