mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-02 23:12:32 +02:00
Code Issues Projects Releases Wiki Activity
79,080 Commits 36 Branches 528 Tags
Commit Graph

408 Commits

Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
1abca11e0a MDL-54638 versions: bump all versions and requires near release 
version = 2016052300 release version
requires= 2016051900 current rc1 version
 2016-05-19 02:16:15 +02:00
Dan Poltawski
60941d4cb0 Merge branch 'MDL-54025' of https://github.com/stronk7/moodle 2016-05-18 19:20:23 +01:00
Eloy Lafuente (stronk7)
8728dbeecb MDL-54025 mod_lti: Amend tests to observe the new behavior 2016-05-18 19:37:57 +02:00
Dan Poltawski
cb5167df12 Merge branch 'MDL-54025_master' of https://github.com/snake/moodle 2016-05-18 11:38:30 +01:00
David Mudrák
50d083f07a MDL-54549 lang: Fix changed strings in behat scenario files 2016-05-17 18:29:30 +02:00
Helen Foster
75a22eb9fb MDL-54549 lang: Merge English strings from the en_fix language pack 2016-05-17 18:26:15 +02:00
Jake Dallimore
4741c3162e MDL-54025 mod_lti: Use activity name when creating tool from cartridge. 2016-05-17 17:54:12 +08:00
Dan Poltawski
bdabf42d9a Merge branch 'wip-MDL-54129-master' of git://github.com/abgreeve/moodle 2016-05-17 17:16:09 +08:00
Adrian Greeve
692b53480d MDL-54129 mod_lti: Show in course checkbox works properly. 
The show in course setting for LTI would always be set to true
regardless of what was set.
 2016-05-16 14:38:13 +08:00
Andrew Nicols
98c2893cdd Merge branch 'MDL-53221_master-information' of https://github.com/dmonllao/moodle 2016-05-16 13:06:05 +08:00
David Monllao
c827acae2d MDL-53221 search: Renaming search areas 
AMOS BEGIN
 CPY [modulename,mod_folder],[search:activity,mod_folder]
 CPY [modulename,mod_label],[search:activity,mod_label]
 CPY [modulename,mod_page],[search:activity,mod_page]
 CPY [modulename,mod_resource],[search:activity,mod_resource]
 CPY [modulename,mod_url],[search:activity,mod_url]
AMOS END
 2016-05-16 13:02:02 +08:00
Jake Dallimore
f418d89957 MDL-54128 mod_lti: Add help for custom LTI tools in activity picker 2016-05-16 10:07:29 +08:00
Andrew Nicols
d58854d3bf Merge branch 'wip-mdl-54561' of https://github.com/rajeshtaneja/moodle 2016-05-13 18:12:32 +08:00
David Monllao
ec7b75087c Merge branch 'MDL-54098-master' of git://github.com/FMCorz/moodle 2016-05-13 18:11:27 +08:00
Rajesh Taneja
790bf3ace0 MDL-54561 phpunit: only search with first 3 chars 
Windows uses only the first three characters of prefix in
tempnam(), so only use first 3 chars to find if error
is logged
 2016-05-13 13:33:52 +08:00
Frederic Massart
67ee10307f MDL-54098 external: Remove usage of require_login and $PAGE->set_context 2016-05-09 19:42:37 +08:00
Ryan Wyllie
9c8ef1397f MDL-54009 mod_lti: Style LTI tool iframe border 2016-05-09 07:07:27 +00:00
Dan Poltawski
02f504729a MDL-52154 lti: fix string errors 
Thanks to Helen
 2016-04-29 12:19:42 +01:00
Dan Poltawski
5ea0c56236 Merge branch 'MDL-52154-master-wip2' of https://github.com/xow/moodle 2016-04-29 12:17:50 +01:00
John Okely
af9d3a923d MDL-52154 mod_lti: Add tests and lang strings and finalise API 2016-04-27 13:15:33 +08:00
Ryan Wyllie
cc193e0d1d MDL-52154 mod_lti: Improve admin interface 
Created a new admin page for managing LTI tool types within
Moodle. The new page streamlines adding a new tool and allows
the admin to add a tool using either a cartridge or a registration
URL.
 2016-04-26 15:13:44 +08:00
John Okely
8aec804af2 MDL-52154 mod_lti: Add cartridge support to LTI 2016-04-26 15:13:44 +08:00
Dan Poltawski
f60e024fdc Merge branch 'MDL-49754-master' of https://github.com/xow/moodle 2016-04-25 14:13:51 +01:00
Marina Glancy
2348c13732 MDL-45064 mod_lti: use callback get_shortcuts() 
deprecate callback for ltisource plugins get_types(), instead introduce
get_shortcuts()
 2016-04-13 08:30:05 +08:00
John Okely
01e8bfd745 MDL-45064 lti: LTI types in activity chooser 2016-04-13 08:30:04 +08:00
spvickers
82f5226576 MDL-49754 mod_lti: Fixes to JSON format 
@id elements in JSON corrected to match the IMS spec.  Version number of
the service updated.
 2016-04-12 15:08:28 +08:00
Marina Glancy
a0dbba8308 MDL-53770 mod_lti: allow to uninstall ltisource plugins 2016-04-11 09:03:49 +08:00
Sam Chaffee
0c9c466964 MDL-53661 mod_lti: Fix lti_prepare_type_for_save forcessl config 2016-03-30 18:32:34 -06:00
John Okely
a7be136f20 MDL-52821 lti: Remove summary from unit test 2016-03-16 13:24:22 +08:00
John Okely
2a5bb939c2 MDL-52821 lti: Change tool_consumer_instance_description to site fullname 
And change tool_consumer_instance_name to site shortname
 2016-03-16 12:04:09 +08:00
Andrew Nicols
295ab83d2e Merge branch 'MDL-53351-master-lti-notice' of git://github.com/mudrd8mz/moodle 2016-03-15 12:48:06 +08:00