moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
108454 commits 37 branches 540 tags 1.3 GiB
Commit graph

889 commits

Author SHA1 Message Date
Dan Poltawski
dca4a87101 Merge branch 'MDL-55742-master' of https://github.com/xow/moodle 2016-09-05 10:50:47 +01:00
John Okely
d51757a729 MDL-55457 mod_lti: Support object icon_info in tool proxy 2016-09-02 09:39:31 +08:00
John Okely
3b4491e8aa MDL-55742 mod_lti: Remove support for get_magic_quotes_gpc 
Thanks to Bishop Bettini for the original patch.
 2016-09-01 14:58:29 +08:00
Helen Foster
b61b927356 MDL-55661 lang: Merge English strings from the en_fix language pack 2016-08-25 14:38:07 +02:00
Eloy Lafuente (stronk7)
e0519d032d Merge branch 'MDL-55314-master' of https://github.com/mrmark/moodle 2016-08-02 17:16:07 +02:00
Eloy Lafuente (stronk7)
8a78cb42da Merge branch 'MDL-55315-master' of https://github.com/mrmark/moodle 2016-08-02 17:07:16 +02:00
Jun Pataleta
653b8ef24b MDL-54879 mod_lti: Add fallback options for error message upon failure 2016-07-28 14:38:29 +08:00
Mark Nielsen
123cc912ec MDL-55314 mod_lti: Several fixes to lti_load_cartridge 
* Fixed XML loading when there is an error
* Fixed exception thrown by lti_load_cartridge
* By default, don't allow LTI mod generator to
  use a toolurl as that results in a cURL call.
 2016-07-27 09:08:21 -07:00
Dan Poltawski
773a11519d Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle 2016-07-26 11:57:09 +01:00
David Monllao
72e92d0ac2 Merge branch 'MDL-55325-master' of https://github.com/xow/moodle 2016-07-26 10:33:21 +08:00
Rajesh Taneja
52f3e060e4
MDL-55091 phpunit: Following has been deprecated. 
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
 2016-07-26 10:11:30 +08:00
John Okely
4c3472a55c MDL-55325 mod_lti: Use .on('load') instead of .load() 
Necessary after MDL-50937 JQuery upgrade to 3.1
 2016-07-25 17:31:41 +08:00
Mark Nielsen
3077ae6004 MDL-55315 mod_lti: Fix Nginx 405 error 
It appears that Nginx doesn't allow POST
to static files.  So rename the fixture from
a HTML file to a PHP file.
 2016-07-22 11:39:42 -07:00
David Monllao
0bd8383a8b MDL-55278 search: Updating references to area namespace 2016-07-21 18:38:18 +02:00
Dan Poltawski
9b62a3eb71 MDL-55048 js: rebuilt files with new version of uglifyjs 2016-07-11 15:53:10 +01:00
Dan Poltawski
6e304922fb MDL-54944 js: built files after changes 2016-07-07 12:11:07 +01:00
Dan Poltawski
5602dc1735 MDL-54944 js: ensure functions are consistent in return val 
Mostly we are being incosnistent when giving an early-exit shortcut.

Detected by http://eslint.org/docs/rules/consistent-return
 2016-07-07 12:11:07 +01:00
Dan Poltawski
c905cd233d MDL-54944 js: fix quoting of object properities coding style 
Detected by http://eslint.org/docs/rules/quote-props
 2016-07-07 12:11:05 +01:00
Andrew Nicols
5e47d5aee5 Merge branch 'MDL-54951-master' of git://github.com/jleyva/moodle 2016-07-05 09:41:31 +08:00
Juan Leyva
7ef49bd393 MDL-54951 webservice: Return intro text files in modules 2016-07-04 09:24:28 +01:00
Andrew Nicols
91e46852fc Merge branch 'MDL-54877-master-clean-on-output' of git://github.com/junpataleta/moodle 2016-07-04 11:52:05 +08:00
Andrew Nicols
48d1322527 Merge branch 'MDL-54610_master' of https://github.com/snake/moodle 2016-06-30 09:24:58 +01:00
Eloy Lafuente (stronk7)
47d986828e Merge branch 'wip-MDL-47113-master' of git://github.com/abgreeve/moodle 2016-06-30 09:24:58 +01:00
Dan Poltawski
ab8ef75406 Merge branch 'MDL-55022-master' of git://github.com/junpataleta/moodle 2016-06-30 09:24:56 +01:00
Jun Pataleta
5c1b749d55 MDL-54877 mod_lti: Clean LTI tool type name and description on output 
* Use clean_param() for name and description when displaying the tool type.
    Basically in the following functions:
    - serialise_tool_type()
    - lti_get_configured_types()
* Changed name and description's type from PARAM_TEXT to PARAM_RAW
    in tool update parameters.
* Changed name and description's type from PARAM_TEXT to PARAM_RAW
   in mod_lti_external::tool_type_return_structure()
 2016-06-30 15:55:43 +08:00
David Mudrák
46994de566 MDL-55002 lang: Fix behat scenarios using modified strings 2016-06-27 22:57:34 +02:00
Helen Foster
25558b808e MDL-55002 lang: Merge English strings from the en_fix language pack 2016-06-27 22:03:40 +02:00
Jun Pataleta
eb55f72d63 MDL-55022 mod_lti: Fix undefined variable 2016-06-27 11:40:03 +08:00
Jake Dallimore
f56cbd3bbf MDL-54610 mod_lti: Fix cartridge support for admin tool add/edit forms 2016-06-24 14:14:28 +08:00
Adrian Greeve
ccc9777aee MDL-47113 mod_lti: Use of html_writer rather than hard coded HTML. 2016-06-20 14:49:04 +08:00
Ben Kelada
b346737e75 MDL-47113 lti: Add link to open in new window, when popup blocked 2016-06-20 14:39:39 +08:00
Dan Poltawski
c96f55e6f9 MDL-54939 amd: fix lint issues 
Mostly correcting jsdoc, some other line wrapping rules and empty
functions.
 2016-06-17 09:03:18 +01:00
Dan Poltawski
35be582696 MDL-54939 amd: Fix lint issues fixable with eslint --fix 2016-06-16 19:33:00 +01:00
Andrew Nicols
a029e5212d Merge branch 'MDL-53788_modlti_master' of git://github.com/nhoobin/moodle 2016-06-16 09:04:15 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Nicholas Hoobin
99a5377bb7 MDL-53788 mod_lti: fix aggressive course cache rebuilding 2016-06-15 10:42:27 +10:00
Jun Pataleta
93f3988cf7 MDL-54712 mod_lti: Remove markup from LTI admin notification messages 2016-06-10 15:10:45 +08:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible. 
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
 2016-06-10 08:06:49 +10:00
Jake Dallimore
c724c98829 MDL-54702 mod_lti: Support standard cartridge icons in LTI import 2016-06-01 09:49:10 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
John Okely
e1e1aad183 MDL-53988 mod_lti: Remove popup for duplicate url 
If creating a proxy fails, we will show an error using the
notification API. So we can remove the notification.exception call.
But modify the docs for ToolProxy.create so that future developers
will know they need to handle failures themselves.
 2016-05-20 12:06:03 +08:00
Rajesh Taneja
c14701a2ce MDL-53988 behat: Fixed modified error string 2016-05-20 09:12:48 +08:00
Dan Poltawski
71dadd6d26 MDL-53988 lti: build js 2016-05-19 10:57:47 +01:00
John Okely
0450f5e081 MDL-53988 mod_lti: Improve error handling and user interface 
Only show one, more helpful error instead of two non-helpful errors.
Don't show the 'no configured tools' message if there is a proxy there.
Return to the Tool configure page when editing a proxy if you came
from it.
 2016-05-19 17:10:00 +08:00
Marina Glancy
bff0a28894 MDL-54632 mod_lti: separate show as preconfigured and in activitychooser 2016-05-19 15:15:46 +08:00
David Monllao
ca7b16fa70 Merge branch 'MDL-54638' of git://github.com/stronk7/moodle 
Conflicts:
	mod/lti/version.php
 2016-05-19 13:47:22 +08:00
Andrew Nicols
9dfee70f6b Merge branch 'MDL-53988-master-fix' of https://github.com/xow/moodle 2016-05-19 11:58:16 +08:00
John Okely
b1c8a860cb MDL-53988 mod_lti: Add language string for unactivated proxies 2016-05-19 11:55:17 +08:00
Andrew Nicols
367c85d78c Merge branch 'MDL-53988-master' of https://github.com/xow/moodle 2016-05-19 11:43:27 +08:00
John Okely
811d9ff941 MDL-53988 mod_lti: Fix followup up issues 
Fix function naming
Fix param types
Fix error popping up twice with incorrect URL
Add confirm dialog when you delete a tool
Show orphaned tool proxies in list
Fix interface jumping up and down
Change to use notification stack
Change capabilities in db/services.php
Add loading animation after registering tool
Show loading animation until tools are rendered
 2016-05-19 11:18:21 +08:00