mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity
73,443 Commits 37 Branches 536 Tags
Commit Graph

73443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
0f186bd62d Merge branch 'MDL-50110' of git://github.com/ramdesh/moodle 2015-05-07 12:16:03 +08:00
Andrew Nicols
954f3f5aa8 Merge branch 'MDL-50047-master-2nd' of git://github.com/FMCorz/moodle 2015-05-07 11:36:36 +08:00
Frederic Massart
546a58bcdc MDL-50128 mod_data: String needed escaping before being used in regex 2015-05-07 11:19:47 +08:00
Andrew Nicols
7ae030d54e Merge branch 'master_MDL-50133' of https://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/version.php
 2015-05-07 10:24:11 +08:00
Andrew Nicols
85643ff6e0 Merge branch 'MDL-49802-master' of git://github.com/FMCorz/moodle 2015-05-07 10:03:37 +08:00
Andrew Nicols
92f47ae2f9 Merge branch 'MDL-49783-master' of git://github.com/mastnym/moodle 2015-05-07 09:42:21 +08:00
Martin Mastny
eaec9cfec7 MDL-49783 forms: Collapsed form section is opened on error 2015-05-07 08:57:30 +08:00
Dan Marsden
a374769640 MDL-50133 mod_scorm: use correct captypes 2015-05-07 11:43:28 +12:00
Ramindu Deshapriya
83679e0fb9 MDL-50110 mod_book: Added Behat test to automate MDLQA-7646 2015-05-07 01:52:18 +05:30
Dan Poltawski
57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01:00
Frederic Massart
913784114d MDL-49802 core_message: Prevent message being sent twice in messenger 2015-05-06 17:43:48 +08:00
David Monllao
52802cf624 Merge branch 'MDL-49870-master' of git://github.com/damyon/moodle 2015-05-06 15:30:31 +08:00
Marina Glancy
8b4568500b MDL-49788 navigation: Ensure we only check active enrolments 2015-05-06 08:01:31 +01:00
Damyon Wiese
917bd02be5 MDL-49870 tool_templatelibrary: Allow docs in parent template only. 
If the mustache comment containing the docs for the template is
not found in the theme overridden template, search the original
core/plugin template for the docs.
 2015-05-06 14:54:56 +08:00
Salih Gedik
683f717919 MDL-49789 mod_book: filter book chapter content 2015-05-06 13:54:24 +08:00
Frederic Massart
36c1cc4dc1 MDL-50047 quiz_results: Restore handles misconfig and missing quizzes 
We had to change back the result of instance_allow_multiple to true,
or a backup would have only restored one instance at random.
 2015-05-06 13:16:01 +08:00
Marina Glancy
46be1d58ac MDL-49718 externallib: unittest correction 2015-05-06 13:00:56 +08:00
Frederic Massart
ae742f12c1 MDL-50047 quiz_results: Upgrade handles misconfig and missing quizzes 2015-05-06 12:32:29 +08:00
Andrew Nicols
1bd3c5b846 Merge branch 'MDL-49931-master' of git://github.com/ankitagarwal/moodle 2015-05-06 12:25:56 +08:00
Andrew Nicols
43ef409276 Merge branch 'MDL-49985_master' of git://github.com/markn86/moodle 
Conflicts:
	mod/forum/post.php
 2015-05-06 11:11:21 +08:00
Marina Glancy
f236dcc35c MDL-50090 user: suspended user can login upon conrimation 2015-05-06 11:00:44 +08:00
Juan Leyva
c4a150219a MDL-49718 webservices: Fix forced format and force external text cleaning 2015-05-06 10:56:09 +08:00
Juan Leyva
57d9a750e3 MDL-49994 files: Prevent to browse private files when are disabled 2015-05-06 10:27:18 +08:00
Andrew Nicols
8e92f48c40 Merge branch 'MDL-50001-master' of git://github.com/damyon/moodle 2015-05-06 09:13:19 +08:00
Eloy Lafuente (stronk7)
15005d91f0 MDL-50102 versions: coding style cleanup. 2015-05-05 18:23:21 +02:00
Eloy Lafuente (stronk7)
84d6094685 MDL-50102 versions: main version mini-bump 2015-05-05 17:45:06 +02:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release 
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
 2015-05-05 17:43:19 +02:00
Marina Glancy
4f8b6d5674 MDL-50099 auth: less verbose account confirmed message 2015-05-05 15:33:36 +01:00
Frederic Massart
db200a8e9f MDL-49179 setuplib: print_error() uses local URLs exclusively 2015-05-05 18:31:13 +08:00
Frederic Massart
b2687a055d MDL-49179 weblib: Secure the direct usage of $_SERVER['HTTP_REFERER'] 2015-05-05 18:31:13 +08:00
Frederic Massart
dd0607b7bb MDL-49179 mod_forum, mod_quiz: Prevent misuse of get_referer() 2015-05-05 18:31:13 +08:00
Tim Hunt
e51fdfe0cb MDL-49941 quiz: mod/quiz:grade should declare RISK_XSS 2015-05-05 18:31:13 +08:00
Frederic Massart
d031c2dcb9 MDL-49401 moodlelib: PARAM_LOCALURL supports loginhttps 2015-05-05 18:31:13 +08:00
Eloy Lafuente (stronk7)
b3f5865eab Moodle release 2.9rc1 v2.9.0-rc1 2015-05-05 12:29:09 +02:00
Eloy Lafuente (stronk7)
c12cfeac45 Merge branch 'MDL-49845-fix3-master' of git://github.com/gurgus/moodle 2015-05-05 11:42:08 +02:00
Dave Cooper
186747fd75 MDL-49845 core_user: Fix behat failures 2015-05-05 17:30:53 +08:00
Dave Cooper
4c54bc6fe1 MDL-49845 lang: Remove userspreferences string 2015-05-05 16:36:30 +08:00
Mark Nelson
9542b15671 MDL-49985 core_enrol: direct user to appropriate URL 2015-05-05 01:17:23 -07:00
Mark Nelson
b3cb726431 MDL-49985 core_course: revert commit belonging to MDL-18309 
This reverts commit 6601690202764d786a5ee4b7bbd9afb5b91dd0ec.

This commit was adding the 'returnurl' param unnecessarily to the
course links in the navigation block, causing a lot of long URLs
to be created.
 2015-05-05 01:09:20 -07:00
Andrew Nicols
8b3ba5b370 Merge branch 'MDL-49983-master-fix-3' of https://github.com/xow/moodle 2015-05-05 15:34:00 +08:00
David Monllao
48645e475b Merge branch 'wip-MDL-49778-master' of git://github.com/abgreeve/moodle 2015-05-05 15:20:47 +08:00
Adrian Greeve
aac6717056 MDL-49778 lib: Update to upgrade_stale_php_files_present() 2015-05-05 15:18:33 +08:00
John Okely
6289c2ea94 MDL-49983 admin: Improve user menu grades setting language strings 2015-05-05 15:13:01 +08:00
Ankit Agarwal
36bbb0b70a MDL-49931 preferences: Add cancel button to forms 2015-05-05 10:32:14 +05:30
Damyon Wiese
e67585f8ca MDL-50001 grunt: Make grunt work on windows 
Unfortunately, this is not perfect yet. It will build the entire
repository every time - which takes a while because it builds all the
yui modules (On linux it correctly only builds whats in the current dir).
 2015-05-05 12:15:59 +08:00
Andrew Nicols
ce16ceb667 Merge branch 'MDL-49983-master-fix-2' of https://github.com/xow/moodle 2015-05-05 11:57:03 +08:00
John Okely
ad13aff7c4 MDL-49983 lang: Remove language strings that were added in 2.9 2015-05-05 11:35:21 +08:00
Andrew Nicols
d2bec50b7c MDL-48002 inbound: Tidy up language in unit test 2015-05-05 10:57:35 +08:00
David Monllao
96ec51bdec Merge branch 'MDL-50055-master' of git://github.com/andrewnicols/moodle 2015-05-05 10:51:30 +08:00
David Monllao
9f3adc943b Merge branch 'MDL-49848-master' of git://github.com/xow/moodle 2015-05-05 10:37:53 +08:00