mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity
61,768 Commits 36 Branches 519 Tags
Commit Graph

61768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
849a016128 Merge branch 'MDL-37459-master-fix' of https://github.com/damyon/moodle 2013-06-11 15:32:27 +10:00
Sam Hemelryk
11ea436f4f Merge branch 'MDL-26925-master' of git://github.com/danpoltawski/moodle 2013-06-11 17:31:51 +12:00
Damyon Wiese
19127f6f09 MDL-37459: Fix unprintable chars in wierd commit 
Somehow some unprintable chars made it into the last commit.

Removing them all...
 2013-06-11 13:25:28 +08:00
Sam Hemelryk
b618f2d9f7 Revert "MDL-37490 mod_assign: Add setting to show the due date on the course page." 
This reverts commit ef8a6dfb33c572beb0982818e9380476d6e636e2.
 2013-06-11 17:10:36 +12:00
Sam Hemelryk
3e69c074ac Revert "MDL-37490 Assign: Minor patch cleanup" 
This reverts commit 06b9df11452fa78832fda6c6c188b561008bd8dd.
 2013-06-11 17:10:30 +12:00
Sam Hemelryk
2b46a31a3f Merge branch 'MDL-22390' of git://github.com/timhunt/moodle 2013-06-11 17:07:14 +12:00
Dan Poltawski
47cddbed5c Merge branch 'MDL-40010_master' of https://github.com/markn86/moodle 2013-06-11 13:05:25 +08:00
Marina Glancy
7a70cfe638 Merge branch 'MDL-37459-master' of https://github.com/damyon/moodle 2013-06-11 14:57:34 +10:00
Damyon Wiese
3c88a67821 MDL-37459 admin: Admin settings flags 
Make "Advanced" and "Lockable" flags for any admin setting.
 2013-06-11 12:54:57 +08:00
Dan Poltawski
b6174c9897 Merge branch 'm26_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle 2013-06-11 12:54:24 +08:00
Jason Fowler
74dfadea8f MDL-39949 - Blocks - preventing blocks with empty titles from blocking the execution of javascript 2013-06-11 11:46:21 +08:00
Dan Poltawski
a3f92b2e0e Revert "MDL-26511 Images in Cloze multichoice" 
This reverts commit feec4f89417b13d87a464710b2479704cffbabdb.
 2013-06-11 11:38:34 +08:00
Dan Poltawski
fd6f924c08 Merge branch 'wip-MDL-39746-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-11 11:24:31 +08:00
Rajesh Taneja
d836e3ed1f MDL-16982 Administration: Integrated Inaki's suggestions 2013-06-11 10:27:43 +08:00
Rajesh Taneja
57d135a1c6 MDL-16982 Administration: Cleaned whitespaces and alignment in orignal patch 2013-06-11 10:27:43 +08:00
Gilles-Philippe Leblanc
b88adb55fc MDL-16982 Administration: Adding data mapping for custom user fields 2013-06-11 10:27:37 +08:00
Rajesh Taneja
1daab45a7a MDL-39863 Administration: Show confirmation/notice and don't redirect automatically 2013-06-11 10:19:56 +08:00
Sam Hemelryk
ae82c28588 Merge branch 'MDL-39490-format_rewrite_order' of git://github.com/mudrd8mz/moodle 2013-06-11 14:16:50 +12:00
Tim Lock
d0ed33d6fd MDL-40120: Fix get_course_records() which breaks in PSQL 2013-06-11 13:45:23 +12:00
Sam Hemelryk
b9565a0070 Merge branch 'wip-MDL-37490-m7' of git://github.com/gjb2048/moodle 2013-06-11 13:32:36 +12:00
Sam Hemelryk
10c98b64e6 Merge branch 'MDL-39454-master' of git://github.com/sammarshallou/moodle 2013-06-11 12:26:55 +12:00
Sam Hemelryk
5d37fd271d Merge branch 'wip-mdl-28558' of git://github.com/rajeshtaneja/moodle 2013-06-11 11:06:17 +12:00
Sam Hemelryk
9052fc4489 Merge branch 'wip-mdl-33379' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-06-11 10:35:10 +12:00
Sam Hemelryk
2afd7d0277 Merge branch 'MDL-32898-master' of git://github.com/ankitagarwal/moodle 2013-06-11 10:31:55 +12:00
Sam Hemelryk
bd7004d51c Merge branch 'wip-mdl-34508' of git://github.com/rajeshtaneja/moodle 2013-06-11 10:29:11 +12:00
Matteo Scaramuccia
6a75660eff MDL-40095 SCORM: Trivial comments tidy up 2013-06-10 20:48:05 +02:00
Matteo Scaramuccia
82bd0c6643 MDL-40095 SCORM: Fixed DML error when saving with completion options locked 
Regression caused by MDL-38315.
 2013-06-10 20:47:48 +02:00
Dan Poltawski
50b5ae4a8d Merge branch 'MDL-39947' of https://github.com/aolley/moodle 2013-06-10 16:19:56 +08:00
Dan Poltawski
c6898e629b Merge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-10 16:06:22 +08:00
Dan Poltawski
0a006517e5 Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com/scara/moodle 2013-06-10 15:42:45 +08:00
Dan Poltawski
f4c824c009 Merge branch 'wip-mdl-39639' of git://github.com/rajeshtaneja/moodle 2013-06-10 15:28:17 +08:00
Dan Poltawski
de235efba4 Merge branch 'MDL-40018_master' of git://github.com/lazydaisy/moodle 2013-06-10 15:00:08 +08:00
Dan Poltawski
bb179ab9b4 Merge branch 'MDL-40013_master' of git://github.com/oasychev/moodle 2013-06-10 14:57:48 +08:00
Dan Poltawski
7091390164 Merge branch 'MDL-40080-unused-hub-strings' of git://github.com/mudrd8mz/moodle 2013-06-10 14:41:20 +08:00
Dan Poltawski
8a78b9116a Merge branch 'MDL-40008_master' of https://github.com/markn86/moodle 2013-06-10 14:25:03 +08:00
David Monllao
af248633f5 MDL-40109 format_weeks: Removing extra space 2013-06-10 13:30:10 +08:00
Dan Poltawski
28fa1533f7 Merge branch 'w24_MDL-39096_m26_obfuscate' of git://github.com/skodak/moodle 2013-06-10 13:12:11 +08:00
Yuliya Bozhko
1dcb9ff1f5 MDL-39825 badges: Remove badges from course navigation when course badges are disabled 2013-06-10 16:21:55 +12:00
Dan Poltawski
664a1e2793 Merge branch 'w24_MDL-28394_m26_enrolrestore' of git://github.com/skodak/moodle 2013-06-10 12:16:37 +08:00
Dan Poltawski
bed1bc3ddc Merge branch 'master_MDL-37968' of git://github.com/danmarsden/moodle 2013-06-10 12:09:47 +08:00
Mary Evans
034710e8ee MDL-39016 theme_bootstrapbase: Added login info and home link to footer in both boostrapbase & clean layout/general.php 2013-06-10 16:05:25 +12:00
Dan Poltawski
3178aacd9e Merge branch 'w24_MDL-37974_m26_manexpire' of git://github.com/skodak/moodle 2013-06-10 11:59:03 +08:00
Sam Hemelryk
8affd1ca7e Merge branch 'MDL-40009_master' of https://github.com/markn86/moodle 2013-06-10 15:55:14 +12:00
Sam Hemelryk
b8904b6ad5 Merge branch 'w24_MDL-39549_m26_cohortsearch' of git://github.com/skodak/moodle 2013-06-10 15:49:04 +12:00
ppichet
feec4f8941 MDL-26511 Images in Cloze multichoice 
vertical and horizontal answer and in feedback of all qtype answers
 2013-06-10 11:28:46 +08:00
David Monllao
e03ed0e134 MDL-40110 behat: AM/PM strings are OS-dependant, removing this part from tests 2013-06-10 11:21:04 +08:00
Sam Hemelryk
56ad6d46d1 Merge branch 'MDL-39971' of git://github.com/timhunt/moodle 2013-06-10 15:09:43 +12:00
Dan Poltawski
07bac478b6 Merge branch 'wip-MDL-39824-m26' of http://github.com/samhemelryk/moodle 2013-06-10 10:54:22 +08:00
Sam Hemelryk
018fc94211 Merge branch 'MDL-39978' of git://github.com/timhunt/moodle 2013-06-10 14:48:21 +12:00
Sam Hemelryk
bf0cdbcf8a Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle 2013-06-10 14:41:21 +12:00