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
54,635 Commits 36 Branches 519 Tags
Commit Graph

54635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
e07a3bf209 Merge branch 'MDL-33932_master' of git://github.com/grabs/moodle 2012-07-02 14:31:55 +12:00
Sam Hemelryk
bbfa552c7b Merge branch 'MDL-33627_master' of git://github.com/grabs/moodle 2012-07-02 14:06:14 +12:00
Eloy Lafuente (stronk7)
d71b79a406 weekly release 2.4dev 2012-07-02 00:55:18 +02:00
Eloy Lafuente (stronk7)
15c9acb21a Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-07-02 00:39:51 +02:00
Eloy Lafuente (stronk7)
6e4c643101 Merge branch 'MDL-34119_master' of git://github.com/lazydaisy/moodle 2012-07-02 00:30:46 +02:00
Sam Hemelryk
abb98b8881 Merge branch 'MDL-34044' of git://github.com/srynot4sale/moodle 2012-07-02 08:22:45 +12:00
Eloy Lafuente (stronk7)
cf16aed6f7 Merge branch 'w27_MDL-34130_m24_recordsettests' of git://github.com/skodak/moodle 2012-07-01 21:58:59 +02:00
Petr Škoda
c56cdae977 MDL-34130 prevent some warning in PHPStorm 2012-07-01 21:50:36 +02:00
Petr Škoda
3b5f6e6c2a MDL-34130 test recordset data is static 
We do not want recordset results to be affected by subsequent update or delete queries.
 2012-07-01 21:35:37 +02:00
Petr Škoda
4993d5fe00 MDL-34130 add missing rs close 
Thanks Eloy!
 2012-07-01 21:24:13 +02:00
Petr Škoda
e1defa2ed5 MDL-34130 test interaction of recordsets and transactions 2012-07-01 21:23:54 +02:00
Petr Škoda
541ca062f1 MDL-34130 test nested recordset iteration 2012-07-01 21:23:37 +02:00
Petr Škoda
401793a36d MDL-34130 fix data inserts in recordset tests 2012-07-01 21:23:21 +02:00
AMOS bot
f86830ad0c Automatically generated installer lang files 2012-07-01 00:31:36 +00:00
Eloy Lafuente (stronk7)
ba4e17574f Merge branch 'MDL-32249c' of github.com:srynot4sale/moodle 2012-07-01 02:02:56 +02:00
Eloy Lafuente (stronk7)
f6653bfd47 Merge branch 'MDL-31201' of git://github.com/danpoltawski/moodle 2012-06-30 22:00:34 +02:00
Mary Evans
4097797fcd MDL-34119_M23 theme_splash: Added colourswitcher.js and associated code in layout files and lib.php 2012-06-30 12:42:59 +01:00
Mary Evans
44ca33e489 MDL-34119_M23 theme_splash: removed redundant js call in lib.php. Added lang option to config.php + amended lang output in layout files. Added some css to style langmenu + removed redundant loginicon in pagelayout.css 2012-06-30 01:07:14 +01:00
Aparup Banerjee
99c3c503e0 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:41:09 +08:00
AMOS bot
d53d164771 Automatically generated installer lang files 2012-06-28 00:31:24 +00:00
Sun Zhigang
a572f17d41 MDL-31201 wiki: fix a hardcoded string 2012-06-27 13:34:50 +08:00
Aaron Barnes
42b2110657 MDL-34044 completion: Fix regression caused by MDL-26626 2012-06-27 11:19:16 +12:00
Aaron Barnes
08f19f4848 MDL-32249 completion: Make grade criteria more consistent 
Also, round course grades and remove hardcoded string.

Note: This patch also removes the ability to update the course grade
from the completion interface
 2012-06-26 13:53:01 +12:00
AMOS bot
c463796e11 Automatically generated installer lang files 2012-06-26 00:31:25 +00:00
Andreas Grabs
f65c82636a MDL-33932_master - added array_unique() 2012-06-25 21:45:33 +02:00
Andreas Grabs
131e1d4b41 MDL-33627 - feedback block now show all feedbacks 2012-06-25 21:44:30 +02:00
Eloy Lafuente (stronk7)
6be7840ce6 weekly release 2.4dev 2012-06-25 17:54:28 +02:00
Eloy Lafuente (stronk7)
a5f6ea2e88 Moodle release 2.3 v2.3.0 2012-06-25 17:51:17 +02:00
Eloy Lafuente (stronk7)
7dcdca9c85 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-06-25 17:44:13 +02:00
Martin Dougiamas
386a862f95 MDL-34004 - reinstate the custom HTML icon as separate from other markup icons, because it usually means a "page" to most people that displays in the browser. These icons are temporary (but workable) until Barbara can put in some nice ones that work as a set. The 16px one is from Moodle 2.2 and the others are copies of "unknown". 2012-06-25 23:05:44 +08:00
Dan Poltawski
a2be8d9dbe Merge branch 'MDL-33984' of git://github.com/stronk7/moodle 2012-06-25 21:56:54 +08:00
Eloy Lafuente (stronk7)
84874400c5 MDL-33984 mysql: take rid of old unicode & mysql 4.1 message on error. 2012-06-25 15:48:24 +02:00
Dan Poltawski
a9ca93db95 Merge branch 'MDL-33984' of git://github.com/stronk7/moodle 2012-06-25 18:46:59 +08:00
Eloy Lafuente (stronk7)
95bcc6e2d3 MDL-33984 mysql - raise min version to 5.1.33. 
Because of http://bugs.mysql.com/bug.php?id=42758 and other benefits.
 2012-06-25 12:32:25 +02:00
Aparup Banerjee
f5fee1e148 Merge branch 'MDL-33694' of git://github.com/danpoltawski/moodle 2012-06-25 16:45:23 +08:00
Dan Poltawski
3ab04302dd Merge branch 'MDL-33999' of git://github.com/nebgor/moodle 2012-06-25 16:35:09 +08:00
Dan Poltawski
6100b006f1 Merge branch 'wip-MDL-33777-master' of git://github.com/marinaglancy/moodle 2012-06-25 16:18:27 +08:00
Aparup Banerjee
13429b9596 MDL-33999 filemanager : fixed up incorrect string used in dialog button during folder renaming 2012-06-25 16:18:21 +08:00
Dan Poltawski
b0d3162930 Merge branch 'wip-MDL-33997-master' of git://github.com/marinaglancy/moodle 2012-06-25 16:08:33 +08:00
Marina Glancy
c8161eec94 MDL-33997 Repository should not support references by default 2012-06-25 16:03:25 +08:00
Dan Poltawski
72b33964f6 MDL-33694 repository: docs about 2.3 changes 2012-06-25 16:01:54 +08:00
Andrew Robert Nicols
26992cf171 MDL-33926 Add window scrolling when drag/dropping 2012-06-25 15:27:46 +08:00
Dan Poltawski
4c8926c7c3 Merge branch 'wip-MDL-33987-m23' of git://github.com/samhemelryk/moodle 2012-06-25 15:08:12 +08:00
Aparup Banerjee
224d186ebb Merge branch 'wip-MDL-33419-master' of https://github.com/barbararamiro/moodle 2012-06-25 14:30:18 +08:00
Sam Hemelryk
511a58d945 MDL-33987 theme_anomaly: Fixed up a couple of issues with the dock 
* Active title displayed incorrectly because they had a limited width which I removed
* Docked block content was indented because block titles are now floated in anomaly.
  To fix this I gave it a bottom border, forcing it clear.
 2012-06-25 17:17:37 +12:00
Dan Poltawski
d71f207da0 Merge branch 'wip-MDL-33985-m23' of git://github.com/samhemelryk/moodle 2012-06-25 13:00:33 +08:00
Sam Hemelryk
125231acf9 MDL-33985 theme_base: Fixed bad conflict resolution of course CSS rtl fixes 2012-06-25 16:53:39 +12:00
Dan Poltawski
f935363572 Merge branch 'MDL-33980' of github.com:equella/moodle 2012-06-25 11:20:40 +08:00
Marina Glancy
c01f7628f7 MDL-33777 Equella repository properly set the source and display file origin 2012-06-25 10:57:02 +08:00
nread
75d1891548 MDL-33980 equella: course ID number should be being passed through, not the course database ID 2012-06-25 12:33:49 +10:00