71178 Commits

Author SHA1 Message Date
Dan Poltawski
604090397a Merge branch 'wip-MDL-36240-master' of git://github.com/abgreeve/moodle 2014-11-17 13:30:57 +00:00
Dan Poltawski
bb4013f5c7 Merge branch 'MDL-43987-master' of git://github.com/xow/moodle 2014-11-17 13:17:40 +00:00
Dan Poltawski
a020ddecf0 Merge branch 'MDL-46640-master' of git://github.com/FMCorz/moodle 2014-11-17 12:52:35 +00:00
Dan Poltawski
42b8a6cccd Merge branch 'wip-mdl-48032-m' of git://github.com/rajeshtaneja/moodle 2014-11-17 11:32:04 +00:00
Andrew Nicols
e7f0b4d3dd MDL-48150 mod_forum: Generate message inbound keys for all posts
This code was previously misplaced so that only posts in discussion which
had not yet been processed in the current cron run would have keys
generated. If two posts were generated in the same discussion and sent out
on the same cron cycle, only the first post to be processed would have a
key generated.
2014-11-17 15:47:47 +08:00
David Monllao
d931574ff9 MDL-33606 course: Adding section info to course_viewed log
Also changing references to section id to
section number, that it is what it really is.
2014-11-17 15:18:18 +08:00
Rajesh Taneja
b4fa03606f MDL-48250 enrol_ldap: set default category
As in other enrol plugins (database), set default
category to 1 (pointing to Miscellaneous)
2014-11-17 14:41:56 +08:00
Mark Nelson
4e4572963a MDL-30619 mod_data: fixed deletion of files on reset 2014-11-16 21:42:59 -08:00
Frederic Massart
0209a85704 MDL-46640 navigation: Handle block contexts within a category 2014-11-17 12:41:41 +08:00
Frederic Massart
c159e2aa0a MDL-29585 mod_wiki: Handle special characters in headings/sections 2014-11-17 10:38:36 +08:00
Sam Hemelryk
2611dd99d3 MDL-48196 phpunit: fixed the fail after this change 2014-11-17 15:07:15 +13:00
John Okely
c2a9bb3a9d MDL-43987 core: Remove port numbers in cleanremoteaddr 2014-11-17 09:48:26 +08:00
Sam Hemelryk
1f4039d84f Merge branch 'MDL-48115_master' of https://github.com/totara/openbadges 2014-11-17 14:37:49 +13:00
Adrian Greeve
d983ac6394 MDL-36240 backup: Activity calendar events backed up.
Activity calendar events can now be backed up and restored
when no user data is selected.
2014-11-17 09:18:00 +08:00
Sam Hemelryk
d6abe6f744 Merge branch 'MDL-48194-master' of git://github.com/andrewnicols/moodle 2014-11-17 13:39:03 +13:00
Sam Hemelryk
993e61d970 Merge branch 'MDL-48171-master' of git://github.com/ankitagarwal/moodle 2014-11-17 13:21:02 +13:00
Sam Hemelryk
0d23255b89 Merge branch 'MDL-48179-master' of https://github.com/sammarshallou/moodle 2014-11-17 12:48:04 +13:00
Sam Hemelryk
b83a0323da Merge branch 'MDL-48196-master' of git://github.com/andrewnicols/moodle 2014-11-17 12:34:02 +13:00
Sam Hemelryk
2928dfd8a0 Merge branch 'master_MDL-47993' of https://github.com/totara/moodle 2014-11-17 12:21:16 +13:00
Sam Hemelryk
57fa596e0f Merge branch 'MDL-43628' of https://github.com/scyrma/moodle 2014-11-17 11:44:57 +13:00
Sam Hemelryk
76555946a9 Merge branch 'MDL-35638-master' of git://github.com/ankitagarwal/moodle 2014-11-17 10:34:10 +13:00
Sam Hemelryk
fea4baf826 Merge branch 'MDL-47590' of git://github.com/timhunt/moodle 2014-11-17 10:34:09 +13:00
Sam Hemelryk
6d97620481 Merge branch 'MDL-44657-master' of git://github.com/FMCorz/moodle 2014-11-17 10:34:09 +13:00
Matteo Scaramuccia
bb8ed60a3c MDL-48023 Files API: Theme files must be cache-able by shared proxies.
The profile image AKA user icon will be cache-able by shared proxies too,
under its specific accessibility constraints/conditions.
2014-11-16 09:53:27 +01:00
Pierre Pichet
b8393a77c3 MDL-48042 Questions: Reset Calculated qtype comments on datasets
Reset back the modifications of Calculated qtype comments on datasets
    done by MDL-47224

Signed-off-by: Pierre Pichet <pichet.pierre@uqam.ca>
2014-11-15 16:17:15 -05:00
Mary Evans
31b569ab18 MDL-48199 theme_bootstrapbase: Page padding left is wrong when in RTL 2014-11-14 18:52:28 +00:00
sam marshall
94b084fb02 MDL-48179 Backup progress: Can time out when compressing large backup 2014-11-14 18:29:30 +00:00
Tim Hunt
ba145a9e4e MDL-47590 question backup: include response file only with userdata 2014-11-14 16:21:18 +00:00
Ankit Agarwal
74b28381c6 MDL-48171 gradebook: Use proper apis to get item name 2014-11-14 13:25:04 +05:30
Sam Hemelryk
2ff98fb6e4 MDL-48206 block_comments: textarea width 100% 2014-11-14 11:40:33 +13:00
Sam Hemelryk
aac8dfa8b6 MDL-48070 navigation: optimised the login page
The navigation and settings no longer get initialised on the login
page by default, this is achieved by calling to ignore the active
page on the navbar.
It is safe because the login page is not represented in either the
navigation or the settings.

This change saves a few MB or ram and a couple of database queries
2014-11-14 11:40:25 +13:00
Sam Hemelryk
701772c0e8 MDL-47434 format_topics: section 0 navigation tweak
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
2014-11-14 11:40:17 +13:00
Sam Hemelryk
f9745259b7 MDL-47434 format_weeks: section 0 navigation tweak
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
2014-11-14 11:40:17 +13:00
Oleg Demeshev
741063b41c MDL-47993 calendar: Fix ical import Microsoft calendar issue 2014-11-14 10:32:54 +13:00
Eloy Lafuente (stronk7)
c106341098 weekly release 2.9dev 2014-11-13 12:14:36 +01:00
Eloy Lafuente (stronk7)
a5c69c900c Merge branch 'MDL-48214-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-13 11:55:15 +01:00
Helen Foster
ed10b1d94d MDL-48214 Merge English strings from the en_fix language pack 2014-11-13 11:29:08 +01:00
Paul Holden
68ef378b1b MDL-44657 forms: Form identifiers should only contain basic characters 2014-11-13 16:20:28 +08:00
Rajesh Taneja
bd2183cd16 MDL-46865 report_log: Fixed showuser and showcourse in report log 2014-11-13 15:19:24 +08:00
John Okely
180acd64e9 MDL-47700 Grades: Fix incorrect config for overview report showrank 2014-11-13 14:26:31 +08:00
Tim Lock
d0fabf1193 MDL-47700 Grades: Sitewide overview report isn't visible in some cases
Showing a overview report rank sitewide isn't visible to student in same cases
2014-11-13 13:25:31 +08:00
Andrew Nicols
14ecbb2ee8 MDL-48196 phpunit: Set e-mail address for admin user at installation 2014-11-13 08:47:43 +08:00
Eugene Venter
8309373cbf MDL-48204 mod_wiki: admin.php - fix syntax error 2014-11-13 00:46:43 +01:00
Tim Hunt
06cf0b75ec MDL-48146 quiz settings: fix non-percent feedback boundaries 2014-11-12 15:45:26 +00:00
Dan Poltawski
2ee5b9cdc6 weekly release 2.9dev 2014-11-12 11:33:20 +00:00
Dan Poltawski
271045e5d4 MDL-48174 tool_langimport: info about skipped update
So admins can work out why the task might not be having an effect.
2014-11-12 11:24:21 +00:00
Dan Poltawski
bfa16aa2fa Merge branch 'wip-mdl-48174' of https://github.com/rajeshtaneja/moodle 2014-11-12 11:03:43 +00:00
David Monllao
800fa051b0 MDL-30968 mod_forum: No picture link to group when no groups mode 2014-11-12 11:53:14 +08:00
Andrew Nicols
a9edd8a671 MDL-48194 testing: Adjust naming of testsuites in phpunit.xml
This will make it easier to run phpunit for a specific component by making
all testsuite names consistent, guessable, and in-line with the naming of
the parameter (testsuite vs. test suite).
2014-11-12 11:46:03 +08:00
Adam Olley
09869dd583 MDL-42756 dock: Trigger actionmenu enhance when showing dock panel
Additionally fixes the styling for the actionmenu icon size in
bootstrapbase'd themes.
2014-11-12 14:10:07 +10:30