Eloy Lafuente (stronk7)
8a2936f5fd
Merge branch 'MDL-63677-master' of git://github.com/sarjona/moodle
2019-01-14 23:03:51 +01:00
Sara Arjona
0f1377cc31
Merge branch 'MDL-60082-master' of git://github.com/damyon/moodle
2019-01-14 12:03:06 +01:00
Sara Arjona
c654e35007
MDL-63677 core_user: Avoid redirection during signup
...
Purge cache just for the current user to avoid redirection when 2
simultaneous users try to sign up at the same time and some policy
has to be agreed.
The 'createduser' invalidation event has been removed also because
is not used any more.
Thanks John Azinheira for spotting it!
2019-01-11 10:20:59 +01:00
Sara Arjona
4c5b60a0f9
weekly release 3.7dev
2019-01-10 17:51:25 +01:00
Sara Arjona
51df6c5a47
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2019-01-10 17:51:23 +01:00
Jake Dallimore
2336493501
Merge branch 'MDL-64004-master' of git://github.com/damyon/moodle
2019-01-10 10:59:56 +08:00
AMOS bot
9f463258d9
Automatically generated installer lang files
2019-01-10 00:08:34 +00:00
Eloy Lafuente (stronk7)
dbe8fe303b
Merge branch 'MDL-64479' of https://github.com/timhunt/moodle
2019-01-09 23:33:36 +01:00
Sara Arjona
c2fc318d4e
Merge branch 'MDL-64043-master' of git://github.com/ryanwyllie/moodle
2019-01-09 17:55:34 +01:00
Eloy Lafuente (stronk7)
a887977cba
Merge branch 'MDL-63686-master' of git://github.com/andrewnicols/moodle
2019-01-09 12:36:09 +01:00
Andrew Nicols
889b585b29
MDL-63686 core: recordset => records when fetching contexts
2019-01-09 19:08:08 +08:00
Tim Hunt
d434dd7ae7
MDL-64479 dd-qtypes: fix questions with non-consecutive groups
2019-01-09 10:18:19 +00:00
Jake Dallimore
111dfd2db5
Merge branch 'MDL-64375-master' of git://github.com/damyon/moodle
2019-01-09 15:33:09 +08:00
Andrew Nicols
8cd02f0c51
Merge branch 'MDL-62550-master-2' of https://github.com/snake/moodle
2019-01-09 15:09:00 +08:00
Jake Dallimore
f68426d1fb
Merge branch 'MDL-64345-master' of https://github.com/s-cenni/MDL-64345
2019-01-09 14:13:38 +08:00
Jake Dallimore
0dd2bca8ef
MDL-62550 core_privacy: remove theme specific js from retention js
...
Now that we've fixed the element ids, we no longer need a selector for
each theme. The same selector will work for all themes, whether they be
bs2 or b24 based.
2019-01-09 11:34:28 +08:00
Jake Dallimore
e6f068722d
MDL-62550 core_theme: remove unused #fgroup_ and #fitem_ rules
...
These ids didn't exists in form elements in Boost until now, so we'll
remove the rules to prevent them having any effect now.
2019-01-09 11:34:28 +08:00
Jake Dallimore
574861588a
MDL-62550 core_form: bring back the form item unique ids to fix js fails
...
This id matches the id seen on the clean theme elements and is needed by
the forms js.
2019-01-09 11:34:26 +08:00
Jake Dallimore
f49e93d406
Merge branch 'MDL-63761-master' of git://github.com/damyon/moodle
2019-01-09 09:05:38 +08:00
Eloy Lafuente (stronk7)
3dd0251dd4
Merge branch 'MDL-64285-master' of git://github.com/junpataleta/moodle
2019-01-09 00:09:15 +01:00
Andrew Nicols
b22cb349ed
Merge branch 'MDL-64409' of git://github.com/stronk7/moodle
2019-01-09 06:58:34 +08:00
Andrew Nicols
2b1f1abde3
Merge branch 'MDL-24951' of git://github.com/stronk7/moodle
2019-01-09 06:41:00 +08:00
Andrew Nicols
a1b1892ed9
Merge branch 'MDL-64426' of git://github.com/stronk7/moodle
2019-01-09 06:37:55 +08:00
Eloy Lafuente (stronk7)
c7f9834e29
MDL-64426 core_message: fix context::instance_by_id() wrong use
2019-01-08 23:01:52 +01:00
Eloy Lafuente (stronk7)
644d0e2d97
MDL-24951 mod_forum: Apply new string to related scenarios
...
Plus amend an scenario name that was clearly incorrect.
2019-01-08 16:51:36 +01:00
Michael Hawkins
6360f87cdc
MDL-64395 groups: Added XSS Risk to the manage groups capability
2019-01-08 16:24:48 +01:00
Michael Hawkins
14f9bad3ce
MDL-64372 userpix: Escape fullname string on userpix index page
2019-01-08 16:24:48 +01:00
Sara Arjona
502650a3e2
MDL-64222 badge: Removed backpackurl from the edit_form
2019-01-08 16:24:48 +01:00
Eloy Lafuente (stronk7)
2c4463bf0f
Merge branch 'MDL-64509-master-enfix' of git://github.com/mudrd8mz/moodle
2019-01-08 16:17:06 +01:00
Eloy Lafuente (stronk7)
5e57176a91
Merge branch 'MDL-64474-master-2' of git://github.com/junpataleta/moodle
2019-01-08 16:10:44 +01:00
Andrew Nicols
bbf4a7f38b
Merge branch 'MDL-58596-master' of git://github.com/vmdef/moodle
2019-01-08 16:14:58 +08:00
Andrew Nicols
50466ac4e4
Merge branch 'MDL-64426-master-2' of https://github.com/snake/moodle
2019-01-08 15:58:40 +08:00
Jake Dallimore
e66e867f6e
MDL-64426 core_message: fix filter support in api::get_conversations()
...
Conversation name and subname should support filters, so the data should
be passed through format_string, and advertised in the external params
as PARAM_TEXT.
2019-01-08 15:50:43 +08:00
Leon Stringer
8f402dbc66
MDL-58596 core_stats: fixed infinite loop cause by DST change
2019-01-08 07:37:42 +00:00
Víctor Déniz Falcón
5007d1cb04
MDL-58596 core_stats: unit test for stats_get_base_weekly
2019-01-08 07:36:48 +00:00
Jake Dallimore
662371fd65
Merge branch 'MDL-63686-master' of git://github.com/andrewnicols/moodle
2019-01-08 14:37:31 +08:00
Andrew Nicols
ccbdced987
MDL-63686 core: Preload parent contexts
2019-01-08 14:11:00 +08:00
Andrew Nicols
f0b09fe329
Merge branch 'MDL-24951-master' of git://github.com/Chocolate-lightning/moodle
2019-01-08 13:46:11 +08:00
Andrew Nicols
66f13f8f7f
Merge branch 'MDL-64497-master' of https://github.com/sammarshallou/moodle
2019-01-08 12:25:34 +08:00
Andrew Nicols
024b5c5b9f
Merge branch 'MDL-63722-master' of git://github.com/rezaies/moodle
2019-01-08 12:04:19 +08:00
Andrew Nicols
8feef7308a
Merge branch 'MDL-64400-master' of git://github.com/aanabit/moodle
2019-01-08 08:27:06 +08:00
Andrew Nicols
792267c3b4
Merge branch 'MDL-63276' of https://github.com/stronk7/moodle
2019-01-08 06:55:37 +08:00
Eloy Lafuente (stronk7)
11825f1439
Merge branch 'MDL-63809-master-5' of git://github.com/rezaies/moodle
2019-01-07 22:12:45 +01:00
David Mudrák
a92458880c
MDL-64509 lang: Use the fixed strings in tests
2019-01-07 20:07:57 +01:00
Helen Foster
65d70aa81b
MDL-64509 lang: Import fixed English strings (en_fix)
...
Significant string change: enablerunnow_desc,tool_task - including
mention of pathtophp requirement
2019-01-07 14:40:34 +01:00
Sara Arjona
cb7b59941f
Merge branch 'MDL-64419-master' of git://github.com/bmbrands/moodle
2019-01-07 14:10:36 +01:00
Andrew Nicols
3311321660
Merge branch 'MDL-57636_master' of https://github.com/dasistwas/moodle
2019-01-07 13:45:04 +08:00
Jake Dallimore
a5d2ad5dfc
Merge branch 'MDL-64348-master' of git://github.com/ryanwyllie/moodle
2019-01-07 12:08:31 +08:00
Ryan Wyllie
c77ba4890a
MDL-64348 javascript: change template loading to a buffer
...
Changed the template loading to buffer the requests for templates
so that they can be sent in batches to the server to save large
volumes of network requests.
2019-01-07 09:03:06 +08:00
Ryan Wyllie
2b92891a88
MDL-64348 javascript: change template loading to also load dependencies
...
Changed the getTemplate function in templates.js to use the
core_output_load_template_with_dependencies function to load the
requested template and all of the dependencies required to render it.
The dependencies are added to the relevant caches so that when the
template is rendered they aren't re-requested from the server.
2019-01-07 09:03:06 +08:00