mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 17:03:33 +02:00
Code Issues Projects Releases Wiki Activity
72,045 Commits 36 Branches 529 Tags
Commit Graph

72045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
43bde1b9fd Merge branch 'm29_MDL-46467' of https://github.com/totara/moodle 2015-02-03 12:57:25 +08:00
Andrew Nicols
6ef9a63bcd Merge branch 'MDL-48608_master' of git://github.com/markn86/moodle 2015-02-03 12:30:29 +08:00
Mark Nelson
d838640e4c MDL-48608 mod_assign: correctly display grades for group assignments 2015-02-02 20:13:24 -08:00
David Monllao
a5b4cc9635 Merge branch 'wip_MDL-46728_master' of git://github.com/gjb2048/moodle 2015-02-03 11:45:15 +08:00
David Monllao
9afe4eb556 MDL-43752 repository_s3: Using setDefault 2015-02-03 11:04:51 +08:00
David Monllao
5428d6b065 Merge branch 'MDL-43752-master' of git://github.com/DanBennettUK/moodle 2015-02-03 10:52:21 +08:00
Eloy Lafuente (stronk7)
f4160a8e52 Merge branch 'MDL-43387' of git://github.com/jmvedrine/moodle 2015-02-03 01:17:03 +01:00
Eloy Lafuente (stronk7)
968e8dc94b Merge branch 'MDL-48525-master' of git://github.com/jleyva/moodle 2015-02-03 00:57:37 +01:00
Eloy Lafuente (stronk7)
bd6a0c5df1 Merge branch 'MDL-48578-master' of git://github.com/jleyva/moodle 2015-02-03 00:47:13 +01:00
Eloy Lafuente (stronk7)
22102378d3 Merge branch 'MDL-48793-master' of git://github.com/jleyva/moodle 2015-02-03 00:45:16 +01:00
Eloy Lafuente (stronk7)
fe1e5e1963 Merge branch 'MDL-47562-master' of git://github.com/damyon/moodle 2015-02-02 23:51:15 +01:00
Dan Bennett
9b71e3aff0 MDL-43752 repository_s3: added endpoint select box to settings page 2015-02-02 15:34:36 +00:00
David Monllao
5ade288ab0 Merge branch 'MDL-31036-master' of git://github.com/zbdd/moodle 2015-02-02 14:54:48 +08:00
Jean-Michel Vedrine
ebf5ad4fa2 MDL-43387 mod_lesson: add an editor for essay grading comments 2015-02-01 19:01:40 +01:00
Zachary Durber
75d08f0291 MDL-31036 mod_assign: Don't strip quickgrading feedback of special chars 2015-01-30 14:43:35 +08:00
John Okely
3a0c9c6306 MDL-48772 enrol_cohort: Replace hardcoded language with language strings 2015-01-30 11:29:40 +08:00
Gareth J Barnard
eb1861983a MDL-46728 themes: WOFF2 fonts are not supported. 2015-01-29 16:11:43 +00: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
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
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