Commit graph

22844 commits

Author SHA1 Message Date
Andrew Nicols
360e819fd3 Merge branch 'MDL-54853-master' of git://github.com/cameron1729/moodle 2016-06-09 09:41:53 +08:00
Cameron Ball
2549f46f7c MDL-54853 weblib: Properly specify encoding for blanktarget 2016-06-08 18:29:19 +08:00
Russell Smith
0b768e744f MDL-53495 database xmldb: Use real length restriction. 2016-06-08 11:06:16 +10:00
Andrew Nicols
147df77923 Merge branch 'MDL-53947-master' of git://github.com/junpataleta/moodle 2016-06-08 08:15:23 +08:00
Dan Poltawski
7bcab9d1fd Merge branch 'MDL-48756-master' of git://github.com/FMCorz/moodle 2016-06-07 11:49:39 +01:00
David Monllao
8a4f4f576e Merge branch 'MDL-54180_master' of https://github.com/marxjohnson/moodle 2016-06-07 16:15:43 +08:00
Skylar Kelty
1f5a347b46 MDL-53947 memcached: Fix memcached session warning on PHP7 2016-06-07 10:25:07 +08:00
Marina Glancy
6ee5e596b8 MDL-54837 tags: fixed bug when collection is locked
also fixed fatal error for upgraded plugins that did not pass tag
component to the tag form element
2016-06-07 08:38:39 +08:00
Joey Andres
fdac806aef MDL-53399 core: "activity chooser off/on" in user preference
- Created a "Course preferences" for user preference. This
  is where "activity chooser off/on" option is moved.
- Changed the lib/navigationlib.php to have a new user preference
  section, which is "Course preferences".
- Removed the "activity chooser" toggle codes in javascript.
2016-06-03 00:46:16 -06:00
Frederic Massart
240a9de4ab
MDL-48756 editor_atto: Bulk atto autosave queries 2016-06-01 12:49:15 +08:00
Andrew Nicols
69dcebb04d Merge branch 'MDL-54722-master' of git://github.com/cameron1729/moodle 2016-06-01 12:24:14 +08:00
Cameron Ball
fd5466af99 MDL-54722 navigation: Properly overflow expanded nav trees 2016-06-01 10:15:22 +08:00
Mark Johnson
be8b89500c MDL-54180 Behat: Handle exceptions from driver when saving screenshot 2016-05-31 12:32:57 +01:00
David Monllao
5751f7a36c Merge branch 'MDL-54667-master' of git://github.com/junpataleta/moodle 2016-05-31 12:46:59 +08:00
Jakob
cffd0fa138 MDL-53306 auth: Add hook for auth plugins to access user object.
Add a hook for auth plugins to be able to modify or check a user, before
raising any authentication errors.

The auth plugin needs to add a public function like this:

/**
 * Pre user_login hook.
 * This method is called from authenticate_user_login() right after the user
 * object is generated. This gives the auth plugins an option to make adjustments
 * before the verification process starts.
 *
 * @param object $user user object, later used for $USER
*/
public function pre_user_login_hook(&$user) {
    // Override if needed.
}
2016-05-30 11:57:03 -07:00
Jakub Kania
81475d2602 MDL-54667 core_lib: Fix the param name in edit profile link 2016-05-30 16:34:02 +08:00
Cameron Ball
af6a424054 MDL-37138 weblib: Document blanktarget in upgrade.txt 2016-05-30 16:12:17 +08:00
David Monllao
9812222d21 Merge branch 'MDL-29905-master' of git://github.com/FMCorz/moodle 2016-05-30 15:40:43 +08:00
Andrew Nicols
a29e419b2c Merge branch 'MDL-54756' of git://github.com/timhunt/moodle 2016-05-30 15:19:04 +08:00
David Monllao
1e562ebc48 Merge branch 'MDL-37138-master-2' of git://github.com/cameron1729/moodle 2016-05-30 15:02:17 +08:00
Cameron Ball
bf9974870b MDL-37138 weblib: Add blanktarget option to format_text 2016-05-30 13:17:59 +08:00
Frederic Massart
31031e98c7 MDL-29905 question: Auto remove stale questions upon category deletion 2016-05-30 12:26:09 +08:00
Jun Pataleta
4eba620ae3 MDL-53425 blocklib: Perform deletion of block instances by chunk 2016-05-30 11:22:47 +08:00
Tim Hunt
31c07476db MDL-54756 moodle_url: remove dangerous trim from make_file_url
This was a regression caused by MDL-50268. It broke qtype_stack.
2016-05-27 19:55:25 +01:00
David Monllao
7b7b990e43 Merge branch 'MDL-54582' of git://github.com/timhunt/moodle 2016-05-24 11:17:08 +08:00
Andrew Nicols
13c6946d92 MDL-53687 core_media: Comment fix 2016-05-24 09:02:36 +08:00
Andrew Nicols
939f2b31f9 Merge branch 'MDL-53687-master' of git://github.com/FMCorz/moodle 2016-05-24 08:59:47 +08:00
Frederic Massart
c2f430a813 MDL-53687 core_media: Edge does not yet support WebM and OGG 2016-05-23 16:20:15 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Marina Glancy
4ca17b63a1 MDL-54666 modedit: use default values when modgrade element is frozen 2016-05-21 12:37:46 +08:00
Eloy Lafuente (stronk7)
973641fe13 MDL-54666 tests: Verify that any activity keeps the settings
This was affecting both to rateable (forum...) and not rateable
(assignment...) activities. So tests have been completed to verify
that now saving is performed and the correct scale values stored.
2016-05-20 23:48:25 +02:00
Dan Poltawski
5d84a61419 Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle 2016-05-19 13:00:34 +01:00
David Mudrák
929727e3ef MDL-54633 tinymce: Sync editors' iframe to textarea on form submit
The previous commit "Automatically sync editor with its textarea" was
found a not good solution as the onchange event is triggered way less
often than needed for our needs. So this reverts commit 34321d49.

Instead, we add a hack to the formslib so that when there are some
TinyMCE editors used at the page, we explicitly save them before
triggering the form validation. This simply calls save() on all editors
on the page - see the API reference:
http://archive.tinymce.com/wiki.php/API3:method.tinymce.triggerSave

Having TinyMCE hardcoded like this on this core level does not make me
happy. But it seems to be most effective solution for now (and
definitely more efficient than the previous solution). Plus there is a
precedence - we already use window.tinyMCE in formchangechecker.js YUI
module, for example.
2016-05-19 13:44:41 +02:00
Dan Poltawski
c56d14be37 Merge branch 'MDL-54627_master' of git://github.com/dmonllao/moodle 2016-05-19 10:59:06 +01:00
Dan Poltawski
b887c81907 Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle 2016-05-19 09:00:12 +01:00
David Monllao
ca7b16fa70 Merge branch 'MDL-54638' of git://github.com/stronk7/moodle
Conflicts:
	mod/lti/version.php
2016-05-19 13:47:22 +08:00
David Monllao
505ce88467 MDL-54627 search: Ensure that all format_string strings are text.
All user input that is usually displayed through format_strings with
filters like mulitlang applied should be converted to text as well.
2016-05-19 13:16:01 +08:00
Andrew Nicols
367c85d78c Merge branch 'MDL-53988-master' of https://github.com/xow/moodle 2016-05-19 11:43:27 +08:00
David Monllao
89fc74508b Merge branch 'MDL-54613-m' of https://github.com/micaherne/moodle 2016-05-19 11:20:58 +08:00
John Okely
811d9ff941 MDL-53988 mod_lti: Fix followup up issues
Fix function naming
Fix param types
Fix error popping up twice with incorrect URL
Add confirm dialog when you delete a tool
Show orphaned tool proxies in list
Fix interface jumping up and down
Change to use notification stack
Change capabilities in db/services.php
Add loading animation after registering tool
Show loading animation until tools are rendered
2016-05-19 11:18:21 +08:00
Eloy Lafuente (stronk7)
1abca11e0a MDL-54638 versions: bump all versions and requires near release
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
David Mudrák
34321d491b MDL-54633 tinymce: Automatically sync editor with its textarea
Probably as a result of recent changes in the way how forms client side
validators are trigerred (MDL-52826), the field validator has been
triggered before the underlying textarea's values property is updated by
TinyMCE. This led to marking such a field as "required" even if the
value is provided.

Inspired by http://stackoverflow.com/questions/2122085/
this patch adds a new onchange callback that automatically keeps the
underlying textarea synced with the editor iframe. Relevant API docs:
http://archive.tinymce.com/wiki.php/Configuration3x:onchange_callback

I was also trying to call the save() method via the editor's onSubmit
method but that one seems to be also triggered only after the validator.
2016-05-19 00:50:08 +02:00
Eloy Lafuente (stronk7)
a73d64585a Merge branch 'MDL-54553-master' of git://github.com/danpoltawski/moodle 2016-05-18 18:23:41 +02:00
Eloy Lafuente (stronk7)
c0fe085c24 Merge branch 'MDL-53896-master' of git://github.com/cameron1729/moodle 2016-05-18 13:36:45 +02:00
Dan Poltawski
5c602bf5bb MDL-54553 behat: check statuscode of http request 2016-05-18 11:15:58 +01:00
Dan Poltawski
07eb3a0db7 Merge branch 'wip-mdl-53956' of https://github.com/rajeshtaneja/moodle 2016-05-18 10:45:22 +01:00
David Monllao
9d00c6e9e5 Merge branch 'wip-MDL-45390-master' of git://github.com/abgreeve/moodle 2016-05-18 14:10:31 +08:00
David Monllao
50c338b84b Merge branch 'MDL-54544-master' of git://github.com/damyon/moodle 2016-05-18 13:55:05 +08:00
Damyon Wiese
4f54bdc733 MDL-54544 files: Better error handling in $fs->create_converted_document() 2016-05-18 13:44:13 +08:00
David Monllao
61e1d3d96c Merge branch 'MDL-53883_master' of git://github.com/markn86/moodle 2016-05-18 13:00:29 +08:00