Commit graph

58852 commits

Author SHA1 Message Date
Ankit Agarwal
7af294352b MDL-36738 calendar: Display events imported details
We should display a the status of events when a new subscription is added. Although this means we need to redirect through an itermediate page.
2013-01-08 13:47:49 +08:00
Ankit Agarwal
8c84f374c0 MDL-36738 calendar: Ical subscription list should display type of event 2013-01-08 13:47:48 +08:00
Dan Poltawski
87ffc3fb69 Merge branch 'MDL-27901-master' of git://github.com/FMCorz/moodle 2013-01-08 13:01:00 +08:00
Dan Poltawski
3dab21591d Merge branch 'w51_MDL-21116_m52_reversedel' of git://github.com/skodak/moodle 2013-01-08 12:58:16 +08:00
Dan Poltawski
7378493ee9 Merge branch 'MDL-37247_master' of git://github.com/markn86/moodle 2013-01-08 12:50:44 +08:00
Dan Poltawski
4c345a1ed4 Merge branch 'MDL-36955' of git://github.com/jmvedrine/moodle 2013-01-08 12:20:54 +08:00
Mark Nelson
2b9fe87dca MDL-37247 mod_forum: adding webservice function to allow for the retrieval of forum instances 2013-01-08 12:19:49 +08:00
Dan Poltawski
9519d41142 MDL-28183 - fix trailing whitespace 2013-01-08 12:18:49 +08:00
Dan Poltawski
b5b418b2a7 Merge branch 'MDL-28183' of git://github.com/jmvedrine/moodle 2013-01-08 12:17:51 +08:00
Dan Poltawski
f858088cc4 Merge branch 'w51_MDL-37191_m25_plugindelete' of git://github.com/skodak/moodle 2013-01-08 11:16:43 +08:00
Dan Poltawski
cfb209a538 Merge branch 'MDL-31641_drag_drop_help' of git://github.com/davosmith/moodle 2013-01-08 10:54:01 +08:00
Dan Poltawski
f94ed34126 MDL-35130 - remove unused string 2013-01-08 10:52:18 +08:00
Dan Poltawski
230a377474 Merge branch 'MDL-35130-master' of https://github.com/mackensen/moodle 2013-01-08 10:50:46 +08:00
Dan Poltawski
a57ce0fde4 Merge branch 'w51_MDL-37297_m25_enrolcatprogress' of git://github.com/skodak/moodle 2013-01-08 10:48:13 +08:00
Dan Poltawski
00079538b9 Merge branch 'MDL-36456-master' of git://github.com/FMCorz/moodle 2013-01-08 10:30:50 +08:00
Dan Poltawski
a1d9f433ec Merge branch 'w51_MDL-37301_m25_coursecatinfoas' of git://github.com/skodak/moodle 2013-01-08 10:26:44 +08:00
Dan Poltawski
36b6340532 Merge branch 'w51_MDL-37254_m25_courseinfoas' of git://github.com/skodak/moodle 2013-01-08 10:24:01 +08:00
Dan Poltawski
a275bedb38 Merge branch 'w51_MDL-37298_m25_enrolcohprogress' of git://github.com/skodak/moodle 2013-01-08 10:16:19 +08:00
Paul Nicholls
a0dc7da9b4 MDL-29835: filemanager - zero means zero, not unlimited
The form_filemanager constructor was using empty() rather than !isset(),
so overwrote maxfiles=0 with the default (-1).  In addition, the JS UI
treated 0 as unlimited - but the non-JS fallback UI treated it as zero.
This would result in a file manager which allowed files to be
chosen/uploaded, which would then vanish into the void when the backend
saw that the maximum number of files was 0.
2013-01-08 15:12:50 +13:00
Dan Poltawski
e06c710e87 Merge branch 'w51_MDL-37293_m25_enroldbprogress' of git://github.com/skodak/moodle 2013-01-08 09:52:29 +08:00
Sam Hemelryk
b68fb448ef Merge branch 'wip-mdl-36958' of git://github.com/rajeshtaneja/moodle 2013-01-08 14:07:03 +13:00
Sam Hemelryk
c4c1504b44 Merge branch 'w51_MDL-35893_m25_perfinstall' of git://github.com/skodak/moodle 2013-01-08 14:00:44 +13:00
David Mudrák
0ab681d3e7 MDL-36977 Be more picky when it comes to migrating files in moodle1 backups 2013-01-08 08:53:38 +08:00
David Mudrák
7b66137f7b MDL-36977 Add more unit tests for moodle1 backup conversion 2013-01-08 08:53:37 +08:00
Marina Glancy
27efa6bfac MDL-37404 add class 'format-xxx' to the body for the current course format 2013-01-08 11:50:01 +11:00
Paul Nicholls
30793ea3bd MDL-35074: grader report - Ease limit on number of students per page
The limit imposed by max_input_vars "applies only to each nesting level of
a multi-dimensional input array"
(http://www.php.net/manual/en/info.configuration.php#ini.max-input-vars).

Turning the grader report fields into arrays (they were all top-level form
fields, i.e. elements of the top-level array) makes the number of students
become the only limiting factor, thereby allowing us to relax the limit on
number of students per page greatly (to 1 less than max_input_vars, for
safety).
2013-01-08 13:44:02 +13:00
Sam Hemelryk
be5a3168df MDL-21342 auth: tidy up pre-integration 2013-01-08 13:41:22 +13:00
Sam Hemelryk
70601b9433 Merge branch 'w51_MDL-21342_m25_lockout' of git://github.com/skodak/moodle 2013-01-08 10:56:39 +13:00
Eloy Lafuente (stronk7)
17e5c6e8d2 Merge branch 'MDL-35794' of git://github.com/timhunt/moodle 2013-01-07 22:40:00 +01:00
Eloy Lafuente (stronk7)
3cb7609bd6 Merge branch 'MDL-35792' of git://github.com/timhunt/moodle 2013-01-07 22:35:06 +01:00
Sam Hemelryk
7f30a6449b MDL-34344 config: added unit tests for get_config 2013-01-08 09:52:19 +13:00
sam marshall
e81da1540a MDL-36095 Section availability: Make behaviour consistent with activities 2013-01-07 15:57:00 +00:00
Petr Škoda
8d21130267 MDL-29996 cleanup filter plugin info 2013-01-07 12:42:13 +01:00
Eloy Lafuente (stronk7)
caf575e2bf Merge branch 'w51_MDL-36807_m25_mysocket' of git://github.com/skodak/moodle 2013-01-07 11:44:16 +01:00
Sam Hemelryk
007bfe8b4d MDL-25290 conversion: Converted config to use MUC 2013-01-07 19:22:40 +13:00
Dan Poltawski
bfa2b0382f Merge branch 'MDLmaster-MDL-37157-2' of https://github.com/OdyX/moodle 2013-01-07 13:59:52 +08:00
Dan Poltawski
5083fe2194 Merge branch 'w51_MDL-37128_m25_rssrestore' of git://github.com/skodak/moodle 2013-01-07 13:56:57 +08:00
Dan Poltawski
8057d3ee77 Merge branch 'w51_MDL-36893_m25_mnetestrict' of git://github.com/skodak/moodle 2013-01-07 13:53:14 +08:00
Dan Poltawski
6f4cf4656e Merge branch 'MDL-35230-master' of git://github.com/andrewnicols/moodle 2013-01-07 13:41:16 +08:00
Dan Poltawski
bc897f9d63 Merge branch 'MDL-27884-master' of git://github.com/ankitagarwal/moodle 2013-01-07 13:30:24 +08:00
Sam Hemelryk
b8459c0267 MDL-29996 filters: fixed bug when upgrading filter plugin names 2013-01-07 17:40:41 +13:00
Andrew Davis
10d8f0852b MDL-33117 grade: adding unit tests for the user report function inject_rowspans() 2013-01-07 11:57:04 +08:00
Jerome Mouneyrac
9a4c2f50c9 MDL-37355 object are automatically cast into object by the return value 2013-01-07 11:12:32 +08:00
Damyon Wiese
e00b5c454c MDL-37244 Assignment: Submission comments plugin does not implement comments callbacks.
This allows anyone to view or modify anyone elses submission comments.
2013-01-07 10:48:26 +08:00
Ankit Agarwal
986095771b MDL-33340 completion: Incorrect logic in hidden field check
Credit to Jody Steele
2013-01-07 10:36:00 +08:00
Sam Hemelryk
dd89f61e68 Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle 2013-01-07 15:22:37 +13:00
Simon Coggins
fd1d829500 MDL-35991 - use PARAM_LOCALURL for local urls 2013-01-07 10:09:20 +08:00
Rajesh Taneja
30697cf3fe MDL-37062 Course: Show one 'Add new course' button
Currently if there is no course and admin/course creator go to create course, he/she see two
'Add new course' buttons.
2013-01-07 09:44:36 +08:00
Dan Poltawski
f7551c2e62 Merge branch 'MDL-36667-master' of git://github.com/damyon/moodle 2013-01-07 09:42:31 +08:00
Sam Hemelryk
8ca9539be5 Merge branch 'MDL-37161-master' of https://github.com/StudiUM/moodle 2013-01-07 14:15:50 +13:00