mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-29 03:52:33 +01:00
Code Issues Projects Releases Wiki Activity
74,274 Commits 36 Branches 527 Tags
Commit Graph

1613 Commits

Author SHA1 Message Date
Helen Foster
ce2c0f3a74 MDL-51148 lang: Merge English strings from the en_fix language pack 2015-08-26 16:46:43 +02:00
Dan Marsden
524aaa177a MDL-51015 mod_scorm: tidy up messy code, remove use of eval() 2015-08-06 22:20:05 +12:00
Juan Leyva
0b9fc18ba1 MDL-50427 mod_scorm: Rename scorm_view_display to scorm_print_launch 
In order to avoid confusion with the new scorm_view fuction
 2015-07-20 09:15:44 +02:00
Juan Leyva
e9bf301145 MDL-50427 mod_scorm: New Web Service mod_scorm_view_scorm 2015-07-20 09:15:44 +02:00
Juan Leyva
ade341deb2 MDL-50427 mod_scorm: Move logging and completion to new API 2015-07-20 09:13:42 +02:00
Dan Poltawski
eb2b84d6d2 Merge branch 'master_MDL-49647' of https://github.com/danmarsden/moodle 2015-07-13 10:05:27 +01:00
Eloy Lafuente (stronk7)
b164e2ec30 Merge branch 'MDL-50049-master' of git://github.com/ankitagarwal/moodle 2015-07-09 20:24:13 +02:00
Dan Marsden
d1673b8f6c MDL-49647 mod_scorm: correct escaping of javascript content. 2015-07-09 16:35:20 +12:00
Dan Marsden
476e97f280 MDL-50614 mod_scorm: Improve validation on currentorg 2015-06-30 10:12:51 +08:00
Ankit Agarwal
2149326b8c MDL-50049 deprecation: Remove usage of deprecated api and cleanup 2015-06-29 17:15:50 +05:30
Nadav Kavalerchik
e51bdc0bcc MDL-50708 SCORM: Right align menu item folder icon, when in RTL mode. 2015-06-27 23:49:11 +03:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Andrew Nicols
7ae030d54e Merge branch 'master_MDL-50133' of https://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/version.php
 2015-05-07 10:24:11 +08:00
Dan Marsden
a374769640 MDL-50133 mod_scorm: use correct captypes 2015-05-07 11:43:28 +12:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release 
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
 2015-05-05 17:43:19 +02:00
Helen Foster
0634dc3b76 MDL-50033 lang: Merge English strings from the en_fix language pack 2015-04-29 21:43:00 +02:00
Rajesh Taneja
0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com 
asd.com is a valid domain, we should use reserved domain names for testing
 2015-04-20 11:21:20 +08:00
Dave Cooper
81d7de1aa1 MDL-48936 lang: Changed "My Home" to "Dashboard". 
Part of MDL-45774
 2015-04-10 17:16:27 +08:00
Damyon Wiese
75ece778c5 Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2015-04-07 17:27:17 +08:00
Andrew Hancox
6398ff5387 MDL-49101 core: Add a global admin setting config->requiremodintro 
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
 2015-04-07 10:11:53 +01:00
Petr Skoda
d6e7a63d9a MDL-49684 timezones: rewrite timezone support 
This patch replaces all homegrown timezone
stuff with standard PHP date/time code.

The main change is the introduction of core_date
class that returns normalised user and server
timezones. From now on nobody should be using
$CFG->timezone or $user->timezone directly!

Other new features and fixes:
* admins are prompted for timezone during install
* editing of other users is finally fixed
* timezones are displayed in user profile
* new $this->setTimezone() in phpunit
* time locale is now automatically reset in phpunit
* timezone is now automatically reset in phpunit
* phpunit has Australia/Perth as default timezone
 2015-04-06 13:53:51 +12:00
David Monllao
0adf7044ff MDL-46805 mod_scorm: Re-fix as previous object was removed in 2.8 2015-04-02 11:09:30 +02:00
Rajesh Taneja
e43bf473fa MDL-46805 scorm: Set user_id if scorm|aiccuserid config is set 2015-04-02 11:09:29 +02:00
Dan Poltawski
7e5c5b83c1 Merge branch 'm29_MDL-43818_Unable_Download_Package_Via_URL' of https://github.com/scara/moodle 2015-03-31 09:27:46 +01:00
Rajesh Taneja
4df12b9372 MDL-48096 scorm: Include section number in cm 2015-03-31 15:51:47 +08:00
Andrew Nicols
73edc9b12e Merge branch 'master_MDL-46805' of https://github.com/danmarsden/moodle 2015-03-31 08:15:23 +08:00
Dan Marsden
ef88aa2938 MDL-46805 SCORM: AICC restricts allowed characters in the username 2015-03-31 10:38:16 +13:00
Matteo Scaramuccia
97cc12349e MDL-43818 SCORM: unable to download the Package via URL. 2015-03-30 20:37:02 +02:00
Dan Poltawski
a29c948c0d Merge branch 'master_MDL-48096' of git://github.com/danmarsden/moodle 2015-03-30 13:48:35 +01:00
Dan Marsden
7a0d8e725c MDL-48096 scorm: Make exit activity link return to correct section 2015-03-24 11:40:27 +13:00
Dan Marsden
b6906055ca MDL-49054 scorm: Remove some old debugging code. 2015-03-23 08:56:33 +13:00
Dan Marsden
9e733da743 MDL-44548 mod_scorm: force an external sync to check for updated files. 2015-03-16 09:02:26 +13:00
Andrew Nicols
a1955c1784 Merge branch 'master_MDL-46390' of https://github.com/danmarsden/moodle 2015-03-04 07:52:55 +08:00
Dan Marsden
f47a8a6f81 MDL-46390 mod_scorm: Find correct sco to launch when org based sco is selected 
Also tidies up some redundant code in scorm_format_toc_for_droplist()
 2015-03-04 09:27:45 +13:00
Dan Poltawski
dab0d47632 Merge branch 'master_MDL-49303' of https://github.com/danmarsden/moodle 2015-03-02 16:57:52 +00:00
Dan Marsden
5e437bc0c0 MDL-49303 mod_scorm: Initialise student preferences on re-entry. 2015-02-26 20:36:48 +13:00
Dan Marsden
a544661398 MDL-46408 mod_scorm: check param is set before using. 
The default org is only set if it exists in the imsmanifest.xml
 2015-02-20 14:41:07 +13:00
Andrew Nicols
64e7aa4de1 MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string 2014-12-01 08:32:04 +13:00
Eloy Lafuente (stronk7)
4ef19b1789 Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle 2014-11-25 18:38:24 +01:00
Dan Poltawski
03e93abad8 MDL-48277 css: enable duplicate definitions lint rule 
And remove duplicates found in code which were detected by this rule
(leaving the last rule defined as this would take precidence).

https://github.com/CSSLint/csslint/wiki/Disallow-duplicate-properties
 2014-11-18 22:11:36 +00:00
Mary Evans
a263396486 MDL-47915 theme: use id='page-content' rather than 'content'. 
Also added JS fallback for themes using copied layouts in scorm
 2014-11-18 17:49:57 +00:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Dan Poltawski
5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle 
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
 2014-11-05 12:11:16 +00:00
Damyon Wiese
c5d4633fed Merge branch 'MDL-47902_scorm_inappropriate_default_values' of https://github.com/MorrisR2/moodle 2014-11-05 14:05:32 +08:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
Sam Hemelryk
0025296f19 MDL-47970 mod_scorm: fixed HTML5 validation error 2014-10-30 14:56:15 +13:00
Sam Hemelryk
77b31ba2ce Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle 2014-10-28 14:02:19 +13:00
Ray Morris
9f56cc3794 MDL-47902 mod_scorm: Inappropriate default values for SCORM 1.3 variables 2014-10-27 15:06:42 -05:00
Ray Morris
a53bf3a031 MDL-47882 SCORM: invalid HTML in loadSCO.php 2014-10-24 16:45:32 -05:00
Gareth J Barnard
a024eaa5fc MDL-47795 SCORM: SCORM report not a report. 2014-10-21 15:37:31 +01:00