Marina Glancy
b212e89231
Merge branch 'MDL-44855-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-04-23 13:13:56 +08:00
Frederic Massart
ffc6df1ba2
MDL-45134 adminlib: No more validation error when a config file is not set
...
When the destination draft area existed and the user draft area has not
been used, and thus does not exist, an error was displayed to the user
saying that they could not save the setting.
This was intended to handle the cases where the draft area disappears
and would overwrite the content of the destination area, deleting
all its content. But now we do not prompt with an error when
overwriting empty with empty.
2014-04-23 12:40:50 +08:00
Andrew Davis
b7055f89d4
MDL-45172 block_completionstatus: added a check for an empty string before appending
2014-04-23 11:42:05 +08:00
AMOS bot
cf12210cbe
Automatically generated installer lang files
2014-04-23 00:38:07 +00:00
AMOS bot
9ae6b73caf
Merge branch 'MOODLE_26_STABLE' into install_26_STABLE
2014-04-23 00:38:06 +00:00
AMOS bot
20b0dd3910
Automatically generated installer lang files
2014-04-22 11:15:12 +00:00
Eloy Lafuente (stronk7)
0afcad7c36
weekly release 2.6.2+
2014-04-22 12:26:47 +02:00
Andrew Nicols
89b63282b4
MDL-44855 AJAX: Arrays and Objects should be defined in the initializer
...
JavaScript is a prototypal language and complex types should be defined as
null in the prototype, and set up in the initializer instead.
2014-04-22 17:06:08 +08:00
Andrew Nicols
6930901d9e
MDL-45124 dndupload: Lowercase types when comparing
...
IE helpfull uses a mixed-case version of 'Text' which fails the string
comparison. All other browsers use lowercase for their mime-types.
2014-04-22 16:10:39 +08:00
Andrew Nicols
c07b42d7d8
MDL-40716 report_completion: Set RTL
2014-04-22 15:22:09 +08:00
Dan Poltawski
0574e41f62
Merge branch 'wip-MDL-45154-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-04-22 12:36:02 +08:00
Frederic Massart
7e570b2248
MDL-45186 mod_quiz: Some RTL improvements on quiz edit page
2014-04-22 12:34:39 +08:00
Marina Glancy
79040c7534
Merge branch 'MDL-43673_26' of git://github.com/stronk7/moodle into MOODLE_26_STABLE
2014-04-22 12:28:54 +08:00
Marina Glancy
bad25f1c4d
MDL-45154 user profiles: category name duplication error
2014-04-22 10:45:41 +08:00
Sam Hemelryk
b6ac19d4d9
Merge branch 'wip-MDL-45045_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE
...
Conflicts:
lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
2014-04-22 10:47:27 +12:00
Sam Hemelryk
6049011264
Merge branch 'MDL-43145-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-04-22 10:39:26 +12:00
Sam Hemelryk
96ce0b22d6
Merge branch 'mdl45012-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE
2014-04-22 10:10:11 +12:00
Sam Hemelryk
ff7061d521
Merge branch 'wip-MDL-45037-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2014-04-22 09:59:09 +12:00
Sam Hemelryk
8a51e2d563
Merge branch 'MDL-44270_26' of git://github.com/jonof/moodle into MOODLE_26_STABLE
2014-04-22 09:18:28 +12:00
Matt Petro
8f1498e562
MDL-45118 shibboleth: set context on index page
2014-04-22 09:17:05 +12:00
Sam Hemelryk
abe2fe6180
Merge branch 'MDL-42761-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-04-22 08:57:33 +12:00
Dan Poltawski
1e19ea00d8
Merge branch 'w16_MDL-45049_m26_debugging' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-04-21 14:41:46 +08:00
Dan Poltawski
e0b9784138
Merge branch 'MDL-44468_26_STABLE' of git://github.com/ds125v/moodle into MOODLE_26_STABLE
2014-04-18 15:27:41 +08:00
Nadav Kavalerchik
58a309c392
MDL-40716 - Activity labels are not visible in course completion report, when in RTL mode (theme/clean , bootstrap)
2014-04-18 15:16:12 +08:00
Dan Poltawski
fc67885300
Merge branch 'MDL-45010-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-04-18 14:55:33 +08:00
Sam Hemelryk
cb8e625f94
MDL-45147 my: automate testing of block restriction
2014-04-18 14:17:49 +08:00
Rajeev S
99849ce131
MDL-43789: coursename disallows spaces in user bulk actions filter
...
Spaces and other non alphanumeric characters are disallowed in
coursename filter for user bulk actions.This prevents filtering
based upon courserole if the coursename contains spaces or other non
alphanumeric characters.
2014-04-18 11:06:47 +08:00
Dan Poltawski
f21e920beb
Merge branch 'wip-MDL-43626-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2014-04-18 10:52:48 +08:00
Dan Poltawski
8019375e12
Merge branch 'wip-MDL-45036-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2014-04-18 10:50:07 +08:00
Dan Poltawski
3c9bd29d89
Merge branch 'MDL-45071_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2014-04-18 10:47:06 +08:00
Dan Poltawski
cafeac819f
Merge branch 'MDL-44981-26' of git://github.com/jamiepratt/moodle into MOODLE_26_STABLE
2014-04-18 10:32:18 +08:00
Dan Poltawski
6e674be060
Merge branch 'MDL-41975-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-04-18 10:05:27 +08:00
Dan Poltawski
84cff47814
Merge branch 'wip-MDL-45154-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-04-18 09:57:22 +08:00
Eloy Lafuente (stronk7)
bbbd0556e5
weekly release 2.6.2+
2014-04-17 15:49:27 +02:00
Charles Fulton
184af2f471
MDL-45148 unit testing: pass role id instead of user id
2014-04-17 04:46:53 -07:00
Dan Poltawski
b2f7a0b31f
Merge branch 'MDL-44619_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-04-17 17:01:43 +08:00
Marina Glancy
86702277af
MDL-45154 user profiles: avoid redirection warnings
2014-04-17 14:53:44 +08:00
Frederic Massart
0c30255b32
MDL-42761 badges: Remove H2s from help popup
2014-04-17 12:46:42 +08:00
Andrew Nicols
422737c54e
MDL-45119 editpdf: Do not load quick comments in read-only mode
2014-04-17 11:48:58 +08:00
Andrew Nicols
9bab08a4e6
MDL-45119 ajax: Correct use of COUNT in exception dialogue
2014-04-17 11:48:58 +08:00
Andrew Nicols
ab38ff96e5
MDL-45119 ajax: AJAX exceptions need a String in the Link
2014-04-17 11:48:57 +08:00
Sam Hemelryk
1a5748b258
Merge branch 'MDL-44616_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-04-17 08:52:10 +12:00
Sam Hemelryk
d947f5d08f
Merge branch 'wip-MDL-45116-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_STABLE
2014-04-17 08:39:39 +12:00
Eloy Lafuente (stronk7)
1e1acdfa77
Merge branch 'MDL-45132-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-04-16 19:09:58 +02:00
sam marshall
9deb25b785
MDL-27459 Completion: When ratings off, disallow grade completion
...
For activities that use ratings, there is no grade unless ratings
are enabled. The completion system still lets you select 'complete
when user gets a grade', which leads to later errors.
This change simply disables the 'completion on grade' field if
ratings are enabled for the activity, but not turned on in the form.
2014-04-16 15:06:00 +01:00
Kevin Wiliarty
395d730013
MDL-45116: Workshop submission title displays behind author picture
2014-04-16 09:07:12 -04:00
Frederic Massart
40cf8f62b9
MDL-45132 curl: Unit Tests for file uploads
2014-04-16 17:35:45 +08:00
Marina Glancy
65b84ebe7d
Merge branch 'MDL-44951-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-04-16 14:45:00 +08:00
Dan Poltawski
8ce6a7dfd3
Merge branch 'wip-mdl-44977-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE
2014-04-16 14:35:01 +08:00
Frederic Massart
8fe97a4be4
MDL-41975 repository_alfresco: Updating details about Alfresco URL and timestamps
2014-04-16 13:57:09 +08:00