Eloy Lafuente (stronk7)
a9f816744b
Merge branch 'MDL-59984-master' of git://github.com/junpataleta/moodle
2017-10-17 00:37:47 +02:00
Eloy Lafuente (stronk7)
d355cb54ab
Merge branch 'MDL-60365-master' of git://github.com/jleyva/moodle
2017-10-17 00:23:38 +02:00
Eloy Lafuente (stronk7)
b86f988bcb
Merge branch 'MDL-60171' of https://github.com/cbluesprl/moodle
2017-10-17 00:13:25 +02:00
Eloy Lafuente (stronk7)
39dce3073f
Merge branch 'MDL-60320' of git://github.com/aolley/moodle
2017-10-17 00:05:54 +02:00
David Monllao
7152d2ff7a
Merge branch 'MDL-60176-master' of git://github.com/andrewnicols/moodle
2017-10-16 20:02:03 +02:00
David Monllao
75820fb3ec
Merge branch 'wip-MDL-60284-master' of git://github.com/abgreeve/moodle
2017-10-16 19:41:36 +02:00
David Monllao
23e5b74954
Merge branch 'MDL-57455' of https://github.com/stronk7/moodle
2017-10-16 19:33:37 +02:00
Eloy Lafuente (stronk7)
76feb5ac9b
MDL-57455 mod_data: table aliases cannot use AS for crossdb
2017-10-16 19:16:17 +02:00
David Monllao
7f1f78d23e
Merge branch 'MDL-60373-master' of git://github.com/andrewnicols/moodle
2017-10-16 18:28:47 +02:00
David Monllao
5d5ebedf56
Merge branch 'MDL-60374-master' of git://github.com/andrewnicols/moodle
2017-10-16 18:26:55 +02:00
David Monllao
2350745d82
Merge branch 'wip-MDL-60280-master' of git://github.com/marinaglancy/moodle
2017-10-16 13:46:19 +02:00
David Monllao
dde2ba7634
Merge branch 'wip-MDL-60237-master' of git://github.com/marinaglancy/moodle
2017-10-16 12:37:55 +02:00
Andrew Nicols
ebb4244bf4
Merge branch 'wip-MDL-60337-master' of git://github.com/marinaglancy/moodle
2017-10-16 15:40:44 +08:00
Jake Dallimore
1841d169c8
Merge branch 'wip-MDL-60033-master' of git://github.com/marinaglancy/moodle
2017-10-16 15:36:29 +08:00
Jun Pataleta
bcecb89976
Merge branch 'MDL-58547-master-bennulib' of git://github.com/mudrd8mz/moodle
2017-10-16 15:34:06 +08:00
Jake Dallimore
dbb54d10ab
Merge branch 'wip-MDL-60091-master' of git://github.com/marinaglancy/moodle
2017-10-16 15:32:21 +08:00
Jun Pataleta
dc9b510180
Merge branch 'MDL-59166-master' of git://github.com/andrewnicols/moodle
2017-10-16 15:26:36 +08:00
Andrew Nicols
9693821d9d
MDL-59166 admin: Add moodle mobile configuration warning
2017-10-16 15:00:28 +08:00
Marina Glancy
2c1080ef77
MDL-60091 webservice: enhancements to WS test client
2017-10-16 14:59:51 +08:00
Jun Pataleta
177c0a36ec
Merge branch 'MDL-60124-master' of https://github.com/snake/moodle
2017-10-16 14:33:53 +08:00
Andrew Nicols
6af34eb5bf
Merge branch 'wip-MDL-60194-master' of git://github.com/abgreeve/moodle
2017-10-16 14:10:18 +08:00
Jun Pataleta
274e19dbda
Merge branch 'MDL-60150' of git://github.com/stronk7/moodle
2017-10-16 14:04:55 +08:00
Andrew Nicols
4b526af5fe
Merge branch 'wip-MDL-60286-master' of git://github.com/abgreeve/moodle
2017-10-16 13:49:50 +08:00
Jun Pataleta
55b5133595
Merge branch 'MDL-60307-master' of git://github.com/lameze/moodle
2017-10-16 13:43:22 +08:00
Simey Lameze
166cd10aa7
MDL-60307 core_calendar: rename subscriptions name and url
2017-10-16 12:58:48 +08:00
Damyon Wiese
6dc633fd93
Merge branch 'MDL-60058-master-4' of git://github.com/ryanwyllie/moodle
2017-10-16 12:28:59 +08:00
Jun Pataleta
5be8c8daa6
Merge branch 'MDL-45730_master' of git://github.com/markn86/moodle
2017-10-16 12:10:51 +08:00
Jake Dallimore
6b76e041f4
Merge branch 'MDL-57455_master' of git://github.com/markn86/moodle
2017-10-16 10:34:01 +08:00
Jun Pataleta
a3bfb41cdd
MDL-59984 enrol: Apply more filters to multiple filters scenario
2017-10-16 09:47:39 +08:00
Jun Pataleta
d1b55a33e6
MDL-59984 enrol: Fix parameter naming for enrol conditions sql
...
* The character "." can't be used for sql named parameters.
2017-10-16 09:31:25 +08:00
Jake Dallimore
ee9d4a77ea
MDL-60124 assign: comment annotation now auto reduces in size on delete
2017-10-16 08:49:36 +08:00
Andrew Nicols
dd178011b4
Merge branch 'MDL-59988_master' of git://github.com/dmonllao/moodle
2017-10-16 08:19:06 +08:00
David Monllao
2dca133916
MDL-59988 analytics: Process pending training and prediction files
2017-10-13 12:29:21 +02:00
David Monllao
325b3bdd8e
MDL-59988 analytics: Files marked as used only if valid
...
- Basic unit test for minimum machine learning backends requirements
- Warning return messages now include not enough data
- Clear models when the predictions processor is changed
- Refined the name of a couple of constants / methods
2017-10-13 12:24:17 +02:00
Ryan Wyllie
7ec6d873e1
MDL-60058 assign: stop teacher from seeing due date event on dashboard
...
Thanks to Damyon Wiese for the patch.
2017-10-13 06:38:03 +00:00
Andrew Nicols
028fa14436
MDL-60058 assign: Updating gradingduedate on drag/drop
2017-10-13 06:38:02 +00:00
Ryan Wyllie
a4f949442c
MDL-60058 calendar: fix event context issue in month_detailed
2017-10-13 06:38:02 +00:00
Ryan Wyllie
8c4b939cfe
MDL-60058 choice: implement timestart range callback for calendar UI
2017-10-13 06:38:02 +00:00
Jake Dallimore
9a316f3367
weekly release 3.4dev
2017-10-13 14:33:08 +08:00
Jake Dallimore
20b5ea16b7
NOBUG: Fixed file access permissions
2017-10-13 14:33:08 +08:00
Jake Dallimore
6e74f41b41
NOBUG: Fixed SVG browser compatibility
2017-10-13 14:33:08 +08:00
Jake Dallimore
5bcd7317d1
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-10-13 14:33:07 +08:00
Ryan Wyllie
c56dd950eb
MDL-60058 calendar: add visual indicator to UI for valid drop zones
2017-10-13 06:18:44 +00:00
Ryan Wyllie
f4c2156189
MDL-60058 assign: allow update of assign calendar action events
2017-10-13 06:18:43 +00:00
Jake Dallimore
1799dd9e0c
Merge branch 'MDL-60357-master-fix' of https://github.com/andrewnicols/moodle
2017-10-13 11:40:05 +08:00
Mark Nelson
0f09368cbb
MDL-57455 mod_data: extended Behat test to cover searching names
...
Merged two Behat files that were doing similar things.
2017-10-13 11:01:42 +08:00
Jake Dallimore
2fe80946bc
Merge branch 'MDL-60029-master-fix' of git://github.com/junpataleta/moodle
2017-10-13 10:49:32 +08:00
Jun Pataleta
5a3f03b2a8
MDL-60029 profile: Replace table alias with non-reserve word
...
* The table alias 'uid' is a reserved word in oracle. Replaced it with
something a little more safe.
2017-10-13 10:38:00 +08:00
Andrew Nicols
0049244893
MDL-60357 search: Ensure that the document is valid
...
We were previously testing tha the parent is valid, which it was, and
then fetching the current record, before fetching data from it.
However, the way in which the recordset walk works, the valid function
checks whether the _record_ itself is valid, whilst the current allows
for a callback to be applied.
In this instance, the data-entry was failing because the count of
indexfields was < 2. The recordset data itself was valid, but the view
was not, and as a result, the current() function returned false.
This false was not previously handled.
I've changed the logic so that we handle this case, and have removed a
double-negative in the process.
2017-10-13 09:41:59 +08:00
Damyon Wiese
14de134454
Merge branch 'MDL-60002-master' of https://github.com/snake/moodle
2017-10-13 09:20:18 +08:00
