mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
69,449 Commits 36 Branches 519 Tags
Commit Graph

286 Commits

Author SHA1 Message Date
Petr Škoda
32f906b677 MDL-43661 use new edulevel in all existing events 2014-01-21 16:12:35 +08:00
Dan Poltawski
4198f7f903 Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle 2014-01-14 14:43:45 +08:00
Eloy Lafuente (stronk7)
577432283c Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle 2014-01-10 10:08:34 +01:00
Helen Foster
480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Rajesh Taneja
184afb6b73 MDL-43238 events: Added event other information in event php doc block 2014-01-03 15:03:48 +08:00
Mark Nelson
e9787bda9a MDL-40918 mod_lti: removed the 'launch' add_to_log call 
This add_to_log call is unnecessary and does not need to be replaced with an event.
It is called whenever we view the external tool, which will trigger the view event.
There is no need for two events when this occurs.
 2013-12-31 16:06:37 -08:00
Mark Nelson
3fdd73e83d MDL-40918 mod_lti: replaced 'view' and 'view all' add_to_log calls with events 2013-12-31 15:47:49 -08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Damyon Wiese
f51d0384f7 Merge branch 'MDL-41797' of git://github.com/rwijaya/moodle 2013-11-13 11:50:36 +08:00
rwijaya
80fd00729b MDL-41797 external tools module: fix heading levels. 
AMOS BEGIN
CPY [submissions, core_grades], [submissions, mod_lti]
AMOS END
 2013-11-13 09:52:32 +08:00
Eloy Lafuente (stronk7)
aa7bc816d9 Merge branch 'wip-MDL-42672-master' of git://github.com/marinaglancy/moodle 2013-11-12 20:07:05 +01:00
Damyon Wiese
f845946821 MDL-36224 LTI: Whitespace fix 2013-11-11 10:04:10 +08:00
Damyon Wiese
2bdd5ff4aa MDL-36224 LTI: Fix up docs, add plugininfo class and create subplugin folder. 2013-11-08 14:35:32 +08:00
Mark Nielsen
8cf7670e58 MDL-36224: Improving lti_get_types 
If there are no LTI source plugins that
need to be added to the activity chooser
menu, then fallback to the default
activity chooser display.
 2013-11-08 14:35:31 +08:00
Mark Nielsen
4d7a2c9e1c MDL-36224: Minor updates to LTI 
* No debug display on service.php
* Send a 400 header on error
 2013-11-08 14:35:31 +08:00
Chris Scribner
fdbf2f229c MDL-36224: Adding subplugins.php 2013-11-08 14:35:31 +08:00
Chris Scribner
976b5bca31 MDL-36224: Add support for pluggable extensions to add new LTI services 2013-11-08 14:35:31 +08:00
Marina Glancy
09af1e2864 MDL-42672 blocks: warnings on /mod/xxx/index.php for frontpage course 2013-11-06 14:21:24 +11:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Dan Poltawski
f76bd72234 Merge branch 'MDL-38419' of https://github.com/moodlerooms/moodle 2013-10-28 12:33:39 +08:00
Marina Glancy
7fbe33fcf1 MDL-42400 generator: module generators call add_moduleinfo instead of direct inserts 2013-10-26 14:00:23 +11:00
Dan Poltawski
3f9a9e86b3 Merge branch 'MDL-42338' of git://github.com/rwijaya/moodle 2013-10-24 16:28:46 +08:00
rwijaya
45535d95b3 MDL-42338 lti_mod: convert hardcoded string. 2013-10-24 10:30:02 +08:00
Charles Severance
ba0f89e168 MDL-40531 mod_lti: Various 1.1/1.1.1 fixes. 2013-10-19 02:57:12 +02:00
Sam Chaffee
33ad01a291 MDL-40531 mod_lti: Changed namespace in XML to IMS LTI compliant 2013-10-18 10:12:15 -06:00
Eloy Lafuente (stronk7)
7d766e4ca1 Merge branch 'wip-mdl-41843' of git://github.com/rajeshtaneja/moodle 2013-10-14 00:13:26 +02:00
Rajesh Taneja
3f8ccd7c5f MDL-41843 IMS-LTI: Fixed exception namespace 2013-10-08 13:24:34 +08:00
Dongsheng Cai
b56d1ecadb MDL-41843 Uses OAuthException in moodle\mod\lti namespace 2013-10-08 13:18:00 +08:00
Joshua Johnston
4938777ed3 MDL-41520 LTI: Does not track page views for completion 
Add the missing code for completion_info::set_module_viewed() since LTI
says that it offers completion tracking on view
 2013-10-04 09:42:19 -04:00
Adrian Greeve
b97d94ffbb MDL-39962 - Events: Replace lefacy event lti_unknown_service_api call. 2013-09-24 10:08:28 +08:00
Helen Foster
86698a4c72 MDL-41568 Merge English strings from the en_fix language pack 2013-09-03 12:31:35 +02:00
Sam Hemelryk
c3d2fbf9cd MDL-40931 useragent: separated user agent functionality into a lib 
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
 2013-08-26 13:59:19 +12:00
Damyon Wiese
9ead041cdb Revert "MDL-40931 useragent: separated user agent functionality into a lib" 
This reverts commit af62237d0e6e27df868d50848f7098f57c103f86.
This reverts commit 87a4194fdcd322d4aee5a6207b55a8da0864da94.
This reverts commit b2c66eb60c01805f26cc791966f05be52af7b406.

Conflicts:

	version.php
 2013-08-22 13:31:25 +08:00
Damyon Wiese
74df2951d1 Revert "MDL-39876 Change get_record('course') calls to get_course" 
This reverts commit ab7632b74c331540c90229bf03d13aa2e6bdd9be.
 2013-08-21 13:42:30 +08:00
Sam Hemelryk
6eee89bc8f Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	course/lib.php
 2013-08-21 12:08:46 +12:00
Sam Hemelryk
af62237d0e MDL-40931 useragent: separated user agent functionality into a lib 
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
 2013-08-16 09:02:01 +12:00
sam marshall
ab7632b74c MDL-39876 Change get_record('course') calls to get_course 2013-08-15 11:31:20 +01:00
Petr Škoda
2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Sam Hemelryk
68736bd623 Merge branch 'MDL-40870' of https://github.com/moodlerooms/moodle 2013-08-06 14:47:38 +12:00
Sam Hemelryk
c7c020aad2 Merge branch 'MDL-39090_lti_dup_params' of https://github.com/moodlerooms/moodle 2013-08-06 10:23:45 +12:00
Mark Nielsen
533c42ea28 MDL-39090: Duplicate parameters in LTI launches 
Removed endpoint query string params from body
to prevent param duplication.
 2013-07-30 08:44:01 -07:00
Dan Poltawski
86005f4884 Merge branch 'MDL-40867' of git://github.com/timhunt/moodle 2013-07-29 15:23:42 +08:00
Dan Poltawski
8cb1af9a18 Merge branch 'MDL-40857' of git://github.com/timhunt/moodle 2013-07-29 13:55:25 +08:00
Dan Poltawski
90b423bda7 Merge branch 'MDL-36399' of git://github.com/timhunt/moodle 2013-07-29 12:40:05 +08:00
Dan Poltawski
47c6239483 Merge branch 'MDL-40863' of git://github.com/timhunt/moodle 2013-07-29 10:09:45 +08:00
Tim Hunt
7302fbf696 MDL-40857 External tool: fix incorrect moodle_url usage. 2013-07-26 11:40:32 +01:00
Tim Hunt
c11ff4be69 MDL-40857 External tool (LTI) capabilitiy names confusing. 
I have improved the names in the language file so that they actually say
what they do (based on my reading of the code). I have also added
comments to access.php explaining each capability.

I have corrected a few of the RISK in access.php which were wrong.

I have changed a couple of the archetypes so that guests cannot launch
LTI activities, and editing teachers cannot do editing things.
 2013-07-26 11:40:28 +01:00
Tim Hunt
3de55d2458 MDL-40867 External tools should launch pop-ups from the course page 
Without this fix, if an LTI tool is set to open in a pop-up, then
clicking the link on the course page opens another almost blank page,
which then tries to open the pop-up, which is almost invariably caught
by your pop-up blocker.

With this fix, clicking the link on the course page opens the pop-up
directly, like for pop-up resources.
 2013-07-26 10:40:16 +01:00
Tim Hunt
06ca6cc955 MDL-40863 feedback and LTI mods need get_extra_capabilities fn 
Since moodle/site:accessallgroups is relevant to how them.
 2013-07-26 10:39:55 +01:00