Commit graph

75230 commits

Author SHA1 Message Date
David Monllao
5e567834dd Merge branch 'MDL-51181-m' of git://github.com/micaherne/moodle 2015-08-31 10:55:08 +08:00
David Monllao
abbf64e363 Merge branch 'MDL-51215-master' of git://github.com/marinaglancy/moodle 2015-08-31 10:45:19 +08:00
Jinu Abraham
b6c97f4c2b MDL-51232 mod_book: Filter name header 2015-08-31 12:04:01 +09:30
lazydaisy
37cbded0c3 MDL-51234 theme_bootstrapbase: hover hardly visible on invert/collapse 2015-08-30 19:59:28 +01:00
Kevin Wiliarty
f75afe9b90 MDL-51229 theme: display docked block on top of fixed navbar 2015-08-30 09:37:44 -04:00
Neill Magill
ccfb9b69db MDL-50971 ActionMenu: Action menus cause page to jump when closing
This patch changes the behavior of open action menus when using a mouse.

Before this patch when clicking on the page with an open action menu the focus would be
returned to the action menu's call button. This could cause the page to jump when a
mouse user did not close an action menu, scrolled and then tried to perform another
action on the page.

After this patch when clicking the focus will not be returned to the action menu's call button.
The behavior of the script will not be changed when using the keyboard.
2015-08-28 12:13:16 +01:00
Dan Poltawski
20dbcc33e8 MDL-33564 rss: on error return HTTP error status
Also remove an unecessary debugging notice.
2015-08-28 09:53:01 +01:00
Marina Glancy
bdead9b5c7 MDL-51084 tool_customlang: return to the same page after submit 2015-08-28 16:20:03 +08:00
Dan Poltawski
e28004e614 weekly release 3.0dev 2015-08-28 07:38:07 +01:00
Andrew Nicols
34c6ec1869 MDL-50891 useragent: Move web crawler checks to useragent class 2015-08-28 14:31:51 +08:00
Andrew Nicols
4463f996c4 MDL-51236 phpunit: Prevent testsuite name conflicts
The testsuite name is fed straight into a class_exists() in
PHPUnit_Framework_TestSuite. In some cases, e.g. cachestore_static, the
class does exist, it's then fed into a ReflectionClass, and the test fails.

The testsuite needs to not conflict with any classes which could be
autoloaded in Moodle core.
2015-08-28 14:22:07 +08:00
Damyon Wiese
6f0dfdd969 MDL-51179 Atto: Add a behat test for autosave 2015-08-28 12:09:34 +08:00
Ryan Wyllie
6ceea3fe12 MDL-49536 theme_clean: logo only on front and login
The logo for the clean and more themes will only be
displayed on the front page and login page as it was
replacing the header information on other pages within
Moodle, causing users to lose information on the page.
2015-08-28 02:42:30 +00:00
Gareth J Barnard
01410430e7 MDL-50690 themes: Theme cache SVG images are not created. 2015-08-27 15:35:23 +01:00
Dan Poltawski
12fb029c67 MDL-50287 completion: version bump 2015-08-27 14:58:04 +01:00
Dan Poltawski
88d350eab4 MDL-50287 lang: remove unused string
(I don't think this string warrants deprecation)
2015-08-27 14:58:04 +01:00
Dan Poltawski
160ccd3d09 MDL-50287 completion: Rename tasks to remove the word 'cron' 2015-08-27 14:58:04 +01:00
Dan Poltawski
0628925bf1 MDL-50287 completion: avoid introducing uncessary functions
Also fix copyright
2015-08-27 14:57:56 +01:00
Josh Willcock
51e488eaf3 MDL-50287 completion: Separated slow task out from cron
The mark started function for the completions scheduled task can be very
slow and causes performance issues when running. By splitting this into
it's own task it can be managed independantly from the other parts which
update regularly.
2015-08-27 14:40:04 +01:00
Dan Poltawski
4ae71e93a8 MDL-49826 grade: hide singleview links when no permissions
Singleview only supports grade editors not viewers at this time.
2015-08-27 13:16:44 +02:00
Eloy Lafuente (stronk7)
1b5034025b Merge branch 'MDL-51148-master-enfix' of git://github.com/mudrd8mz/moodle 2015-08-27 12:46:11 +02:00
Frederic Massart
2b7848050d MDL-50677 user: Prefix custom fields node name in profile tree 2015-08-27 17:28:02 +08:00
Damyon Wiese
9764aab9da MDL-51213 externallib: external_format_text/external_format_string
API functions do not know if they are being called from a web page, or a
web-service. They need a single function to call to correctly apply
filters, strip tags etc that knows the correct way to do this based on
the way it was called (e.g. webservices allow parameters for skipping
filters etc).

So here we are fixing the default for the filter argument used in
external_format_text and adding a matching external_format_string.
2015-08-27 15:56:36 +08:00
Marina Glancy
efbd56960c MDL-51215 course: redirect to manage appropriate category 2015-08-27 11:13:06 +08:00
Tim Hunt
aa8092c60f MDL-47494 gapselect: Clarify comment. 2015-08-26 23:14:16 +01:00
David Mudrák
f729af1609 MDL-51148 tool_langimport: Use the amended string in Behat test 2015-08-26 17:03:36 +02:00
Helen Foster
ce2c0f3a74 MDL-51148 lang: Merge English strings from the en_fix language pack 2015-08-26 16:46:43 +02:00
Ruslan Kabalin
7f2033eafe MDL-51217 auth: Check if recaptcha enabled in the plugin used for signup. 2015-08-26 15:25:40 +01:00
Dan Poltawski
cd1b845f62 MDL-50641 rss: fix front page rss links
Fallback to guest user token when no user is specified in rss_get_url
rather than generating a junk token which is no use to anyone, this
matches existing logic which has been in place in forum for a while
and avoids custom handling all over the place.
2015-08-26 08:08:43 +01:00
Damyon Wiese
572e00928a MDL-51179 Atto: When a resume is aborted - create a fresh draft for future saves. 2015-08-26 14:15:53 +08:00
David Monllao
6ddfb278d2 Merge branch 'wip_MDL-50869_master' of git://github.com/gjb2048/moodle 2015-08-26 09:44:21 +08:00
Marina Glancy
55a8e86807 MDL-50923 themes: content-only class added before region-only 2015-08-26 03:40:37 +02:00
Andrew Davis
9679425c16 MDL-51205 coding style fixes in /pix 2015-08-26 07:10:53 +08:00
Andrew Davis
d1cb06fb1b MDL-49950 removed a duplicate string definition 2015-08-26 05:40:31 +08:00
Andrew Davis
d66c9f0d7b MDL-50529 core_grade: removed duplicate code 2015-08-25 21:14:47 +08:00
Eloy Lafuente (stronk7)
4738193225 Merge branch 'wip-MDL-50923-master' of git://github.com/marinaglancy/moodle 2015-08-25 11:34:33 +02:00
Dan Poltawski
f1352da1ba Merge branch 'wip-MDL-27177-master' of git://github.com/abgreeve/moodle 2015-08-25 09:55:00 +01:00
Damyon Wiese
2e96b001c4 MDL-51179 Atto: Abort autosave if there are more recent changes to the files
If the files in the draft area have been modified more recently than the timestamp
of the draft - do not restore the files, or you will delete any newer files. We
cannot really guess here - merging the 2 lists of files will be wrong.
2015-08-25 16:09:57 +08:00
David Monllao
7ac0ddd00a Merge branch 'MDL-50933' of git://github.com/timhunt/moodle 2015-08-25 14:28:06 +08:00
David Monllao
a2ce97e306 Merge branch 'MDL-50996' of git://github.com/timhunt/moodle 2015-08-25 14:26:25 +08:00
Ramindu Deshapriya
202203e38f MDL-51172 core_files: Added Behat test to automate MDLQA-8166 2015-08-25 08:49:01 +05:30
David Monllao
09fc06d799 Merge branch 'wip-MDL-50973-master' of git://github.com/marinaglancy/moodle 2015-08-25 10:13:18 +08:00
David Monllao
61e44f4033 Merge branch 'mdl-50957' of git://github.com/cdsmith-umn/moodle 2015-08-25 10:06:49 +08:00
Adrian Greeve
4fc7b6a07b MDL-27177 roles: Update to behat full profile tests. 2015-08-25 09:43:17 +08:00
Adrian Greeve
82e4d43842 MDL-27177 roles: Unit test for newly created function. 2015-08-25 09:43:17 +08:00
Adrian Greeve
66a43cd543 MDL-27177 roles: Allow students to see co-students profiles.
If the student shares a course with another student then let them
see the same detail on the full profile page as they do on the
course profile page.
2015-08-25 09:43:17 +08:00
Eloy Lafuente (stronk7)
bcf9c54c20 Merge branch 'MDL-50714-master' of git://github.com/andrewnicols/moodle 2015-08-25 00:06:01 +02:00
Tim Hunt
924db7109c MDL-45841 forum: show unread posts on blog-style forum front page 2015-08-24 21:44:56 +01:00
Dan Poltawski
ee9b9ffd51 Merge branch 'MDL-49701' of git://github.com/jmvedrine/moodle 2015-08-24 15:14:15 +01:00
Clement Smith
368c1bb674 MDL-50957 grade/report/user: Fix division by zero
When using "sum of grades" and $grademax is zero, a division by zero
error occurs in fill_contributions_column() in
grade/report/user/lib.php.
2015-08-24 09:05:30 -05:00