sam marshall
557554f99f
MDL-58957 Global search: Add time fields to block_instances
2017-06-29 15:14:47 +01:00
Jake Dallimore
5a651b43fb
weekly release 3.4dev
2017-06-29 16:23:42 +08:00
Jake Dallimore
4c68642926
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-06-29 16:23:41 +08:00
Mark Nelson
e727e91c38
MDL-59413 core_user: removed broken group information table
...
Part of MDL-59290.
2017-06-29 14:19:08 +08:00
Marina Glancy
592f3ae22c
MDL-59411 course: display access restriction in access error message
2017-06-29 13:48:27 +08:00
Jun Pataleta
56249d8710
MDL-59294 block_login: Make display of ID provider buttons consistent
2017-06-29 09:29:26 +08:00
Mark Nielsen
b095b36c02
MDL-58948 behat: capture DriverException
...
Other drivers may throw a DriverException when the popup
or iframe disappears.
2017-06-28 14:34:08 -07:00
Mark Nielsen
f46a2dd913
MDL-58948 behat: Fix spin method when callback throws exception
...
Was preventing the sleep statements from running. This caused
steps to fail too early when it was just waiting for something
to change in the browser.
2017-06-28 14:33:51 -07:00
Mark Nielsen
7cde2bb313
MDL-58948 behat: Chrome driver has unique xpaths
...
Chrome driver has unique xpaths for clicking on all the
show more links. So clicking on the first xpath X times
does not work.
2017-06-28 12:50:44 -07:00
Mark Nielsen
95ee1f6392
MDL-58948 course: correct event type listener
...
This event handler is listening for click events on a select
element, should be a change event.
2017-06-28 12:50:44 -07:00
Mark Nielsen
b5be387556
MDL-58948 behat: conditionally execute MoodleSelenium2Driver
...
There is some specific code being executed that only exists
in the MoodleSelenium2Driver. Conditionally execute this
code to make it compatible with other Mink drivers.
2017-06-28 12:50:44 -07:00
Mark Nielsen
f5459099ae
MDL-58948 behat: catch ElementNotFoundException
...
Another valid exception that can be thrown from a Mink driver
is the ElementNotFoundException when an element has gone missing.
2017-06-28 12:50:11 -07:00
Mark Nielsen
3cf0d01a61
MDL-58948 behat: Fix timeouts without a condition
...
The second parameter of the wait method should be a string
so passing boolean false was wrong. The default on for the
script is 'false' which works cross Mink drivers.
2017-06-28 12:50:10 -07:00
Mark Nielsen
5536bf4f22
MDL-58948 behat: return the result of the pending JS method
...
This increases compatibility with other Mink drivers,
in particular, the Chrome Mink Driver.
2017-06-28 11:20:49 -07:00
David Monllao
f9e4731c86
MDL-59148 css: Remove legacy param from php-doc
...
Version bump as well.
2017-06-28 18:24:50 +02:00
David Monllao
185455dcc3
Merge branch 'MDL-59148-master-7' of git://github.com/andrewnicols/moodle
2017-06-28 18:24:50 +02:00
Andrew Nicols
0e9911e143
MDL-59148 theme: Use fallback if compiled version unavailable
2017-06-28 18:24:50 +02:00
David Monllao
0248d16801
MDL-59285 version: Bump
2017-06-28 18:24:49 +02:00
Simey Lameze
3b9b47312c
MDL-59148 core: save css file totemp directory
...
Save a copy of the css file on the temp directory
to be used as a fallback when waiting for a theme to be compiled
and is not versioned in any way.
2017-06-28 18:24:49 +02:00
David Monllao
7f382c05b0
Merge branch 'MDL-59285-master' of git://github.com/lameze/moodle
2017-06-28 18:24:48 +02:00
Jake Dallimore
1bff0a1d97
Merge branch 'MDL-56046_master-fix2' of git://github.com/markn86/moodle
2017-06-28 18:24:48 +02:00
Mark Nelson
1370d793fc
MDL-56046 mod_quiz: do not close the sheet twice
2017-06-28 18:24:48 +02:00
Eloy Lafuente (stronk7)
1555f25b24
Merge branch 'MDL-57809-34-progressbar' of https://github.com/roperto/moodle
2017-06-28 18:24:47 +02:00
David Monllao
364ccb771a
MDL-57734 version: Bump
2017-06-28 18:24:47 +02:00
David Monllao
aa736731ba
Merge branch 'MDL-57734-master' of https://github.com/xow/moodle
2017-06-28 18:24:46 +02:00
Eloy Lafuente (stronk7)
d4bd3dbb69
Merge branch 'wip-MDL-59136-master' of git://github.com/marinaglancy/moodle
2017-06-28 18:24:46 +02:00
David Monllao
6ac5f70c01
Merge branch 'MDL-59053-downcase-username_LATEST' of git://github.com/spaceraccoon/moodle
2017-06-28 18:24:45 +02:00
David Monllao
34b3c1da70
Merge branch 'MDL-32151-master' of git://github.com/junpataleta/moodle
2017-06-28 18:24:45 +02:00
Eloy Lafuente (stronk7)
0f9bdd637a
Merge branch 'MDL-59362_master' of git://github.com/markn86/moodle
2017-06-28 18:24:44 +02:00
Simey Lameze
83f50acd53
MDL-59285 tool_mobile: add user profile page callback
2017-06-28 16:39:07 +08:00
Jun Pataleta
7c482415a9
MDL-59294 theme_bootstrapbase: Fix display of ID provider buttons
2017-06-28 13:27:41 +08:00
Marina Glancy
6b7a32f33c
MDL-56579 media_videojs: use new config element for selecting file types
2017-06-28 12:12:48 +08:00
Adam Olley
556ceb2071
MDL-58651 logstore_database: Add ability to not send database options
...
In the core dml:
PostgreSQL connections now use advanced options to reduce connection overhead.
These options are not compatible with some connection poolers. The
dbhandlesoptions parameter has been added to allow the database to configure
the required defaults.
This item adds a setting to the logstore_database plugin to let you set the
same flag for your destination database - without it you won't be able to ship
logs to a postgresql database with a pgbouncer frontend.
2017-06-28 13:21:01 +09:30
Marina Glancy
6023e58bd1
MDL-59363 mod_workshop: user object must have alternative name fields
2017-06-28 11:36:11 +08:00
Eloy Lafuente (stronk7)
56fc5143ad
Merge branch 'MDL-59073_workshop_prevent_submission_without_content_or_file' of https://github.com/dannyjung90/moodle
2017-06-27 16:59:44 +02:00
David Monllao
1243fce158
Merge branch 'wip-MDL-59308-master' of git://github.com/marinaglancy/moodle
2017-06-27 16:41:26 +02:00
David Monllao
93c97fdc3a
Merge branch 'MDL-59158-master' of git://github.com/junpataleta/moodle
2017-06-27 16:39:41 +02:00
David Monllao
c4b25152cc
Merge branch 'MDL-57927-master' of git://github.com/lameze/moodle
2017-06-27 15:55:17 +02:00
Eloy Lafuente (stronk7)
c32f0cd62a
Merge branch 'MDL-58844-master' of git://github.com/andrewnicols/moodle
2017-06-27 11:41:08 +02:00
Eloy Lafuente (stronk7)
ce836829e6
Merge branch 'MDL-59296-master' of git://github.com/crazyserver/moodle
2017-06-27 11:37:52 +02:00
Damyon Wiese
859e2033cb
MDL-58544 oauth2: Allow trusted issuers
...
Add a setting to each issuer that skips the email confirmation when creating and linking accounts.
2017-06-27 16:50:27 +08:00
Mark Nelson
a24c59b9b4
MDL-59396 core_user: removed 'My courses' select from participants page
...
Part of MDL-59290.
2017-06-27 16:44:41 +08:00
Eloy Lafuente (stronk7)
e2aa2f25f1
Merge branch 'MDL-59123-master-3' of git://github.com/ryanwyllie/moodle
2017-06-27 09:24:24 +02:00
Jake Dallimore
8d7ae061e3
Merge branch 'MDL-59312-master' of https://github.com/xow/moodle
2017-06-27 15:07:44 +08:00
Ryan Wyllie
5dd40ec4b4
MDL-59123 admin: add cli script to compile theme CSS
...
Added a script to selectively compile theme CSS. In order to allow
compiling on per theme basis without purging all theme CSS in the
local cache I have made some changes to how CSS is compiled and
how it is accessed via local cache.
2017-06-27 06:48:45 +00:00
Jake Dallimore
cb37f200a8
Merge branch 'MDL-59275-master' of git://github.com/lameze/moodle
2017-06-27 13:57:11 +08:00
Damyon Wiese
3d185faceb
MDL-59380 fragments: Include js from templates
...
Mustache templates containing {{#js}} blocks are not returned via the
fragments API. This is because the requirements manager is assigned when the renderer is created
and not updated by the call to start collecting page requirements.
2017-06-27 13:20:32 +08:00
Jake Dallimore
196558a5d8
Merge branch 'MDL-56046_master-fix' of git://github.com/markn86/moodle
2017-06-27 13:16:42 +08:00
Mark Nelson
4c7593ff5b
MDL-59364 core_user: removed 'User details' option in participants page
...
Part of MDL-59290.
2017-06-27 13:13:07 +08:00
Simey Lameze
92c8cb9d98
MDL-59275 auth: prevent user login failed coding error
2017-06-27 13:04:02 +08:00
