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

61908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
1899145c50 Merge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-12 09:33:23 +08:00
Sam Hemelryk
44df0d9aaa Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle 2013-06-12 11:36:40 +12:00
Sam Hemelryk
e1e6c0dd4c Merge branch 'wip-MDL-39040-master' of git://github.com/abgreeve/moodle 2013-06-12 10:21:45 +12:00
Sam Hemelryk
aae402010b Merge branch 'MDL-35666-master' of git://github.com/mouneyrac/moodle 2013-06-12 10:14:14 +12:00
Sam Hemelryk
6e49802071 MDL-39629 theme_formal_white: added missing pluginfile func 2013-06-12 09:58:55 +12:00
Sam Hemelryk
ac547b717a Merge branch 'MDL-39629_master' of git://github.com/kordan/moodle 2013-06-12 09:48:56 +12:00
Dan Marsden
93c984a829 MDL-39239 SCORM: drop old imsrepository code - it doesn't work anyway. 2013-06-12 09:47:26 +12:00
Sam Hemelryk
ee4e6c04e2 Merge branch 'MDL-30320' of git://github.com/timhunt/moodle 2013-06-12 09:38:38 +12:00
Sam Hemelryk
5d24aff39f Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle 2013-06-12 09:34:06 +12:00
Sam Hemelryk
18a1f186db Merge branch 'MDL-39967-master' of git://github.com/danpoltawski/moodle 2013-06-12 09:08:55 +12:00
Sam Hemelryk
cc5468de0e Merge branch 'MDL-39940-master' of git://github.com/danpoltawski/moodle 2013-06-12 09:07:01 +12:00
Sam Hemelryk
7b50002304 Merge branch 'MDL-39964-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-06-12 09:04:22 +12:00
Sam Hemelryk
9439d0506c Merge branch 'MDL-25901-master' of git://github.com/danpoltawski/moodle 2013-06-12 09:00:24 +12:00
Sam Hemelryk
9ce7b61e62 Merge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle 2013-06-12 08:54:09 +12:00
Sam Hemelryk
ec18f333bd Merge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-12 08:51:59 +12:00
Sam Hemelryk
754fa10916 Merge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-12 08:48:00 +12:00
sam marshall
5c92e7a740 MDL-39474 Library: Make a fast way to check developer debug mode 2013-06-11 16:29:00 +01:00
Petr Škoda
a9cda870ba MDL-38109 use always get_plugin_list() to get list of plugins 
get_list_of_plugins() is NOT intended for real plugins, only plugin like directories.
 2013-06-11 10:22:45 +02:00
Damyon Wiese
7f198356ef MDL-38359 courselib: Fix unit tests 
The courselib tests have hardcoded test data sets for forum and assign
modules that need to be updated every time we add a new feature.
 2013-06-11 16:20:55 +08:00
Dan Poltawski
e2ac6a848b Merge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-11 16:00:18 +08:00
Dan Poltawski
75eb51818c Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle 2013-06-11 15:41:11 +08:00
Dan Poltawski
2504dfd61d Merge branch 'MDL-39155' of https://github.com/jacks92/moodle 2013-06-11 15:38:37 +08:00
Dan Poltawski
f7ec3b43a7 Merge branch 'wip-MDL-40100-m26' of git://github.com/samhemelryk/moodle 2013-06-11 15:34:48 +08:00
Dan Poltawski
6217bb5b8d Merge branch 'MDL-38359-master' of git://github.com/damyon/moodle 2013-06-11 15:31:20 +08:00
Damyon Wiese
52fdb0582a MDL-38359 assign: Set header field name so it works with shortforms 
Two forms were adding headers with empty names - fixed.
 2013-06-11 15:25:01 +08:00
Damyon Wiese
e9416eb7ef MDL-37621 assign: Fix php error on create new assign 
I removed one too many defaults in the previous patch. This patch
puts back the default for teamsubmissiongroupingid.
 2013-06-11 17:13:00 +10:00
Damyon Wiese
bb6471aa88 MDL-38359 assign: Add support for admin defaults for marking workflow settings 2013-06-11 14:26:33 +08:00
Dan Marsden
f8d107b3a8 MDL-38359 Marking Allocation and Workflow code 
based on Marking workflow code from Damyon Wiese
 2013-06-11 14:11:41 +08:00
Dan Poltawski
3873f6aa60 Merge branch 'MDL-39449' of git://github.com/timhunt/moodle 2013-06-11 14:09:12 +08:00
Marina Glancy
ab8e5e795d Merge branch 'MDL-37621-master' of git://github.com/damyon/moodle 2013-06-11 15:57:14 +10:00
Sam Hemelryk
30db96bd90 Merge branch 'MDL-32533-master' of git://github.com/danpoltawski/moodle 2013-06-11 17:36:18 +12:00
Damyon Wiese
a8fe74e9db MDL-37621 Assign: Apply admin defaults to all module settings. Added the 3 date based settings. 
Version bump for new settings.

AMOS BEGIN
    MOV [defaultplugins,mod_assign],[defaultsettings,mod_assign]
    MOV [defaultplugins_help,mod_assign],[defaultsettings_help,mod_assign]
AMOS END
 2013-06-11 13:35:18 +08:00
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