mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
60,747 Commits 36 Branches 519 Tags
Commit Graph

60747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
851ef997df Merge branch 'MDL-38918-master' of git://github.com/lazydaisy/moodle 2013-04-22 15:25:46 +12:00
Sam Hemelryk
92809986aa Merge branch 'MDL-39231_master' of git://github.com/bmbrands/moodle 2013-04-22 15:24:58 +12:00
Damyon Wiese
b363d54ccd Merge branch 'MDL-39050' of git://github.com/timhunt/moodle 2013-04-22 10:25:46 +08:00
Damyon Wiese
924225f38b MDL-38898 theme_simple: Copy fixes for block dnd from bootstrap 2013-04-22 10:07:53 +08:00
Damyon Wiese
80333fd96f Merge branch 'MDL-38898_master' of git://github.com/lazydaisy/moodle 2013-04-22 09:52:09 +08:00
Sam Hemelryk
54ed002fdc Merge branch 'wip-MDL-39118-master' of git://github.com/abgreeve/moodle 2013-04-22 13:41:45 +12:00
Adrian Greeve
e06d54289d MDL-39118 - mod_data: removed areamaxbytes option for uploading files and images. 
Setting the maximum size for a file or picture field to the course upload limit
would send a value of 0 to the file picker. This patch checks for this 0 value
and handles it appropriately.
 2013-04-22 09:28:51 +08:00
Sam Hemelryk
b88338f647 Merge branch 'MDL-38854_master' of git://github.com/bmbrands/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 12:12:58 +12:00
Sam Hemelryk
9c2cbcdc04 Merge branch 'MDL-39220' of git://github.com/colchambers/moodle 2013-04-22 11:37:34 +12:00
Sam Hemelryk
6801246c50 Merge branch 'wip-MDL-38900-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 11:10:51 +12:00
Sam Hemelryk
c26f34baf1 Merge branch 'MDL-39172' of git://github.com/jmvedrine/moodle 2013-04-22 11:02:39 +12:00
Sam Hemelryk
311c034744 MDL-38874 theme_bootstrap: tidy up whitespace 2013-04-22 10:43:38 +12:00
Sam Hemelryk
9fdb1c1a63 Merge branch 'MDL-38874_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 10:35:52 +12:00
David Scotson
16d795a4d3 MDL-39196 theme_bootstrap: improved display of login errors 2013-04-22 10:27:11 +12:00
Sam Hemelryk
48d253c100 Merge branch 'MDL-39241-master' of git://github.com/danpoltawski/moodle 2013-04-22 09:23:54 +12:00
Mary Evans
232affc96a MDL-38874 theme_bootstrap: added back CSS rules to fix advanced elements show/hide toggle in admin forms. 
While doing this I got a compile error so not sure but I am guessing the changes to fix that error will show up in the commit diff.
 2013-04-21 18:02:08 +01:00
Mary Evans
c9ff4d0e0f MDL-38898 theme_bootstrap: Made changes to layout/general.php to enable drag-n-drop support in Bootstrap theme. 2013-04-20 02:10:11 +01:00
David Scotson
13cb4ee0b4 MDL-38900 Change highlighted course section color 2013-04-19 16:39:29 +01:00
Dan Poltawski
b93945e9b9 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 
Conflicts:
	mod/scorm/module.js
 2013-04-19 15:20:02 +01:00
Dan Poltawski
aa15c5f3ff Merge branch 'MDL-38361' of https://github.com/prateeksachan/moodle 2013-04-19 15:11:33 +01:00
Dan Poltawski
35626ff4dd MDL-39241 groups import: missing type 2013-04-19 14:51:27 +01:00
Dan Poltawski
00a850b33e Merge branch 'wip-MDL-38565-m25' of git://github.com/samhemelryk/moodle 2013-04-19 13:29:07 +01:00
Tim Hunt
53f8948899 MDL-39050 quiz access rules: settings.php files should work. 2013-04-19 11:50:25 +01:00
Mary Evans
082ebd6e51 MDL-38918 theme_simple: Added favicon.ico to theme/simple/pix directory. 2013-04-19 10:46:33 +01:00
BA CodeMonkey
f0e683ecb3 MDL-38854: Bootstrap theme - text input in a block is wider than the block 2013-04-19 11:07:04 +02:00
BA CodeMonkey
2135cec6e8 MDL-39231: Rename region-bs-main to region-main in layout files for theme bootstrap and theme simple 2013-04-19 10:52:03 +02:00
Damyon Wiese
42d2b9fbcc MDL-39163 Version bump for css changes 2013-04-19 15:51:31 +08:00
Damyon Wiese
35490f6357 Merge branch 'MDL-39163-master' of git://github.com/FMCorz/moodle 2013-04-19 15:49:16 +08:00
Damyon Wiese
43d3124816 Merge branch 'MDL-31194-master' of git://github.com/mouneyrac/moodle 2013-04-19 15:15:10 +08:00
Damyon Wiese
d9c22e944d Merge branch 'MDL-39084-master' of github.com:StudiUM/moodle 2013-04-19 13:58:15 +08:00
Damyon Wiese
747230d564 Merge branch 'wip-MDL-39211-m25' of git://github.com/marinaglancy/moodle 2013-04-19 13:53:14 +08:00
Damyon Wiese
dd3b3a81d1 Merge branch 'MDL-39167' of git://github.com/timhunt/moodle 2013-04-19 13:13:28 +08:00
Sam Hemelryk
459699105c Merge branch 'MDL-39206_master' of git://github.com/lazydaisy/moodle 2013-04-19 16:37:31 +12:00
Sam Hemelryk
2b2b967ecb MDL-38646 mod_folder: improved upgrade of showexpanded 2013-04-19 16:28:29 +12:00
Sam Hemelryk
a03fdbb099 Merge branch 'MDL-38646' of git://github.com/rlorenzo/moodle 2013-04-19 16:23:21 +12:00
Sam Hemelryk
476554bbca Merge branch 'MDL-38777-m' of git://github.com/andrewnicols/moodle 2013-04-19 15:20:44 +12:00
Sam Hemelryk
91d72d3105 Merge branch 'MDL-39164' of git://github.com/jmvedrine/moodle 2013-04-19 14:54:41 +12:00
Sam Hemelryk
52b4bd37e7 Merge branch 'MDL-38710-master' of git://github.com/damyon/moodle 2013-04-19 14:41:25 +12:00
Sam Hemelryk
5ab262321c Merge branch 'MDL-39033-master' of git://github.com/sammarshallou/moodle 2013-04-19 14:02:35 +12:00
Sam Hemelryk
4d35c88e10 Merge branch 'MDL-39185_master' of https://github.com/markn86/moodle 2013-04-19 13:53:55 +12:00
Sam Hemelryk
ff76b6044b Merge branch 'MDL-39135-master' of git://github.com/damyon/moodle 2013-04-19 13:48:32 +12:00
Rex Lorenzo
57e228045b MDL-38646 folder: change column from show_expanded to showexpanded 2013-04-18 17:28:35 -07:00
Sam Hemelryk
5cba0c4ba3 MDL-38565 cache: tidy up pre-integration 2013-04-19 10:13:36 +12:00
Sam Hemelryk
4da28110c0 MDL-38565 cache: improve stats gathering 2013-04-19 10:12:59 +12:00
Sam Hemelryk
fbf76dcd17 MDL-38565 cache: upgrade code to amend default stores 2013-04-19 10:12:59 +12:00
Sam Hemelryk
059102e728 MDL-38565 cache: cron routine to clean up old session data 2013-04-19 10:11:48 +12:00
Sam Hemelryk
dbd2ea4e1f MDL-38565 cache: session caches now function as expected 
This change is a large change to the way sessions are handled
within MUC after it was discovered that session did not function
as expected when any store other than the default session store
was being used.
As part of this change the session loader has been largely
customised in order to consolidate session data for the loader.
The unit tests have also being greatly increased to provide
better coverage for sessions.
 2013-04-19 10:11:48 +12:00
Jean-Michel Vedrine
b48193383f MDL-39172 Import of .dat files is broken in blackboard_six import format 2013-04-18 17:39:13 +02:00
Jean-Michel Vedrine
cdcda6a0b4 MDL-39164 GIFT, Blackboard and Examview import of essay questions broken 2013-04-18 17:36:18 +02:00
Colin Chambers
919834f2eb MDL-39220 Javascript: Editor shrinks using collapse button 2013-04-18 15:46:07 +01:00