mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-28 03:22:38 +01:00
Code Issues Projects Releases Wiki Activity
66,293 Commits 36 Branches 527 Tags
Commit Graph

1458 Commits

Author SHA1 Message Date
Rajesh Taneja
623a32e50d MDL-43736 Events: Updated unit test to test context not used in event 2014-01-29 11:39:50 +08:00
Rajesh Taneja
fdc729ea57 MDL-43736 Events: event->contextinstanceid should be used where possible 
While restoring event context might not be present (deleted)
So before using context api's check context or use event properties
 2014-01-29 11:39:44 +08:00
Tomasz Muras
672ce966c6 MDL-43040 Replace $module with $plugin in all mod/*/version.php 
Conflicts:
	mod/quiz/version.php
 2014-01-29 00:36:12 +01:00
Damyon Wiese
b158296ece Revert "MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close." 
This reverts commit ed3d1ee60d1e48ade21438fd98fef2deb63ecb5f.
This reverts commit ed8eebeecefa98e17c96084b72fe2cd923cc051d.
This reverts commit f664a9387818b5b359df4696040da0aea07b926a.
This reverts commit 9d2276572372f5d249cde8c61d0976e25f0fa4a8.
 2014-01-23 17:14:56 +08:00
Dan Marsden
ed3d1ee60d MDL-43247 SCORM: use window.closed property instead of window.opener for IE 2014-01-23 20:38:01 +13:00
Damyon Wiese
ed8eebeece MDL-43247 Scorm: Fix for undefined js variable when popup is blocked. 2014-01-23 10:49:56 +08:00
Damyon Wiese
6baeabc140 Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle 2014-01-23 10:27:18 +08:00
Dan Marsden
f664a93878 MDL-43247 SCORM: convert some js to YUI 2014-01-22 21:53:26 +13:00
Petr Škoda
32f906b677 MDL-43661 use new edulevel in all existing events 2014-01-21 16:12:35 +08:00
Damyon Wiese
c821f113cc Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle 2014-01-21 12:57:05 +08:00
Eloy Lafuente (stronk7)
b7623bcb5d Merge branch 'MDL-43480_master' of git://github.com/dmonllao/moodle 2014-01-21 01:43:13 +01:00
David Monllao
a77adc602a MDL-43743 mod_scorm: Adding package disclaimer 
As the package is licensed under CC 3.0 we should
be compliant with attribution.
 2014-01-20 09:30:44 +08:00
David Monllao
ef6ac9b0d5 MDL-43743 behat: Lightweight scorm package 
The previous used package were adding a second iframe
inside the scorm iframe and was slow loading it;
this patch replaces it for a simple one without any
extra iframe.
 2014-01-17 17:39:25 +08:00
David Monllao
561e9bb92e MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert 2014-01-17 10:41:37 +08:00
Dan Marsden
9d22765723 MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close. 2014-01-17 10:09:26 +13:00
Damyon Wiese
8e3be93572 Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle 2014-01-16 16:35:22 +08:00
Ankit Agarwal
5971f6266a MDL-40056 events: Use correct course module id while fetching context 2014-01-16 16:31:06 +08:00
Eloy Lafuente (stronk7)
da272e6b6b Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle 2014-01-15 22:02:12 +01:00
Dan Marsden
eb07f2d8d0 MDL-43222 SCORM: Fix invalid sql 2014-01-16 09:48:04 +13:00
Eloy Lafuente (stronk7)
e5f7cce1c1 Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle 2014-01-14 16:44:11 +01:00
Dan Poltawski
2be353c195 Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle 2014-01-14 15:00:11 +08:00
Damyon Wiese
961f70adcd Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle 2014-01-14 13:14:09 +08:00
Ankit Agarwal
0a61619043 MDL-40056 events: Replace old add_to_log calls with new events 2014-01-14 12:05:37 +08:00
Ankit Agarwal
25e8023d3d MDL-40056 events: Add unit tests for new events 2014-01-14 12:05:37 +08:00
Ankit Agarwal
a501fe1385 MDL-40056 events: Created Event classes to replace add_to_log() - mod_scorm 
Created attempt_deleted event
Created interactions_viewed event
Created report_viewed event
Created sco_launched event
Created tracks_viewed event
Created user_report_viewed event
Created course module related events
 2014-01-14 12:05:10 +08:00
Dan Poltawski
986c3f27ee Merge branch 'master_MDL-42792' of git://github.com/danmarsden/moodle 2014-01-14 11:28:39 +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
Dan Marsden
aafb7a5b95 MDL-43222 SCORM: correct check for list of attempts and make correct check for current attempt in scorm_get_toc 2014-01-10 22:04:09 +13:00
Dan Marsden
2526d7e178 MDL-42792 SCORM: Prevent JS error when network connection fails. - return false to SCORM package so that issue can be detected and reported. 2014-01-10 21:04:54 +13:00
Dan Marsden
434cab3c79 MDL-41577 SCORM: remove old IE9 hack that didn't really work. 2014-01-10 20:46:05 +13:00
Helen Foster
480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Sam Hemelryk
7c445ab8c0 Merge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/moodle 2014-01-06 14:46:31 +13:00
Petr Škoda
90627d9d59 MDL-43527 eliminate last references to safe_mode 
Safe mode is not availabel in PHP 5.4 any more...
 2014-01-02 09:23:15 +08:00
Andrew Nicols
4e2c2c64bb MDL-36334 mod_scorm: Remove gallery-sm-treeview 
This has now been incorporated into core.
 2013-12-30 19:19:26 +08:00
David Monllao
f49cede794 MDL-43404 behat: Avoid failures at framework level as much as possible 
- Move them to i_look_for_exceptions() so they will be
  thrown at a step (scenario) level.
- Accept alerts only when they are detected to avoid
  all the following scenarios to be failing; they would
  continue executing, but they will all fail if the alert
  is still there
- Add a step to avoid add_scorm.feature to fail
- Refine the UnknownError catch
 2013-12-19 15:48:03 +08:00
David Monllao
d1e55a47be MDL-42625 behat: Step definitions + related changes in features 
In general aiming for compatibility with multiple browsers,
firefox, chrome and phantomjs to be more specific.

* Removing hardcoded waits
* Adding @_alert, @_switch_window and @_switch_frame tags,
  to label actions that different drivers have problems with.
* Adding missing @_files_upload and @_only_local tags to features that
  uploads files.
* Fixing a few wait for page ready what specified miliseconds.
* New methods to ensure elements (usual selectors), sections and editors
  are ready to interact with
* Changing the select an option implementation to deal with the different
  drivers implementations when listening to JS events.
 2013-12-06 13:10:24 +08:00
Marina Glancy
07622451a3 MDL-42174 behat: deprecate upload file to filepicker step in favour of filemanager 2013-12-05 21:00:25 +11:00
Sam Hemelryk
8d5a9d6ec1 Merge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle 2013-11-27 12:36:02 +13:00
Dan Poltawski
83a97ce6c7 Merge branch 'master_MDL-42992' of git://github.com/danmarsden/moodle 2013-11-25 11:17:47 +08:00
Marina Glancy
15cca13822 MDL-42508 scorm: add module generator 2013-11-22 15:25:37 +11:00
Dan Marsden
18a34b07e6 MDL-42992 SCORM: Always allow IE to resize window 2013-11-21 10:22:42 +13:00
Damyon Wiese
86249e9aeb Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle 2013-11-19 09:49:57 +08:00
Dan Marsden
eef4c4c175 MDL-40223 SCORM: pass limit into function instead of hardcoding to allow cross-db 2013-11-19 13:23:06 +13:00
Damyon Wiese
67016a4d39 Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle 2013-11-18 15:12:56 +08:00
Dan Poltawski
728f924ec1 Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/scorm/db/upgrade.php
 2013-11-18 14:32:55 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Dan Marsden
0d7eb69164 MDL-41695 SCORM: allow unlimited decimal places in CMIDecimal 2013-11-18 10:27:10 +13:00
Dan Marsden
27c58e5583 MDL-40223 SCORM: update scorm->launch param after restore - also check that scorm->launch is valid. 2013-11-18 09:44:54 +13: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
Adrian Greeve
e351bed5c1 MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything. 2013-11-12 11:30:16 +08:00