23591 Commits

Author SHA1 Message Date
Andrew Nicols
7bd28dffc2 MDL-59165 output: Add standard footer html callback 2017-07-03 13:35:28 +08:00
Simey Lameze
1fad6ff3f5 MDL-59008 mod_resource: add option to serve external files embed 2017-07-03 10:19:33 +08:00
Tim Hunt
39c40adad1 MDL-59431 requirejs: better reporting if a JS file cannot be loaded 2017-06-30 17:17:26 +01:00
sam marshall
557554f99f MDL-58957 Global search: Add time fields to block_instances 2017-06-29 15:14:47 +01:00
Marina Glancy
592f3ae22c MDL-59411 course: display access restriction in access error message 2017-06-29 13:48:27 +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
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
Andrew Nicols
0e9911e143 MDL-59148 theme: Use fallback if compiled version unavailable 2017-06-28 18:24:50 +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
aa736731ba Merge branch 'MDL-57734-master' of https://github.com/xow/moodle 2017-06-28 18:24:46 +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
Jun Pataleta
7c482415a9 MDL-59294 theme_bootstrapbase: Fix display of ID provider buttons 2017-06-28 13:27:41 +08: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
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
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
Mark Nelson
e0ee37e426 MDL-56046 dataformat: changes to docs, upgrade.txt and error message 2017-06-27 11:35:05 +08:00
Mark Nelson
faf45f9c47 MDL-56046 core: enable multiple sheets for flexible table 2017-06-26 13:59:30 +08:00
Mark Nelson
ce3beb267c MDL-56046 core: convert download_as_dataformat to use new API 2017-06-26 13:29:32 +08:00
Mark Nelson
b62b5879af MDL-56046 core_dataformat: added functions to support multiple sheets
Also removed write_header() and write_footer(). The reason for this
is because in core we want to know if the format being used supports
multiple sheets. To do this, and ensure we do not break third-party
dataformat plugins, we are using method_exist(). If write_header()
and write_footer() remain in the base class then this will always
be true.
2017-06-26 13:29:32 +08:00
Mark Nelson
6d721cab9e MDL-59362 core: ensure we use 'new' when throwing exceptions 2017-06-26 13:08:05 +08:00
Marina Glancy
eca7e52901 MDL-59336 themes: change FA mapping for i/new 2017-06-26 11:36:35 +08:00
Yair Spielmann
409ad1d60a MDL-57734 admin: New setting for when to use the noindex meta tag 2017-06-26 10:38:25 +08:00
Andrew Nicols
bd90b61ad2 MDL-59312 js: Improve display of exception stacktrace 2017-06-23 10:44:15 +08:00
John Okely
6bdcaa1320 MDL-59312 notification: Normalise backtrace/stacktrace 2017-06-23 10:43:56 +08:00
Andrew Nicols
fa038116bc MDL-59312 js: Add exception on AJAX error 2017-06-23 10:42:22 +08:00
Daniel Thee Roperto
b40722fbf7 MDL-57809 weblib: Progress bar and output buffer - added debugging
This fix makes Moodle show a debbuging message if using progressbar without defining NO_OUTPUT_BUFFERING.
2017-06-23 09:43:07 +10:00
Juan Leyva
bef201c7e0 MDL-58712 core_user: Do not count the root directory 2017-06-22 16:09:58 +02:00
Eloy Lafuente (stronk7)
b78887cc4b Merge branch 'MDL-59170-master' of https://github.com/xow/moodle 2017-06-22 16:09:53 +02:00
John Okely
76b5fe8665 MDL-59170 fontawesome: Fix course total controls icon on grader report 2017-06-22 09:13:20 +08:00
Eloy Lafuente (stronk7)
42a78077c6 Merge branch 'MDL-59269-master-languninstall' of git://github.com/mudrd8mz/moodle 2017-06-20 17:56:44 +02:00
Eloy Lafuente (stronk7)
41781cf31d Merge branch 'MDL-59214-master' of git://github.com/jleyva/moodle 2017-06-20 17:46:55 +02:00
Juan Leyva
bef5777fc4 MDL-59214 webservice: Return calendar type in get_site_info 2017-06-20 11:44:04 +01:00
Dan Poltawski
4431f1e0e3 Merge branch 'MDL-59005-master' of git://github.com/lameze/moodle 2017-06-20 09:51:50 +01:00
Jun Pataleta
88720416ba Merge branch 'wip-MDL-58911-master' of git://github.com/marinaglancy/moodle 2017-06-20 16:33:15 +08:00
Marina Glancy
63e9e38202 MDL-58911 calendar: use the same callbacks in unittests and prod
Remove unittest-specific callbacks for checking access and displaying
the calendar events on the dashboard.

This will allow plugin developers unittest the full behavior
of how their plugins add events to the dashboard.

Reset all static caches between unittests.
2017-06-20 16:13:35 +08:00
Dan Poltawski
0ba61c3bf8 Merge branch 'MDL-59160-master' of git://github.com/jleyva/moodle 2017-06-20 09:10:25 +01:00
Jake Dallimore
78013a17c7 Merge branch 'MDL-58808-master' of git://github.com/damyon/moodle 2017-06-20 08:22:16 +08:00
Juan Leyva
0f398b500d MDL-59160 core_group: Return if the user can access all groups in WS
The core_group_get_activity_allowed_groups WS should be returning not
only the groups but also if the user is allowed to access all the
activity groups.
2017-06-19 15:53:38 +01:00
Dan Poltawski
6252f44d84 Merge branch 'MDL-58712-master' of git://github.com/jleyva/moodle 2017-06-19 14:20:06 +01:00
Dan Poltawski
6659c5ffba Merge branch 'MDL-59173-master' of git://github.com/tobiasreischmann/moodle 2017-06-19 12:27:43 +01:00
Dan Poltawski
4469ae96b6 Merge branch 'wip-MDL-51917-master' of git://github.com/marinaglancy/moodle 2017-06-19 12:21:45 +01:00
Dan Poltawski
275b5fa8ce Merge branch 'MDL-46418-master-hiddenrepos' of git://github.com/mudrd8mz/moodle 2017-06-19 10:33:37 +01:00