Eloy Lafuente (stronk7)
34ff02bff0
Merge branch 'install_master' of git://github.com/amosbot/moodle
2011-06-27 17:31:42 +02:00
Eloy Lafuente (stronk7)
32038aaccc
Merge branch 'MDL-28033' of git://github.com/timhunt/moodle
2011-06-27 17:12:40 +02:00
Eloy Lafuente (stronk7)
3bdc10150c
Merge branch 'MDL-28049' of git://github.com/timhunt/moodle
2011-06-27 15:56:03 +02:00
sam marshall
a854bca3cf
MDL-28021 Completion system can create inconsistent database rows
...
This change includes:
(1) update deletes older versions of inconsistent rows
(2) update drops one index and replaces it with a new unique index
(3) fixed to ensure that when it decides whether to insert or update
it uses current database state and not cached info
(4) unit tests updated to test #3
Conflicts:
lib/db/upgrade.php
version.php
2011-06-27 15:25:13 +02:00
Tim Hunt
19f7bb5b7e
MDL-28049 conditional include so xml question format can work for both lesson and 3rd party qtypes.
...
This is a regression caused by MDL-27956.
2011-06-27 13:59:57 +01:00
Tim Hunt
2779cc7d89
MDL-28033 Fatal error upgrading form 1.9 to 2.1 due to missing include.
2011-06-27 13:43:16 +01:00
Eloy Lafuente (stronk7)
8e0733f4d8
Merge branch 'unsigned_fixes' of git://github.com/stronk7/moodle
2011-06-27 14:06:13 +02:00
Eloy Lafuente (stronk7)
f4fd96a848
MDL-28032 database - finally question->defaultmark goes signed. Changing prev commit.
2011-06-27 11:37:34 +02:00
Eloy Lafuente (stronk7)
f83776f2ec
Merge branch 'wip-MDL-27809-master-r7' of git://github.com/samhemelryk/moodle
2011-06-27 10:11:02 +02:00
Sam Hemelryk
29e2d0a820
Merge branch 'MDL-26199' of git://github.com/timhunt/moodle
2011-06-27 16:03:48 +08:00
Sam Hemelryk
35d4d85dc4
Merge branch 'unsigned_fixes' of git://github.com/stronk7/moodle
2011-06-27 15:45:41 +08:00
Sam Hemelryk
a3f8860d6c
Merge branch 'quizreport_langstrings' of git://github.com/stronk7/moodle
2011-06-27 15:30:11 +08:00
Sam Hemelryk
da17baf76a
Merge branch 'backup_bump' of git://github.com/stronk7/moodle
2011-06-27 15:28:49 +08:00
Sam Hemelryk
3992a46e89
MDL-27809 navigation: Fixed up a couple of minor issues after peer-review
2011-06-27 15:11:28 +08:00
AMOS bot
c31745211a
Automatically generated installer lang files
2011-06-27 00:55:10 +00:00
Eloy Lafuente (stronk7)
a8e6c39e9f
Merge branch 'MDL-28024' of git://github.com/timhunt/moodle
2011-06-27 01:44:40 +02:00
Eloy Lafuente (stronk7)
f1231efec4
MDL-28038 backup - bump
2011-06-26 19:15:06 +02:00
Eloy Lafuente (stronk7)
8b95f430b5
MDL-28036 quiz - add some missing (reports) lang strings
2011-06-26 18:22:23 +02:00
Eloy Lafuente (stronk7)
a0628c68de
MDL-28032 database - fix some sign inconsistencies
2011-06-26 13:12:42 +02:00
Eloy Lafuente (stronk7)
d466e23c38
MDL-28032 database - retrofit signed info for decimal/float (improves diffs detection)
2011-06-26 12:54:16 +02:00
Tim Hunt
5cc532e8e9
MDL-28024 adaptive qbehaviour. Displayed penalties not rounded correctly.
2011-06-24 14:26:49 +01:00
Rossiani Wijaya
560f549593
MDL-27922 lesson mod: fixed string for activity link
2011-06-24 16:50:31 +08:00
Sam Hemelryk
e26507b361
MDL-27809 navigation: Reworked the caching within navigation and improved the ordering of events in order to reduce the use of session without serious impact on serverload
2011-06-24 16:42:41 +08:00
Eloy Lafuente (stronk7)
50d32a2baf
on-demand release 2.1beta
2011-06-24 00:48:51 +02:00
Eloy Lafuente (stronk7)
2e27e2d64a
Merge branch 'MDL-28012' of git://github.com/timhunt/moodle
2011-06-24 00:31:53 +02:00
Eloy Lafuente (stronk7)
89ad7c078e
Merge branch 'MDL-27827_head' of git://github.com/grabs/moodle
2011-06-24 00:21:58 +02:00
Eloy Lafuente (stronk7)
4965f02087
Merge branch 's11_MDL-27999_wiki_preview_master' of github.com:dongsheng/moodle
2011-06-24 00:13:48 +02:00
Eloy Lafuente (stronk7)
06c8cef4c2
Merge branch 'wip-MDL-27962-master' of git://github.com/samhemelryk/moodle
2011-06-24 00:02:20 +02:00
Eloy Lafuente (stronk7)
fcb36b65ec
Merge branch 'wip-MDL-27958-master' of git://github.com/samhemelryk/moodle
2011-06-23 23:57:55 +02:00
Eloy Lafuente (stronk7)
adecb9de9a
Merge branch 'wip-MDL-27940-master' of git://github.com/samhemelryk/moodle
2011-06-23 23:54:32 +02:00
Andreas Grabs
65ee5d7dad
MDL-27827 - Missing messageprovider:message language string
2011-06-23 20:33:12 +02:00
Tim Hunt
c5da295b85
MDL-28012 Quiz editing status line can display screwy dates.
2011-06-23 18:53:07 +01:00
Eloy Lafuente (stronk7)
9867711fd7
on-demand release 2.1beta
2011-06-23 18:24:57 +02:00
stabijoh
5fc36f559f
MDL-27998 canvas theme - fix font sizes
2011-06-23 17:28:29 +02:00
Eloy Lafuente (stronk7)
b4bb80b7d6
weekly release 2.1beta
2011-06-23 11:25:48 +02:00
Eloy Lafuente (stronk7)
916cbea67f
Merge branch 'install_master' of git://github.com/amosbot/moodle
2011-06-23 11:24:03 +02:00
Eloy Lafuente (stronk7)
5088275347
Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle
2011-06-23 11:16:00 +02:00
Dongsheng Cai
14b2d8d865
MDL-26677 flickr repo - fix undefined index usewatermarks
2011-06-23 17:13:46 +08:00
Eloy Lafuente (stronk7)
618d2ecf48
Merge branch 'MDL-27920_grade_export' of git://github.com/andyjdavis/moodle
2011-06-23 10:15:07 +02:00
Andrew Davis (andyjdavis)
8de7c8a7ff
MDL-27920 gradebook: fixes following integration review
2011-06-23 15:58:44 +08:00
Tim Hunt
f19ed874ee
MDL-26199 further changes needed to make the question bank navigation behave.
2011-06-23 07:18:49 +01:00
Tim Hunt
8356e6cff8
MDL-26199 keep track of the current category when switching pages in the question bank.
2011-06-23 07:18:49 +01:00
Dongsheng Cai
7cacd29fac
MDL-27999 mod wiki, fixed broken image in preview
2011-06-23 13:52:14 +08:00
Sam Hemelryk
8b05c5e2bd
MDL-27962 Fixed typo in tablelib preventing columns from being collapsed
2011-06-23 13:33:28 +08:00
Sam Hemelryk
7313ac6c7a
MDL-27958 Added missing set_context call which would cause errors for all contexts below course
2011-06-23 12:16:09 +08:00
Sam Hemelryk
d38a4849b7
MDL-27940 navigaiton: Fixed an ordering problem so that when a parent was set for a node the nodes activity was accounted for
2011-06-23 11:29:26 +08:00
Sam Hemelryk
58c724a613
Merge branch 'MDL-27169_master' of git://github.com/stronk7/moodle
2011-06-23 10:43:57 +08:00
AMOS bot
99774e998c
Automatically generated installer lang files
2011-06-23 00:55:12 +00:00
Eloy Lafuente (stronk7)
5973f0b53d
MDL-26677 repositories - clean one debugging var_dump()
2011-06-23 02:04:30 +02:00
Eloy Lafuente (stronk7)
39354db055
Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle
2011-06-23 02:02:24 +02:00
