Aparup Banerjee
80742be46a
Merge branch 'w32_MDL-13363_m24_dbuserundelete' of git://github.com/skodak/moodle
2012-08-08 11:15:34 +08:00
Sam Hemelryk
e432bf2472
Merge branch 'MDL-34471-master' of git://github.com/ankitagarwal/moodle
2012-08-08 15:05:39 +12:00
Sam Hemelryk
563c436ece
Merge branch 'wip-MDL-34075-master' of git://github.com/abgreeve/moodle
2012-08-08 14:24:09 +12:00
Paul Nicholls
013cf2878c
MDL-33640 - Add ability to use custom filepicker templates
...
Allow repository plugins to register a template by defining a get_template() method, coupled with the ability to request the template be used by create_upload_form() instead of the standard 'uploadform' template. The template is automatically registered using the plugin's name, and core templates will override any which clash; this also means that a theme can override these templates in a custom renderer if it wants to.
2012-08-08 13:50:47 +12:00
Sam Hemelryk
fffe12fd95
Merge branch 'wip_MDL-32412_afterburner' of git://github.com/lazydaisy/moodle
2012-08-08 12:07:59 +12:00
Eloy Lafuente (stronk7)
f1bfa6bf33
Merge branch 'master_MDL-34656' of git://github.com/danmarsden/moodle
2012-08-08 01:59:19 +02:00
Eloy Lafuente (stronk7)
e5e26fb1d6
Merge branch 'MDL-34704' of git://github.com/timhunt/moodle
2012-08-08 01:52:45 +02:00
Eloy Lafuente (stronk7)
4137eb46a9
Merge branch 'wip-mdl-30792' of git://github.com/rajeshtaneja/moodle
2012-08-08 01:00:12 +02:00
Eloy Lafuente (stronk7)
f718f5fd55
Merge branch 'MDL-32023-master' of https://github.com/mackensen/moodle
2012-08-08 00:02:10 +02:00
Eloy Lafuente (stronk7)
80913617e8
Merge branch 'MDL-29129-master' of https://github.com/mackensen/moodle
2012-08-07 23:58:27 +02:00
Sam Hemelryk
60312b3189
Merge branch 'master_MDL-32002' of git://github.com/danmarsden/moodle
2012-08-08 09:43:44 +12:00
Eric Merrill
fbb70b4717
MDL-34543 mod_assign Fixing problem where previous feedback does not populate when you re-enter the grading view. add_plugin_grade_elements() was expecting grade object, but was being given grade string.
2012-08-07 10:19:35 -04:00
Tim Hunt
d0565885ae
MDL-34727 restore UI: use checkboxes for userdata.
...
It was using select menus for the convenience of the code, but the
inconvenience of users.
The way this fix is done is a bit hacky, but it works, makes users'
lives much better, but it would be good if someone would dehackify
this in the future.
2012-08-07 11:36:09 +01:00
Aparup Banerjee
056640610d
Merge branch 'master_MDL-33942' of git://github.com/danmarsden/moodle
2012-08-07 15:58:06 +08:00
Aparup Banerjee
0c36e633f5
Merge branch 'MDL-34566_accessibility' of git://github.com/rwijaya/moodle
2012-08-07 15:07:40 +08:00
Aparup Banerjee
0367f6b1aa
Merge branch 'MDL-34564_accessibility' of git://github.com/rwijaya/moodle
2012-08-07 14:57:34 +08:00
Aparup Banerjee
2efd02caa6
Merge branch 'MDL-34560_accessibility' of git://github.com/rwijaya/moodle
2012-08-07 14:45:29 +08:00
Aparup Banerjee
12fd98242c
Merge branch 'MDL-34559_accessibility' of git://github.com/rwijaya/moodle
2012-08-07 14:36:48 +08:00
Aparup Banerjee
67ab929cbf
Revert "Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle"
...
This reverts commit e5d9cc13ac
, reversing
changes made to 20c3e25343
.
2012-08-07 14:27:01 +08:00
Aparup Banerjee
e5d9cc13ac
Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle
2012-08-07 13:58:07 +08:00
Rossiani Wijaya
f8e371f068
MDL-34559: removing accesshide class
2012-08-07 13:34:34 +08:00
Dan Poltawski
f271972817
MDL-29192 - clarify email_to_user call
2012-08-07 10:55:13 +08:00
Aparup Banerjee
20c3e25343
Merge branch 'MDL-34715-master' of git://github.com/FMCorz/moodle
2012-08-07 10:40:22 +08:00
Dan Poltawski
6bae2b7633
Merge branch 'MDL-34562_accessibility' of git://github.com/rwijaya/moodle
2012-08-07 10:16:30 +08:00
Dan Poltawski
f7cae82286
Merge branch 'MDL-34567_accessibility' of git://github.com/rwijaya/moodle
2012-08-07 10:03:11 +08:00
Aparup Banerjee
99f868c541
Merge branch 'MDL-22663-master' of git://github.com/FMCorz/moodle
2012-08-07 10:00:26 +08:00
Dan Poltawski
b217edd265
MDL-34685 authlib - fix trailing whitespace
2012-08-07 09:55:02 +08:00
Michael Aherne
57d38adc58
MDL-34685 auth Allow auth plugins to override user signup form
2012-08-07 09:55:02 +08:00
Aparup Banerjee
7b3c1c9d8c
Merge branch 'MDL-33022-master' of git://github.com/danpoltawski/moodle
2012-08-07 09:18:02 +08:00
Dan Poltawski
e43c20d064
Merge branch 'wip-MDL-34669-master' of git://github.com/marinaglancy/moodle
2012-08-07 08:48:31 +08:00
Dan Poltawski
32570ea2ce
MDL-34600 upgrade.php - fix trailing whitespace
2012-08-07 08:44:19 +08:00
Dan Poltawski
deb89552b2
Merge branch 'w32_MDL-34600_m24_questionschema' of git://github.com/skodak/moodle
2012-08-07 08:40:42 +08:00
AMOS bot
d614ba7052
Automatically generated installer lang files
2012-08-07 00:31:54 +00:00
Tomasz Muras
464e88340b
MDL-31753 Get correct course ID for Community finder search link.
2012-08-07 02:14:03 +02:00
Eloy Lafuente (stronk7)
4ebc74c548
Merge branch 'MDL-34711_master' of git://github.com/dmonllao/moodle
2012-08-07 02:09:25 +02:00
Eloy Lafuente (stronk7)
8b77ab0c10
Merge branch 'w32_MDL-34601_m24_wikischema' of git://github.com/skodak/moodle
2012-08-06 21:15:46 +02:00
Kirill Astashov
a8d259553d
MDL-34669: Fix editor filepicker context bt trying to use page context
2012-08-06 16:50:59 +08:00
Aparup Banerjee
fb87c4c96c
Merge branch 'MDL-31599' of git://github.com/danpoltawski/moodle
2012-08-06 16:43:19 +08:00
Aparup Banerjee
78797b3643
Merge branch 'MDL-34716-master' of git://github.com/danpoltawski/moodle
2012-08-06 16:37:46 +08:00
Aparup Banerjee
ba713c224e
MDL-22937 Chat: fixed whitespaces.
2012-08-06 16:28:13 +08:00
Aparup Banerjee
1f3d01f169
Merge branch 'MDL-22937_message_html2' of git://github.com/andyjdavis/moodle
2012-08-06 16:23:05 +08:00
Rossiani Wijaya
da248cbb71
MDL-34562 accessibility compliance for chat module: Add <label> for input text and select tag
2012-08-06 16:17:29 +08:00
Dan Poltawski
71ada5337e
Merge branch 'MDL-34561_accessibility' of git://github.com/rwijaya/moodle
2012-08-06 15:49:06 +08:00
Dan Poltawski
93df0f0f31
MDL-34745 mod_forum: remove throttlingapplies string
...
Its no longer used
2012-08-06 15:31:16 +08:00
Rossiani Wijaya
5d2b1e5eec
MDL-34561 accessibility compliance for assignment module: add accesshide class
2012-08-06 15:19:51 +08:00
Dan Poltawski
dae2e8e74b
Merge branch 'MDL-34707' of git://github.com/timhunt/moodle
2012-08-06 14:41:53 +08:00
Dan Poltawski
3e002fa590
Merge branch 'MDL-34629-master' of https://github.com/mackensen/moodle
2012-08-06 14:19:32 +08:00
Dan Poltawski
c3ce4c212e
Merge branch 'MDL-34561_accessibility' of git://github.com/rwijaya/moodle
2012-08-06 14:08:47 +08:00
Dan Poltawski
bd0f84ea99
Merge branch 'MDL-25983_master' of git://github.com/dmonllao/moodle
2012-08-06 13:52:49 +08:00
Dan Poltawski
c786eda7f3
Merge branch 'MDL-34259-master' of git://github.com/FMCorz/moodle
2012-08-06 12:21:24 +08:00