mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-10 18:59:55 +01:00
Code Issues Projects Releases Wiki Activity
65,806 Commits 36 Branches 523 Tags
Commit Graph

65806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
e3febb2315 Merge branch 'MDL-43140_master' of https://github.com/markn86/moodle 2013-12-03 23:24:22 +01:00
Sam Hemelryk
12f46583f0 Merge branch 'MDL-43093' of git://github.com/timhunt/moodle 2013-12-04 10:12:12 +13:00
Sam Hemelryk
4f13423663 Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle 2013-12-04 09:49:29 +13:00
Sam Hemelryk
2a336e2a36 Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle 
Conflicts:
	backup/util/ui/base_moodleform.class.php
 2013-12-04 09:44:25 +13:00
Sam Hemelryk
db9c8f4c7d Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle 2013-12-04 09:43:43 +13:00
Eloy Lafuente (stronk7)
7b583eea95 Merge branch 'wip-MDL-43058-master' of git://github.com/abgreeve/moodle 2013-12-03 19:33:15 +01:00
Eloy Lafuente (stronk7)
75b296abf6 Merge branch 'MDL-43105-master' of git://github.com/andrewnicols/moodle 2013-12-03 19:15:05 +01:00
Eloy Lafuente (stronk7)
3e1a05790d Merge branch 'master-mdl33971' of https://github.com/tlock/moodle 2013-12-03 17:17:06 +01:00
Mary Evans
126df92b94 MDL-43092 theme_afterburner: Activity or Resource dialog greyed-out for non-empty courses 2013-12-03 14:52:27 +00:00
Eloy Lafuente (stronk7)
6cc00494e2 Merge branch 'MDL-43079-master-v2' of https://github.com/jamiepratt/moodle 2013-12-03 15:36:25 +01:00
Damyon Wiese
a977fa7b36 Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle 2013-12-03 17:29:39 +08:00
Aaron Barnes
ddb0a1b0e5 MDL-43087 testing: ability to load features from additional paths 2013-12-03 22:11:26 +13:00
Eloy Lafuente (stronk7)
e7b3306a69 Merge branch 'MDL-42885_master' of https://github.com/markn86/moodle 2013-12-03 10:01:19 +01:00
Damyon Wiese
23a05a1b9a Merge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle 2013-12-03 16:15:53 +08:00
Damyon Wiese
a5ec4f7ae9 Merge branch 'wip-MDL-43026-master' of git://github.com/marinaglancy/moodle 2013-12-03 16:11:48 +08:00
Dan Poltawski
9c25a183fa Merge branch 'master-mdl43020' of https://github.com/tlock/moodle 2013-12-03 16:08:15 +08:00
Dan Poltawski
a9d04b9b91 Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle 2013-12-03 16:01:22 +08:00
Dan Poltawski
8761a4f15d Merge branch 'MDL-42097-master' of git://github.com/ankitagarwal/moodle 2013-12-03 15:21:09 +08:00
Damyon Wiese
53741d32a6 Merge branch 'MDL-42962-master' of git://github.com/ankitagarwal/moodle 2013-12-03 15:15:25 +08:00
Damyon Wiese
4c9464ca0d Revert "MDL-39286 Remove link on My Courses settings heading" 
This reverts commit 8b79059480935160a7ef0b9d767a4fc2a5532b39.

Behat is failing with this change.
 2013-12-03 14:59:16 +08:00
Dan Poltawski
6ca388028e Revert "MDL-42932 core_calendar: introduced calendar type system setting" 
This reverts commit bb32a499e10abc3bb88e715fb0575e5b7fb66e8e.
 2013-12-03 14:57:10 +08:00
Dan Poltawski
aa8abbee14 Revert "MDL-42932 core_lib: added missing $CFG declaration" 
This reverts commit 4c61097cc7138dd18173775ec55fe2c5aed48857.
 2013-12-03 14:57:08 +08:00
Andrew Nicols
d3f62f2aa3 MDL-42989 JavaScript: Check result of navigation IO requests before reporting errors 
When making a request which fails, we need to ensure that the AJAX query
was not aborted before displaying the error.

This ensures that if the navigation tree is being requested at the same
time as a page load is being processed, the abortion of the AJAX request is
not displayed before the page reloads.
 2013-12-03 14:36:42 +08:00
Ankit Agarwal
e10ea84ed0 MDL-42962 events: Remove duplicate code from all course_module_viewed events 2013-12-03 14:24:32 +08:00
Ankit Agarwal
3c24828823 MDL-42962 events: Add unit tests for the abstract class course_module_viewed 2013-12-03 14:24:31 +08:00
Ankit Agarwal
df2ac49f72 MDL-42962 events: Add a abstract class course_module_viewed 
AMOS BEGIN
 CPY [eventcoursemoduleviewed,core],[eventcoursemoduleviewed,mod_feedback]
AMOS END
 2013-12-03 14:24:31 +08:00
Andrew Nicols
2f13dd98b0 MDL-42989 JavaScript: Do not attempt to expand navigation when opening link 
When clicking on a link which is also expandable, we should not attempt to
expand it.
 2013-12-03 14:20:51 +08:00
Ankit Agarwal
963cdce4e2 MDL-42097 auth: Auth plugins must check passwordurl before returning it 2013-12-03 14:17:42 +08:00
Damyon Wiese
8f49492ac2 Merge branch 'time-limit-fix' of https://github.com/danpoltawski/moodle 2013-12-03 14:17:34 +08:00
Ankit Agarwal
6513cc0376 MDL-42097 formslib: updates to edit profile form 
Add a new dependency 'in' in forms library
Use the 'in' dependency to disable the 'changepassword' field when a auth plugin doesn't support it
 2013-12-03 14:15:16 +08:00
Dan Poltawski
0b2f11dbc3 MDL-42084 lib: fix undefined variable warnings 2013-12-03 14:00:21 +08:00
Dan Poltawski
753eb47edc Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle 2013-12-03 13:45:59 +08:00
Rajesh Taneja
e6e5f43efc MDL-40079 repositories: Added deprecated tags 2013-12-03 13:34:33 +08:00
Rajesh Taneja
7f9a4b35c3 MDL-40079 repositories: Replaced const with configs for boxnet 2013-12-03 13:24:10 +08:00
Damyon Wiese
6b8c6278bc Merge branch 'MDL-43076-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-03 13:18:47 +08:00
Damyon Wiese
e7af63633e Merge branch 'MDL-43081-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/upgrade.txt
 2013-12-03 13:03:32 +08:00
Dan Poltawski
4ab19f9c71 Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle 2013-12-03 12:52:10 +08:00
Dan Poltawski
ebe051792d Merge branch 'MDL-42738_master' of git://github.com/dmonllao/moodle 2013-12-03 12:41:03 +08:00
Dan Poltawski
03742ae8f9 Merge branch 'MDL-43066_master' of git://github.com/dmonllao/moodle 2013-12-03 12:36:50 +08:00
Damyon Wiese
b3d252a6b4 Merge branch 'wip-mdl-43048' of https://github.com/rajeshtaneja/moodle 2013-12-03 11:43:32 +08:00
Dan Poltawski
cd515a9421 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-03 11:41:06 +08:00
Mark Nelson
4c61097cc7 MDL-42932 core_lib: added missing $CFG declaration 2013-12-02 19:25:32 -08:00
Damyon Wiese
de3e0d20bd Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	enrol/self/db/upgrade.php
 2013-12-03 11:10:18 +08:00
Andrew Nicols
69353dcecd MDL-43164 JavaScript: Use the up/down move icon for non-AJAX courses 
When a course format does not support AJAX, or AJAX is disabled at the site
level, we should revert back to the old-style move icon.

This helps to clarify that you cannot drag/drop the icon, but must click
instead.
 2013-12-03 10:49:29 +08:00
Dan Poltawski
8d8e6f9607 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-03 10:07:10 +08:00
Damyon Wiese
13410584be Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle 
Conflicts:
	filter/tex/version.php
	lang/en/admin.php
 2013-12-03 09:26:58 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Sam Hemelryk
b5fd2497d6 Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle 2013-12-03 10:25:26 +13:00
Tim Hunt
b2f1717143 MDL-43093 update repeat_elements PHPdoc. 2013-12-02 17:48:44 +00:00
Damyon Wiese
2a1e730eb3 Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle 2013-12-02 15:16:12 +08:00