cdacdf7f41
Merge branch 'wip-MDL-55930-31' of https://github.com/Beedell/moodle into MOODLE_31_STABLE
2016-11-02 12:50:04 +08:00
a35dea73e7
Merge branch 'MDL-43796_31_blindmarking' of https://github.com/SWiT/moodle into MOODLE_31_STABLE
2016-11-02 12:29:04 +08:00
b46e384dd3
Merge branch 'MDL-56673-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE
2016-11-02 12:15:53 +08:00
7fa03088be
Merge branch 'MDL-54112-31' of https://github.com/hcpss-banderson/moodle into MOODLE_31_STABLE
2016-11-01 21:31:04 +00:00
e343b2438b
Merge branch 'mdl31_MDL-47500' of git://github.com/danmarsden/moodle into MOODLE_31_STABLE
2016-11-01 21:29:32 +00:00
d62bde657b
Merge branch 'mdl55456-moodle31' of https://github.com/tlock/moodle into MOODLE_31_STABLE
2016-11-01 21:27:50 +00:00
a8c64d6267
weekly release 3.1.2+
2016-11-01 19:48:11 +01:00
26d38b03cd
MDL-55930 Quiz: "Next page button" showing in sequential mode
2016-11-01 11:25:05 +00:00
82974222af
MDL-56673 templatelibrary: return false when core template doesn't exist
2016-11-01 10:19:17 +00:00
421a78a564
Merge branch 'wip-MDL-56615-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE
2016-10-31 20:26:12 +01:00
a20a0a48f0
Merge branch 'MDL-56542-31-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE
2016-10-31 15:14:02 +00:00
e5dc9a44ba
Merge branch 'MDL-56282-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE
2016-10-31 12:27:20 +08:00
51256b8ab5
MDL-56282 enrol_meta: Fix error when editing existing instances
...
We had a few problems here.
1/ The auto complete element was displaying the picker though the
field was frozen.
2/ Checking for existing enrolment including the courses chosen was
not checking if the courses found were in the instance we edit.
3/ Upon creation we support multiple courses but when editing we
should not expect more than the course in the instance being edited.
2016-10-31 12:16:15 +08:00
04872de103
MDL-56615 portfolio_googledocs: add basic unittests
2016-10-31 10:58:26 +08:00
f0fab142a7
MDL-56615 portfolio: fix php 7.0.9 warning
2016-10-31 10:58:25 +08:00
9b16dd4632
MDL-47500 scorm: improved height calculation
2016-10-28 13:42:10 +13:00
e50b26fa7c
MDL-54112 mod_assign: Add scale null grade filter
2016-10-27 10:33:47 -04:00
f4f89d4728
weekly release 3.1.2+
2016-10-27 12:19:37 +01:00
b659e9d05c
Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE
2016-10-27 12:19:36 +01:00
17f1295e23
Revert "Merge branch 'MDL-56129-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE"
...
This reverts commit 1483afc59b9edd48f894
2016-10-27 10:00:05 +01:00
bf639be2ef
Merge branch 'MDL-56448-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE
2016-10-26 17:06:21 +02:00
f093a38342
MDL-56448 mustache: fix json errors in example context
2016-10-26 12:37:40 +01:00
c341f6ddaf
Merge branch 'MDL-56354-31' of https://github.com/mr-russ/moodle into MOODLE_31_STABLE
2016-10-26 02:15:43 +02:00
9eb3fb41c3
MDL-56354 unittests: Put debug messages in the failure notice.
2016-10-26 09:24:37 +11:00
73a3ebcecf
Merge branch 'MDL-56288_31-messages-time-extra-space' of https://github.com/lucaboesch/moodle into MOODLE_31_STABLE
2016-10-25 20:57:36 +01:00
2c08b71880
Merge branch 'MDL-56136_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE
2016-10-25 20:44:37 +01:00
aba9531852
Merge branch 'MDL-56250-31-formvalidation' of https://github.com/roperto/moodle into MOODLE_31_STABLE
2016-10-25 20:30:16 +02:00
9f809b1818
MDL-56542 lang: Merge English strings from the en_fix language pack
2016-10-25 20:26:36 +02:00
4b108d2ccb
Merge branch 'MOODLE_31_STABLE' of https://github.com/yuriy-os/moodle into MOODLE_31_STABLE
2016-10-25 20:00:16 +02:00
bd519a6e80
Merge branch 'MDL-55143-31' of https://github.com/mr-russ/moodle into MOODLE_31_STABLE
2016-10-25 18:38:41 +01:00
cb3e164f68
Automatically generated installer lang files
2016-10-26 00:04:40 +08:00
ff370663c6
Merge branch 'wip-mdl-56347-m31' of https://github.com/rajeshtaneja/moodle into MOODLE_31_STABLE
2016-10-25 15:20:18 +08:00
540cdcaca1
Merge branch 'MDL-55902-31' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE
2016-10-25 06:38:13 +01:00
a14e796549
MDL-56347 caching: Better class variables for notices.
2016-10-25 09:52:04 +08:00
ca08b73300
MDL-56347 phpunit: Set class for alternative cache store
...
If alternative cache store is sued, then set the class
and warn user about this.
2016-10-25 09:51:27 +08:00
ad070273a5
MDL-48350 theme_bootstrapbase: restyle action icons in docked blocks
2016-10-24 21:38:07 +02:00
05292ca201
Merge branch 'wip-MDL-56439-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE
2016-10-24 14:33:55 +01:00
6c91de2362
Merge branch 'mdl56466-moodle31' of https://github.com/tlock/moodle into MOODLE_31_STABLE
2016-10-24 15:24:08 +08:00
1483afc59b
Merge branch 'MDL-56129-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE
2016-10-24 12:01:00 +08:00
9c74040c3b
MDL-56129 core: Set a timeout on the session cookie
...
This is primarily because iOS has changed something under the hood which
means that only session cookies which have an expiry are passed around the
OS.
In order to make media playable outside of the browser (e.g. a video), we
must set a session cookie timeout.
Since the session timeout is configurable, this patch sets the cookie
timeout to the session timeout plus a period of one week.
This ensures that videos continue to work, and that the expired session
message is shown on the login page, but without requiring excessively long
session times.
2016-10-24 11:47:51 +08:00
7e3e81c330
MDL-55902 my: Add additional information to dashboard reset events
...
* Add $private and $pagetype information to the 'other' parameter of
the dashboard(s) reset events.
2016-10-24 11:04:12 +08:00
9edd48f894
MDL-56341 mustache: JS engines handles strings wrapped in quote
...
Prior to the patch the strings wrapped as the following one
where not found and replaced when rendering the template via Javascript
{{#quote}}{{#str}}string,component{{/str}}{{/quote}}
2016-10-24 10:10:07 +08:00
24ec5de709
MDL-53098 lib: Mark form as submitted in confirmation dialog.
...
If the quiz attempt use popup window with Javascript security it will
show to the user misleading message that he is going to lose entered
data.
To avoid this we should mark form as submitted to turn off browser`s
pop-up window when user confirms finishing attempt.
Also we need to check if core_formchangechecker is present on a page.
2016-10-24 00:44:00 +03:00
22e7edad43
Merge branch 'MOODLE_31_STABLE' into install_31_STABLE
2016-10-22 00:04:59 +08:00
9bac677826
MDL-56250 forms library: Changed form to validate once per object.
...
If two instances of moodleforms are validated in the same run, most
likely a phpunit test run, it would store the first validation result.
Now it stores the validation result per instance, not for all instances.
2016-10-21 10:41:23 +11:00
cfae450c61
Automatically generated installer lang files
2016-10-21 00:04:54 +08:00
2afadc066b
weekly release 3.1.2+
2016-10-20 17:52:48 +02:00
870fcca1e0
Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE
2016-10-20 17:52:45 +02:00
fbe2c4f979
Merge branch 'MDL-56328_31-fix-rtl' of git://github.com/dmonllao/moodle into MOODLE_31_STABLE
2016-10-19 13:30:04 +08:00
70e4268d66
MDL-56328 theme: Remove RTL styles
...
They should only be applied while editing mode is on
2016-10-19 12:34:25 +08:00
David Monllao