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
Tim Hunt
9f689071a8
MDL-29846 qbehaviours admin: correct $needed logic.
...
Also, fix a notice.
2011-12-19 14:34:09 +00:00
Aparup Banerjee
85daa5926c
Merge branch 'w51_MDL-30735_m22_cron' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2011-12-19 11:53:32 +08:00
Sam Hemelryk
415be0ff94
Merge branch 'w51_MDL-30789_m22_enrolupdatestatus' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2011-12-19 16:26:01 +13:00
Mary Evans
e50e70d12e
MDL-30500 Fix for Sky High report & print layout
2011-12-19 15:22:41 +13:00
Ankit Kumar Agarwal
8c14856d86
MDL-30569 Administration Fixing the redirect after editting is toggeled on the front page
2011-12-19 07:42:49 +05:30
Sam Hemelryk
d613d7d78e
Merge branch 'MDL-37049_22' of git://github.com/jamiepratt/moodle into MOODLE_22_STABLE
2011-12-19 15:05:42 +13:00
Sam Hemelryk
7c19940ca6
Merge branch 'MDL-30683_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-19 14:14:55 +13:00
Sam Hemelryk
ead158db7e
Merge branch 'MDL-29176_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-19 12:23:36 +13:00
Sam Hemelryk
3bcb2c1dff
Merge branch 'MDL-30734_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-19 11:52:32 +13:00
Sam Hemelryk
265dbb3a54
Merge branch 'MDL-30742_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-19 11:30:42 +13:00
Sam Hemelryk
2253ea2592
Merge branch 'MDL-30744_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-19 10:53:57 +13:00
Sam Hemelryk
5ff8144cc8
Merge branch 'MDL-30758_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2011-12-19 09:28:10 +13:00
Petr Skoda
9cf83e67a1
MDL-30789 add new update_status() method to enrol plugins and improve enrol cache invalidation
2011-12-18 17:31:12 +01:00
