69517 Commits

Author SHA1 Message Date
Dan Poltawski
d7e09cb9fb Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-07-31 09:37:08 +01:00
John Okely
56302d4868 MDL-46465 mod_chat: Fix more user icon links 2014-07-31 12:31:53 +08:00
John Okely
5eb1703c71 MDL-46465 mod_chat: Fix chat history user icon link 2014-07-31 10:46:09 +08:00
Brian Barnes
1c77e2aafa MDL-46625 theme: Added a way to target the current page 2014-07-31 13:27:14 +12:00
Eric Merrill
3388a4f59e MDL-46620 messages Make sure full message is used for read marking
message_mark_message_read needs to have the full message object,
otherwise data will be lost.
2014-07-30 15:56:52 -04:00
Mark Nielsen
ff9d3d819a MDL-46536: OAuth signature fails with inconsistent new lines
When the LTI intro contains a single \n or
\r newline character then the OAuth signature
fails.  All newlines should be \r\n
2014-07-30 10:01:15 -07:00
Dan Poltawski
c44012e09e Revert "Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle"
This reverts commit 14a3ccc96da2c23fd5c34167d02e1323fb01d113, reversing
changes made to 4709708d4889e12f0f4a621ceaacb80c4cde6c51.
2014-07-30 09:00:58 +01:00
Marina Glancy
de9c82953f Revert "Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle"
This reverts commit 68373c7821f48b13bf4bffa5e1160fd5d0b3b3d2, reversing
changes made to 62d61619e80523e13b6f570fd9e130659c0a0d2e.
2014-07-30 15:28:55 +08:00
Damyon Wiese
016bbe2c2c MDL-44116 Atto: Improve new accessibility sniffs.
Check for empty text it row, column headers and captions on tables.
Link to "Entire document" text instead of repeating the entire document if the text is long and has no headings.
2014-07-30 12:06:20 +08:00
sam marshall
61f5302b85 MDL-46414 Conditional availability: Dropdowns not set correctly when editing in IE
In IE, you cannot set the value of a dropdown to an integer; it has to be a string.
This caused a bug in several parts of the conditional availability editing
interface.
2014-07-29 18:33:03 +01:00
AMOS bot
255f2f0b2c Automatically generated installer lang files 2014-07-30 00:05:28 +08:00
Dan Poltawski
37c2490aa3 Merge branch 'MDL-46591-master' of git://github.com/danpoltawski/moodle 2014-07-29 16:32:52 +01:00
Dan Poltawski
ff7efc55ec MDL-46591 filter_tex: improved string
Thanks to German Valero for noticing this and Matteo Scaramuccia, Daniel
Thies and Helen Foser for refining it.
2014-07-29 16:29:42 +01:00
Dan Poltawski
2ac36ad587 Merge branch 'MDL-46236' of git://github.com/nobelium/moodle 2014-07-29 12:04:29 +01:00
Dan Poltawski
5d9fa99bff Merge branch 'MDL-46456' of https://github.com/aolley/moodle 2014-07-29 11:57:47 +01:00
AMOS bot
a876217bf0 Automatically generated installer lang files 2014-07-29 16:02:17 +08:00
Dan Poltawski
be5a27f2f5 Merge branch 'wip-MDL-46338-master' of git://github.com/marinaglancy/moodle 2014-07-29 08:50:37 +01:00
Sam Hemelryk
efe3aefaf2 Merge branch 'wip-MDL-34189-master' of git://github.com/marinaglancy/moodle 2014-07-29 16:15:24 +12:00
Marina Glancy
05d311caa5 Merge branch 'MDL-46465_chat_style' of git://github.com/andyjdavis/moodle 2014-07-29 12:10:34 +08:00
Marina Glancy
ef7c084b39 Merge branch 'm28_MDL-46325' of git://github.com/totara/moodle 2014-07-29 11:58:24 +08:00
Sam Hemelryk
6df4025b2c Merge branch 'MDL-43908-master' of https://github.com/lucisgit/moodle 2014-07-29 15:50:50 +12:00
Sam Hemelryk
6239a2358f Merge branch 'MDL-45041' of git://github.com/jleyva/moodle 2014-07-29 15:47:13 +12:00
Sam Hemelryk
fe5bf6ee81 Merge branch 'MDL-46460' of git://github.com/jleyva/moodle 2014-07-29 15:44:31 +12:00
Marina Glancy
d92e23cfe6 MDL-46338 enrol_self: Icon should indicate enrolment availability 2014-07-29 09:50:22 +08:00
Adam Olley
8ce862ed83 MDL-46457 mod_lti: Render lti description through standard format_module_intro 2014-07-29 10:38:43 +09:30
Sam Hemelryk
4a928b9dfc Merge branch 'MDL-44116-master' of git://github.com/damyon/moodle 2014-07-29 09:37:44 +12:00
Sam Hemelryk
964b220c83 Merge branch 'MDL-45044-master' of https://github.com/dthies/moodle 2014-07-29 08:46:49 +12:00
Sam Hemelryk
72655d0539 Merge branch 'MDL-46446_rating_style' of https://github.com/andyjdavis/moodle 2014-07-29 08:42:56 +12:00
Dan Poltawski
70acf8388b Merge branch 'MDL-46206-master' of git://github.com/jethac/moodle 2014-07-28 17:25:04 +01:00
Dan Poltawski
40864d30ac Merge branch 'MDL-45594_master' of git://github.com/markn86/moodle 2014-07-28 12:54:15 +01:00
Dan Poltawski
5a8f38d712 Merge branch 'wip-MDL-46503-master' of git://github.com/marinaglancy/moodle 2014-07-28 12:49:13 +01:00
Dan Poltawski
d4a89aa500 Merge branch 'master_MDL-45715' of https://github.com/danmarsden/moodle 2014-07-28 12:47:30 +01:00
Dan Poltawski
14a3ccc96d Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle 2014-07-28 12:01:24 +01:00
Dan Poltawski
4709708d48 Merge branch 'MDL-46459' of git://github.com/jleyva/moodle 2014-07-28 11:59:02 +01:00
Dan Poltawski
dde5ae7cf7 Merge branch 'MDL-46463_rss_style' of https://github.com/andyjdavis/moodle 2014-07-28 11:52:09 +01:00
Dan Poltawski
733d20a0e8 Merge branch 'MDL-46433-master' of git://github.com/lameze/moodle 2014-07-28 11:49:37 +01:00
Dan Poltawski
aba225fd3a Merge branch 'MDL-46504_master' of git://github.com/dmonllao/moodle 2014-07-28 10:45:17 +01:00
Dan Poltawski
d8d240ee63 Merge branch 'MDL-46397' of git://github.com/nobelium/moodle 2014-07-28 10:41:05 +01:00
Marina Glancy
68373c7821 Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle 2014-07-28 16:00:48 +08:00
Jetha Chan
a9e05f49db MDL-46523 navigation: add body class when logged in as other role 2014-07-28 15:47:46 +08:00
Marina Glancy
274dc06881 MDL-34189 cohorts: Allow admin/manager to see all cohorts on one page 2014-07-28 15:02:27 +08:00
Nobelium
bf4f65fbb6 MDL-46397 mod_scorm : binding cmi values with scoid 2014-07-28 05:37:21 +00:00
Andrew Davis
c52b4db52d MDL-46465 mod_chat: assorted coding style fixes 2014-07-28 10:01:41 +08:00
Sam Hemelryk
62d61619e8 Merge branch 'wip_MDL-46449_m28_loginblock' of https://github.com/skodak/moodle 2014-07-28 13:25:13 +12:00
Sam Hemelryk
9834bce700 Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle 2014-07-28 13:07:27 +12:00
Sam Hemelryk
8d4da7c010 Merge branch 'MDL-43390_master' of git://github.com/dmonllao/moodle 2014-07-28 12:22:40 +12:00
Sam Hemelryk
9894b272c5 Merge branch 'wip-MDL-46525-master' of git://github.com/marinaglancy/moodle 2014-07-28 12:13:44 +12:00
Sam Hemelryk
cb2ca9b9cc Merge branch 'MDL-8501-master' of git://github.com/FMCorz/moodle 2014-07-28 12:10:03 +12:00
Sam Hemelryk
db28260c29 Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle 2014-07-28 08:46:03 +12:00
Sam Hemelryk
896506e4df Merge branch 'MDL-46207-master' of git://github.com/damyon/moodle 2014-07-28 08:37:42 +12:00