Eloy Lafuente (stronk7)
c994fe7430
Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE
2011-12-23 02:53:07 +01:00
AMOS bot
1d4262608c
Automatically generated installer lang files
2011-12-23 00:31:21 +00:00
Eloy Lafuente (stronk7)
0016ed0115
MDL-30760 question engine: reduce summary max size
...
MySQL only accepts 65536 (aprox) bytes in default TEXT
columns. So we define the max allowed as 32000 to allow
99.9% of utf-8 contents to fit. If some day MDL-19603 is
implemented and all current TEXTs are moved (MySQL) to
the BIG counterparts, this restriction can be out (MDL-19603).
2011-12-23 01:16:00 +01:00
Gerard (Gerry) Caulfield
0c5e3d4564
MDL-29400 Fixing unset object bug encountered by Rajesh during testing
2011-12-22 09:55:38 +01:00
Sam Hemelryk
e0c00395b7
Merge branch 'wip-MDL-18128-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE
2011-12-22 11:44:34 +13:00
Sam Hemelryk
9e9e0732f5
MDL-30639 mod_lesson: Used a consistent format for users display of answer
2011-12-22 11:23:15 +13:00
Sam Hemelryk
965344c08f
Merge branch 'MDL-30639_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
2011-12-22 11:21:08 +13:00
Tim Hunt
0f97c8afdb
MDL-30704 quiz_overview: fixup, add missing rescaling.
...
Thanks Micheal de Raadt for catching this in testing.
2011-12-21 18:33:32 +01:00
Eloy Lafuente (stronk7)
1b5afe64c4
MDL-20245 grade: added tests for set_user_preference() and the 1333 limit
...
Added to tests to check that both the "limit" case of using 1333
chars is allowed and 1334 causes coding exception to happen
2011-12-21 16:30:57 +01:00
Eloy Lafuente (stronk7)
5831b4c70c
MDL-20245 grade: fix version numbers
...
This commit puts the 22_STABLE and master main
versions back to "on-sync" mode (very first
weeks after major release).
Conflicts:
lib/db/upgrade.php
version.php
2011-12-21 12:25:11 +01:00
Andrew Davis
223e753520
MDL-20245 grade: increased the size of the user_preferences value column and added php validation of the data going into that column
...
Conflicts:
lib/db/upgrade.php
version.php
2011-12-21 12:23:50 +01:00
adrian@moodle.com
72682b8868
MDL-18128 - forum - Addition of group editing for forums.
2011-12-21 15:40:09 +08:00
Aparup Banerjee
8fe13ecf1a
Merge branch 'wip-MDL-30541-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE
2011-12-21 14:16:55 +08:00
Aparup Banerjee
dbfa519ad9
MDL-28126 webservice : resolved integration conflicts
2011-12-21 11:28:33 +08:00
Sam Hemelryk
6ff99dde45
Merge branch 'MDL-29239_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
2011-12-21 15:00:41 +13:00
Jason Fowler
332748dd7e
MDL-30541 - Blog - Fixing the context for RSS Feed headers on the single blog entry pages
2011-12-21 09:35:52 +08:00
Sam Hemelryk
db65026449
Merge branch 'MDL-30704_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-21 14:30:27 +13:00
Eloy Lafuente (stronk7)
45c920b0af
MDL-30777: whitespace fix
2011-12-21 00:41:20 +01:00
Darko Miletic
1be36988ac
MDL-30777: Properly implemented error message
2011-12-21 00:41:09 +01:00
Eloy Lafuente (stronk7)
d7964ccf87
Merge branch 'MDL-30170-mnet-undelete_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE
2011-12-20 23:33:19 +01:00
Gerard (Gerry) Caulfield
efa9f19281
MDL-29400 Update the upload and uploadsingle assignment classes to so
...
that they only display the assignment submitted status when it has
actually been submitted.
2011-12-20 22:55:23 +01:00
Eloy Lafuente (stronk7)
6662dee76d
MDL-30761 make it work under Oracle. To revisit after MDL-29765 is done.
2011-12-20 22:38:21 +01:00
Eloy Lafuente (stronk7)
1729746211
Merge branch 'w51_MDL-30761_m22_slowmysql' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2011-12-20 22:38:09 +01:00
Darko Miletic
fe2a74db60
MDL-30631: Fixed the default grade import for the question for both CC
...
1.0 and 1.1
2011-12-20 22:02:51 +01:00
Eloy Lafuente (stronk7)
72b01fbeb3
Merge branch 'MDL-30603_m22' of https://github.com/nebgor/moodle into MOODLE_22_STABLE
2011-12-20 19:49:45 +01:00
Eloy Lafuente (stronk7)
7259dbc551
Merge branch 'MDL-29048-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
2011-12-20 18:56:01 +01:00
Eloy Lafuente (stronk7)
39949b56ad
Merge branch 'wip-MDL-30733-MOODLE_22_STABLE' of github.com:marinaglancy/moodle into MOODLE_22_STABLE
2011-12-20 18:52:48 +01:00
Aparup Banerjee
7110207a34
MDL-25561 Gradebook : fixed whitespaces
2011-12-20 19:15:48 +08:00
Aparup Banerjee
40b67fca0a
Merge branch 'MDL-25561_user_report_name_clickable_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE
2011-12-20 19:15:20 +08:00
Andrew Robert Nicols
b9c38ef120
MDL-30627 Ensure that the dialogue is always shown in the current view window
2011-12-20 13:38:41 +08:00
Rossiani Wijaya
b8e5740796
MDL-30636 Lesson Module: fixed essay answer display format
2011-12-20 12:51:52 +08:00
Andrew Robert Nicols
8c9d533f3d
MDL-30641 Stop italicising and underlining folder names in the filepicker
2011-12-20 11:55:12 +08:00
Aparup Banerjee
18952a18fd
Merge branch 'MDL-30569-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
2011-12-20 11:11:02 +08:00
Eloy Lafuente (stronk7)
53516a8ece
Merge branch 'wip-mdl-29067-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE
2011-12-20 03:12:55 +01:00
Sam Hemelryk
a5f35b4cf2
MDL-30770 admin: Fixed notice about missing variable
2011-12-20 02:26:34 +01:00
Eloy Lafuente (stronk7)
fbb829b82d
MDL-30739 add one test to confirm the solution is cross-db
2011-12-20 02:23:55 +01:00
Eloy Lafuente (stronk7)
ceec817f95
Merge branch 'MDL-30739_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-20 02:21:30 +01:00
Sam Hemelryk
0cba7c0408
Merge branch 'MDL-30764-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE
2011-12-20 14:15:43 +13:00
Eloy Lafuente (stronk7)
2df28fda6c
Merge branch 'MDL-30738_22_STABLE' of git://github.com/kiklop74/moodle into MOODLE_22_STABLE
2011-12-20 02:01:29 +01:00
Sam Hemelryk
9f83ba0887
Merge branch 'MDL-30760_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-20 13:34:53 +13:00
AMOS bot
956d1a3ab5
Automatically generated installer lang files
2011-12-20 00:31:22 +00:00
Sam Hemelryk
6005434b55
Merge branch 'MDL-30646_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-20 13:21:11 +13:00
Sam Hemelryk
a8fb78b142
Merge branch 'MDL-29846_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-20 13:16:20 +13:00
Sam Hemelryk
b3af6c110a
Merge branch 'w51_MDL-30787_m22_coursemodedit' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2011-12-20 12:08:09 +13:00
Eloy Lafuente (stronk7)
58ca2c4b71
Merge branch 'MDL-30741_m22' of git://github.com/jfilip/moodle into MOODLE_22_STABLE
2011-12-20 00:05:13 +01:00
Sam Hemelryk
4e77491aff
Merge branch 'wip-MDL-28948-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE
2011-12-20 10:42:45 +13:00
Petr Skoda
c2ca1a3793
MDL-30779 add port and socket to dbtansfer tool
2011-12-20 10:29:11 +13:00
Sam Hemelryk
1f3933bee6
Merge branch 'w51_MDL-30765_m22_context' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2011-12-20 10:09:27 +13:00
Sam Hemelryk
e7af814b0d
Merge branch 'w51_MDL-30697_m22_roleslink' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2011-12-20 10:03:59 +13:00
Tim Hunt
365e163946
MDL-30704 Quiz grades report shows inconsistent averages.
...
Previously, for the overall grade, we averaged the final marks for each
student; while for the individual question grades, we averaged all
grades.
The report now works consistently on the principle that the averages
should include exactly what is currenlty being shown in the report. This
is more logical, and so should be easier for users to understand.
If you want to see the averages that are currently shown (e.g. just the
average of each student's highers grade) then the report options let you
do that.
2011-12-19 15:03:56 +00:00