72310 Commits

Author SHA1 Message Date
Rajesh Taneja
15aacd0454 MDL-49105 mod_lesson: Removed unused image insert step in behat 2015-01-30 08:57:50 +08:00
Rajesh Taneja
d0c36ce621 MDL-49015 mod_lesson: Don't rely on external links in behat 2015-01-30 08:57:49 +08:00
Rajesh Taneja
c3b72e586a MDL-48624 behat: Added extended timeout to ensure step pass
following_should_download_between_and_bytes step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
Also, not calling force download while running behat site
2015-01-30 08:54:12 +08:00
Rajesh Taneja
8fe8df4a8b MDL-48624 behat: Added page load check in workshop step
i_allocate_submissions_in_workshop_as step sometimes
fails because of server speed. Added page load check
with extended timout.
2015-01-30 08:54:11 +08:00
Vadim Dvorovenko
6aec17bd00 MDL-48955 filter_mathjax: Regexp fix for texfiltercompatibility mode
Fixing incorrect regexp for replacing text like
"$$a$$ and $$b$$" to "\(a\) and \(b\)". This is needed for
texfiltercompatibility to work as expected.
2015-01-29 23:17:22 +07:00
Gareth J Barnard
eb1861983a MDL-46728 themes: WOFF2 fonts are not supported. 2015-01-29 16:11:43 +00:00
AMOS bot
893cf6b4d7 Automatically generated installer lang files 2015-01-30 00:04:09 +08:00
Juan Leyva
ca4154ceaf MDL-48357 webservices: Missing instance property in course contents ws 2015-01-29 14:06:09 +01:00
Tony Levi
0021942592 MDL-48924 backup: Fix some get_file_packer() calls for enabletgzbackups 2015-01-29 22:53:20 +10:30
Juan Leyva
ff1f373996 MDL-48719 messages: Unit tests for WS core_message_get_blocked_users 2015-01-29 13:04:43 +01:00
Juan Leyva
60ab2e1bc4 MDL-48719 messages: New WS core_message_get_blocked_users 2015-01-29 13:04:43 +01:00
Juan Leyva
a86f23cd53 MDL-48525 webservices: Fixed profile user image is not always returned 2015-01-29 13:02:16 +01:00
Juan Leyva
d9a1cf5cae MDL-48793 webservices: Deleted duplicated function in mobile service 2015-01-29 13:01:51 +01:00
Juan Leyva
11d83ab30b MDL-48578 webservices: Fixed missing required library 2015-01-29 13:01:32 +01:00
Juan Leyva
5785421a37 MDL-48989 messages: Add site information in airnotifier payload 2015-01-29 12:59:03 +01:00
sam marshall
a79970a295 MDL-48945 tool_filetypes: Added verification to description setting. 2015-01-29 11:44:50 +00:00
Jetha Chan
20a263ecfa MDL-48889 repository_s3: pipe S3Exception messages into moodle
When processing S3Exceptions thrown by the S3 library, pass
the exception messages into the moodle_exceptions being
created in order to actually tell people what went wrong.
2015-01-29 17:41:32 +08: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
Damyon Wiese
bd6bfb7f21 MDL-47562 gradereport_singleview: New lang string for save button
AMOS BEGIN
    CPY [save,admin],[save,gradereport_singleview]
AMOS END
2015-01-29 11:35:18 +08:00
Damyon Wiese
2a6cdc51b7 MDL-47562 gradereport_singleview: ui fixes and improvements
Collection of ui improvements that did not get completed before 2.8 was released.
See the tracker for more details.
2015-01-29 11:35:12 +08: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
Tim Hunt
a6099a7a13 MDL-49006 admin: activity descriptions shouldn't be required by default 2015-01-28 21:52:58 +00: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
Rajesh Taneja
20153f6308 MDL-48926 behat: No expand form required in non-js mode 2015-01-28 10:58:01 +10:30
Tony Levi
80ac8522cc MDL-48926 behat: Do not poll within spin for non-javascript mode 2015-01-28 10:58:00 +10:30
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