Commit graph

46236 commits

Author SHA1 Message Date
Petr Skoda
0e3fdf10c2 Merge branch 'MDL-24984' of git://git.luns.net.uk/moodle 2011-01-10 14:38:16 +01:00
Petr Skoda
5301285d87 Merge branch 'MDL-24742' of git://git.luns.net.uk/moodle 2011-01-10 14:37:21 +01:00
Petr Skoda
2f1b1abc83 Merge branch 'MDL-25232' of git://git.luns.net.uk/moodle 2011-01-10 14:35:38 +01:00
Petr Skoda
e168f8cca6 Merge branch 'MDL-25675' of git://git.luns.net.uk/moodle 2011-01-10 14:34:18 +01:00
Petr Skoda
29612524f3 Merge branch 'MDL-25854' of git://github.com/samhemelryk/moodle 2011-01-10 14:31:21 +01:00
Petr Skoda
d32c077bf6 Merge commit 'ed5c4cf44d' 2011-01-10 14:21:15 +01:00
Petr Skoda
b2d6484598 Merge commit '246cc0e6b5'
Conflicts:
	course/request.php
2011-01-10 14:12:34 +01:00
Petr Skoda
b2f806cd92 Merge branch 'MDL-25886-user_picture_fields' of git://github.com/mudrd8mz/moodle 2011-01-10 13:43:00 +01:00
Sam Hemelryk
4b3c86b152 Merge branch 'MDL-24133' of git://git.luns.net.uk/moodle 2011-01-10 16:40:30 +08:00
Sam Hemelryk
5539372b27 Merge branch 'MDL-25909' of git://git.luns.net.uk/moodle 2011-01-10 16:36:49 +08:00
Sam Hemelryk
0017173f1a Merge branch 'MDL-23393' of git://git.luns.net.uk/moodle 2011-01-10 16:26:17 +08:00
Sam Hemelryk
1cc0c36e04 Merge branch 'MDL-23425' of git://git.luns.net.uk/moodle 2011-01-10 16:12:50 +08:00
Sam Hemelryk
03364f9e2f Merge branch 'MDL-25869' of git://git.luns.net.uk/moodle 2011-01-10 16:10:46 +08:00
Sam Hemelryk
726bc52504 Merge remote branch 'mouneyrac/MDL-25768' 2011-01-10 16:01:08 +08:00
Sam Hemelryk
6b9240c55e Merge branch 'MDL-23657' of git://git.luns.net.uk/moodle 2011-01-10 13:39:44 +08:00
Sam Hemelryk
9e41043ca4 Merge branch 'MDL-23224' of git://github.com/mouneyrac/moodle 2011-01-10 13:33:48 +08:00
Sam Hemelryk
1861a2875a Merge branch 'MDL-24299' of git://git.luns.net.uk/moodle 2011-01-10 13:10:33 +08:00
Sam Hemelryk
34e54bbb62 Merge branch 'MDL-25478' of git://git.luns.net.uk/moodle 2011-01-10 13:02:52 +08:00
Sam Hemelryk
0d2d7a6553 Merge branch 'MDL-25709-2' of git://git.luns.net.uk/moodle 2011-01-10 12:08:10 +08:00
Dan Poltawski
ed4a7e4b07 forum MDL-25232 - fix unbalanced divs 2011-01-09 21:11:01 +00:00
Paul Vaughan
43fa145137 course/lib MDL-24984 - fix lack of spacing on category list
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
2011-01-09 20:35:21 +00:00
Dan Marsden
ed5c4cf44d SCORM MDL-25891 typo causing general exception for some SCORM objects - thanks to Hais Deakin for report/fix 2011-01-10 09:24:16 +13:00
Dan Poltawski
7de9bfad15 course-format-weeks MDL-24742 dont redefine maincontent
It was breaking XHTML validation due to duplicate id
2011-01-09 20:02:21 +00:00
Dan Poltawski
e594fc8d13 mod/data MDL-24133 - footer called before header 2011-01-09 19:31:25 +00:00
Myles Carrick
94b8fa5aad course: MDL-23425 use correct config setting in check for displaying course request buttons
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
2011-01-09 18:28:41 +00:00
Dan Poltawski
9268148966 blog MDL-23393 - Tidy up preferences form
Make form display set value and use mforms type checking
2011-01-09 18:03:58 +00:00
Dan Poltawski
065bee4b70 forum MDL-25909 - Fix undefined variable 2011-01-08 15:19:41 +00:00
Dan Poltawski
15217303ae blocks/rss_client MDL-25869 Prevent sharing id
The form was generating an element id of "header", causing theme
breakage
2011-01-08 00:17:33 +00:00
David Mudrak
5c0d03ea1c MDL-25886 method to convert aliased fields returned by user_picture::fields() back to unaliased form
The new public static method user_picture::unalias() picks the user
picture fields from the given record and maps the properties back to
unaliased form so that the result can be rendered.
Also fixes a forgotten bug in previous commit and adds a unit test for
both aliasing and unaliasing.
2011-01-07 14:05:25 +01:00
David Mudrak
9958e561d8 MDL-25886 allow user_picture::fields() to be used multiple times within a single query
When user table is joined twice or more within a single query, it is
important to be able to provide aliases to all returned files. This
patch adds optional parameter that, if provided, is used as a prefix
for columns aliases. Does not apply to the 'id' column, use $idalias for
that.
2011-01-07 02:12:43 +01:00
Sam Hemelryk
603087b87e enrol MDL-25522 Fixed up duplicate fields in search_other_users method that was causing problems in Oracle 2011-01-06 10:20:28 +08:00
Andrew Robert Nicols
218a465980 lib/ajax/ MDL-25675 Use className instead of classList.toString()
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
2011-01-05 23:26:28 +00:00
Petr Skoda
46f4c3932f weekly release 2011-01-05 11:54:01 +01:00
jeromemoodle
1ede3cb37f javascript lib MDL-23224 dropdown onclick event is not trigger in Chrome 2011-01-05 16:12:52 +08:00
andyjdavis
246cc0e6b5 course MDL-25831 removed trailing whitespace 2011-01-05 15:08:18 +08:00
jeromemoodle
6a658c9173 community hub finder MDL-25768 private hubs weren't displayed in the hub list 2011-01-05 14:27:54 +08:00
Sam Hemelryk
dfcf4e0819 Merge branch 'MDL-25525' of git://git.luns.net.uk/moodle 2011-01-04 13:47:55 +08:00
andyjdavis
a170818189 course MDL-25831 made course request notifications work 2011-01-04 13:35:08 +08:00
Sam Hemelryk
724125bdd4 Merge branch 'MDL-25657' of git://git.luns.net.uk/moodle 2011-01-04 13:30:32 +08:00
Dan Poltawski
047c3b6cd3 lib/accesslib.php MDL-25709 - fix docs 2011-01-03 23:41:10 +00:00
Dan Poltawski
e60a00f9a4 blocks/calendar_month MDL-23657 - don't assume id param is courseid
This was casuing context creation on invalid courses..

There remains a problem with previous/next buttons on non course pages.
2011-01-03 23:21:44 +00:00
Tomasz Muras
936a0ae07e roles/assign MDL-24299 Fix back link
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
2011-01-03 21:09:32 +00:00
Sergey Vidusov
ebb32067bf MDL-25478 - stop fatal errors adding blocks on the module edit page
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
2011-01-03 19:09:56 +00:00
Adam Olley
adc3cfc744 calendar/lib.php MDL-25525 - Tooltip icons broken
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
2011-01-03 18:26:50 +00:00
Dan Poltawski
03a50532be user/filters MDL-25657 Obsolete reference to timestart 2011-01-03 18:08:30 +00:00
Petr Skoda
b095f16947 Merge branch 'MDL-25847' of git://git.luns.net.uk/moodle 2011-01-03 18:16:04 +01:00
Petr Skoda
89881a345b MDL-25589 removing extra align value 2011-01-03 18:08:44 +01:00
Petr Skoda
e1ce9a6670 Merge branch 'MDL-25589' of git://git.luns.net.uk/moodle 2011-01-03 18:02:44 +01:00
Petr Skoda
6a81ececb3 Merge branch 'MDL-25808' of git://git.luns.net.uk/moodle 2011-01-03 17:59:53 +01:00
Petr Skoda
01f6035ea1 Merge branch 'MDL-25822' of git://git.luns.net.uk/moodle 2011-01-03 17:53:51 +01:00