Commit graph

54626 commits

Author SHA1 Message Date
Chris Scribner
f2b7928df7 MDL-32614: Removing code which disassociated LTI instances from their tool types upon restore. 2012-07-04 02:14:56 +02:00
Eloy Lafuente (stronk7)
1494f20da3 weekly release 2.3+ 2012-07-02 00:54:05 +02:00
Eloy Lafuente (stronk7)
4fa4a727b4 Merge branch 'MDL-34119_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE 2012-07-02 00:30:28 +02:00
Sam Hemelryk
4be710795a Merge branch 'MDL-34044-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE 2012-07-02 08:22:35 +12:00
Eloy Lafuente (stronk7)
9ea40f27a0 Merge branch 'w27_MDL-34130_m23_recordsettests' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-01 22:01:22 +02:00
Petr Škoda
19ba134d3b MDL-34130 prevent some warning in PHPStorm 2012-07-01 21:50:56 +02:00
Petr Škoda
d0812ba0e6 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:40:37 +02:00
Petr Škoda
a2b8856558 MDL-34130 add missing rs close
Thanks Eloy!
2012-07-01 21:40:36 +02:00
Petr Škoda
a61e8c8ebe MDL-34130 test interaction of recordsets and transactions 2012-07-01 21:40:36 +02:00
Petr Škoda
1cf431a329 MDL-34130 test nested recordset iteration 2012-07-01 21:40:36 +02:00
Petr Škoda
9ee97228bd MDL-34130 fix data inserts in recordset tests 2012-07-01 21:40:36 +02:00
Eloy Lafuente (stronk7)
9d774c9445 Merge branch 'MDL-32249c-23' of github.com:srynot4sale/moodle into MOODLE_23_STABLE 2012-07-01 02:14:39 +02:00
Sun Zhigang
8b3d60557c MDL-31201 wiki: fix a hardcoded string 2012-06-30 22:01:08 +02:00
Mary Evans
3705a88629 MDL-34119_M23 theme_splash: Added colourswitcher.js and associated code in layout files and lib.php 2012-06-30 12:02:22 +01:00
Mary Evans
263e8c144c 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 00:50:34 +01:00
Aparup Banerjee
b574c078a6 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:37:01 +08:00
Aaron Barnes
2670a3a684 MDL-34044 completion: Fix regression caused by MDL-26626 2012-06-27 11:54:41 +12:00
Aaron Barnes
9b57d5bc38 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 14:12:53 +12:00
Eloy Lafuente (stronk7)
a5f6ea2e88 Moodle release 2.3 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
AMOS bot
6c213ef776 Automatically generated installer lang files 2012-06-25 00:31:38 +00:00
Petr Skoda
aefe9734fa MDL-33733 fix broken zip_packer->extract_to_storage() when extracting from stored_file 2012-06-25 01:32:50 +02:00
Eloy Lafuente (stronk7)
ba3e7df265 Moodle release 2.3rc1 2012-06-24 18:37:12 +02:00
Eloy Lafuente (stronk7)
4f1d79538e Fix permissions. 2012-06-24 18:31:09 +02:00
Eloy Lafuente (stronk7)
bec3cd5b18 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-06-24 18:27:53 +02:00
Dan Poltawski
5b7621f78d Merge branch 'MDL-33717_admin_message2' of git://github.com/andyjdavis/moodle 2012-06-22 15:09:46 +08:00
Damyon Wiese
99467a9f7f MDL-33853: Prevent locking an assignment submission from putting a grade of 0 in the gradebook 2012-06-22 11:12:06 +08:00
Sam Hemelryk
31ea84a503 Merge branch 'MDL-32769-master' of git://github.com/ankitagarwal/moodle 2012-06-22 14:40:09 +12:00
Sam Hemelryk
cc0823118d Merge branch 'wip-MDL-33931-master' of git://github.com/abgreeve/moodle 2012-06-22 14:25:54 +12:00