Commit graph

72092 commits

Author SHA1 Message Date
Jerome Mouneyrac
09ca18a47e MDL-41026 webservices: use correct param format in external apis 2015-01-27 10:06:09 +05:30
Andrew Nicols
85099b388f MDL-46755 format_social: Minor corrections during integration
* Add additional checks in behat tests to ensure ordering of information
  does not give false positives
* Typo in lang pack
* Comment correction
2015-01-27 12:14:24 +08:00
Mark Nelson
bb286b6d5f MDL-47871 tool_monitor: allow teachers to duplicate site rules 2015-01-26 19:32:59 -08:00
Andrew Nicols
d927bc0f32 Merge branch 'MDL-46755_m29-2' of https://github.com/sbourget/moodle 2015-01-27 11:30:55 +08:00
Frederic Massart
517e0111f3 MDL-48920 tool_generator: Use 'real' names during course generation 2015-01-27 11:26:56 +08:00
Andrew Nicols
0d98b0f7ad Merge branch 'MDL-48491-master' of git://github.com/zbdd/moodle 2015-01-27 10:48:36 +08:00
David Monllao
58f2c3ca5c MDL-47159 atto_link: Adding prefix when url doesn't specify one 2015-01-27 10:43:29 +08:00
Brian Barnes
8b5f402151 MDL-46467 forms: Labels have "for" attribute even when frozen 2015-01-27 14:30:22 +13:00
Andrew Nicols
96a5463119 MDL-48685 core_useragent: Correct IE 5.0 issues 2015-01-27 08:36:20 +08:00
Andrew Nicols
83af132901 MDL-48685 tests: Add testing for supports_json_contenttype 2015-01-27 08:36:20 +08:00
Andrew Nicols
5ee4f58134 MDL-48685 tests: Add additional User Agents
* Firefox 33; Mac OS X 10.10
* Chrome 39; Mac OS X
* Safari; iPhone 6 Plus; iOS 8.1; Build 12B411
* Opera 12.15 (Build 1748); Mac OS X
2015-01-27 08:36:20 +08:00
Andrew Nicols
7c10ad334d MDL-48685 tests: Rewrite useragent tests 2015-01-27 08:36:19 +08:00
Eloy Lafuente (stronk7)
c07962d56d Merge branch 'MDL-48916' of https://github.com/wesleysitu/moodle 2015-01-27 01:06:43 +01:00
Eloy Lafuente (stronk7)
681b57bd28 Merge branch 'MDL-48921-master-2nd' of git://github.com/FMCorz/moodle 2015-01-27 01:02:39 +01:00
Eloy Lafuente (stronk7)
0e134b76b5 Merge branch 'MDL-48946-master' of https://github.com/sammarshallou/moodle 2015-01-27 00:56:51 +01:00
Eloy Lafuente (stronk7)
65d2f8e3f9 Merge branch 'wip-MDL-48325-master' of git://github.com/abgreeve/moodle 2015-01-27 00:22:36 +01:00
Eloy Lafuente (stronk7)
3195a1f91f Merge branch 'MDL-48939-master' of git://github.com/andrewnicols/moodle 2015-01-26 23:57:33 +01:00
Eloy Lafuente (stronk7)
d82ab7bf22 Merge branch 'MDL-48616-master' of git://github.com/jethac/moodle 2015-01-26 23:47:14 +01:00
Eloy Lafuente (stronk7)
13abbea83b Merge branch 'MDL-48407-master' of git://github.com/gurgus/moodle 2015-01-26 23:41:17 +01:00
Eloy Lafuente (stronk7)
e6b1816588 MDL-48266 backup: make upgrade step to match current version bump. 2015-01-26 19:22:44 +01:00
Eloy Lafuente (stronk7)
16dafa5d9f Merge branch 'MDL-48266-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2015-01-26 19:19:35 +01:00
Eloy Lafuente (stronk7)
2a5ecfa975 Merge branch 'MDL-48720-master' of git://github.com/andrewnicols/moodle 2015-01-26 19:08:21 +01:00
Eloy Lafuente (stronk7)
50b7b15894 Merge branch 'MDL-40286' of git://github.com/jmvedrine/moodle 2015-01-26 18:32:43 +01:00
Eloy Lafuente (stronk7)
59a99b02ee Merge branch 'MDL-35765-master' of git://github.com/merrill-oakland/moodle 2015-01-26 17:27:54 +01:00
Eloy Lafuente (stronk7)
6c1a89f1f3 Merge branch 'MDL-36877' of git://github.com/jmvedrine/moodle 2015-01-26 16:04:29 +01:00
Eloy Lafuente (stronk7)
ec96b4b3d9 Merge branch 'MDL-48711-master' of git://github.com/merrill-oakland/moodle 2015-01-26 11:14:33 +01:00
Eloy Lafuente (stronk7)
b646a710ba Merge branch 'MDL-43421' of git://github.com/mr-russ/moodle 2015-01-26 10:24:51 +01:00
Valerii Kuznetsov
13b5a4942f MDL-48968 blocks: fixed bug with pagetype handling 2015-01-26 09:28:42 +13:00
Jean-Michel Vedrine
ccf2a054ae MDL-36877 Lesson: final page not displayed if show gradebook set to no 2015-01-25 18:46:00 +01:00
Jean-Michel Vedrine
b69d512a90 MDL-40286 mod_lesson: non-editing teacher should see Grade analysis 2015-01-23 20:21:08 +01:00
Rod Norfor
2350e7f24d MDL-48914 admin: check maxuserperpage in existingroleholders->find_users 2015-01-23 16:02:27 +00:00
Tim Hunt
52540a51fa MDL-48898 quiz: use admin_setting_configduration
Now this setting type is available, it is a better UI.

This required a new setting class
admin_setting_configduration_with_advanced.

Also, I took the liberty of shortening the default auto-save delay to 1
minute, and re-wording the description of that setting, now that it can
be changed to any value.
2015-01-23 11:56:08 +00:00
Nelson Moller
413907cff3 MDL-48929 repository_filesystem: Valide relative path against realpath
On Windows systems, there could have been a mix of back and forward
slashes, causing the validation of the relative path to fail. Now
we will always get the realpath before comparing.
2015-01-23 17:26:32 +08:00
Andrew Nicols
557f44d970 MDL-48620 JavaScript: Updated shifted files to comply with coding style 2015-01-23 14:51:24 +08:00
Andrew Nicols
2357166901 MDL-48620 JavaScript: Update .jshintrc to comply with coding style
* eqeqeq: We do not require use of ===
* maxlen: Coding style aims for 132 characters
* indent: 4 Characters (Helps some editors but does not warn in new version of jshint)
* undef: Warn about variables used before they are defined
* predef: Specify that we define the M variable elsewhere
2015-01-23 14:50:31 +08:00
Andrew Nicols
0375273e4e MDL-48620 JavaScript: Sort .jshintrc alphabetically
This will make future changes easier to manage and spot.
2015-01-23 14:50:31 +08:00
Simon Coggins
38535ab891 MDL-48855 dev: Fix ctags command to handle extra whitespace 2015-01-23 10:59:29 +08:00
Andrew Nicols
e0ae3519a1 weekly release 2.9dev 2015-01-23 08:27:32 +08:00
Andrew Nicols
3b76ea5c48 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-01-23 08:27:25 +08:00
Dan Poltawski
79d6c46df3 Merge branch 'MDL-48949' of git://github.com/timhunt/moodle 2015-01-22 17:52:20 +00:00
Tim Hunt
0065f02469 MDL-48949 mod_lti: tidy mod/lti/upgrade.txt 2015-01-22 17:28:08 +00:00
sam marshall
b3d7eb6ed4 MDL-48946 Files: New custom description format_string call
The format_string call used when getting file type descriptions
does not specify a context. The page context is not always
available at this point, so for consistency it should specify
the system context.
2015-01-22 13:27:50 +00:00
Frederic Massart
94b8c63635 MDL-48266 backup: Fix backup strorage misconfiguration
Basically if the destination dir is empty then the storage
type should be set to the course backup area. This does
not affect the behaviour of the backups that lived with
misconfigured settings.
2015-01-22 17:49:26 +08:00
Frederic Massart
9fdf16a0fc MDL-48266 backup: Validate backup_auto_storage config 2015-01-22 17:48:07 +08:00
Eloy Lafuente (stronk7)
6e91426e73 Merge branch 'MDL-48493-master-autodetect' of git://github.com/mudrd8mz/moodle 2015-01-22 10:17:56 +01:00
David Mudrák
ef86599e99 MDL-48493 admin: Fix PHP warning thrown if unable to detect component
The method detect_plugin_component() returns false or string. The
normalize_component() expects strings only. Passing false to it
(typically when the plugin does not declare its component) caused the
PHP warning.

Credit goes to Ankit Agarwal for spotting this during testing.
2015-01-22 10:02:01 +01:00
Andrew Nicols
2f19417319 MDL-48939 core: Depreacte search_generate_text_SQL
This has never been used outside of forum, where it was introduced in
Moodle 1.8 and required manual creation of an index.
2015-01-22 15:10:00 +08:00
Adrian Greeve
4cac2470bb MDL-48325 mod_data: Export to portfolio button uses capability.
The Export to portfolio button now checks the mod/data:exportownentry
capability to see if the export button should be shown.
2015-01-22 14:49:21 +08:00
Zachary Durber
530debc078 MDL-48491 enrolments: Paypal enrolments send email as support user. 2015-01-22 13:42:08 +08:00
Dave Cooper
b02f473cfb MDL-48407 mod_forum: Updated text email notification template 2015-01-22 13:28:18 +08:00