mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
79,967 Commits 36 Branches 519 Tags
Commit Graph

1883 Commits

Author SHA1 Message Date
Helen Foster
b61b927356 MDL-55661 lang: Merge English strings from the en_fix language pack 2016-08-25 14:38:07 +02:00
Andrew Nicols
ccfd62a1ca MDL-54680 enrol_lti: Coding Style fixes 2016-08-16 14:48:17 +08:00
Andrew Nicols
88a0cdada4 Merge branch 'MDL-54680-master' of https://github.com/xow/moodle 2016-08-16 14:45:33 +08:00
John Okely
3e9ab40361 MDL-54680 enrol_lti: Offer cartridges in LTI provider 2016-08-16 14:15:02 +08:00
Dan Poltawski
fb8723d9f5 MDL-52105 enrol_self: fix upgrade savepoint 2016-08-15 12:12:24 +01:00
Simey Lameze
6fdd61a073 MDL-52105 enrol_self: Behat test for key holder feature 2016-08-15 12:56:52 +08:00
Simey Lameze
33b6da5327 MDL-52105 enrol_self: Fix wrong holdkey cap restriction for manager 
This commit add an upgrade step to remove wrong CAP_PROHIBIT on enrol/self:holdkey for manager role.
Also remove the restriction from the self enrolment access file.
 2016-08-15 12:56:51 +08:00
Jun Pataleta
fe15136d37 MDL-55323 enrol_lti: Remove unused required parameter 2016-07-28 14:44:58 +08:00
David Monllao
837cec00f9 Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/upgrade.txt
 2016-07-26 10:14:30 +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
Serge Gauthier
cc6b92483a MDL-31356 enrol_imsenterprise: Continue development for added features 
* Add the possibility to make it works as before (with categrory name or idnumber).
    * Add possibility to specify nested categories by name or idnumber.
    * Fix error in core_course_courselib_testcase::test_course_created_event because dependency with imsenterprise
 2016-07-14 09:36:03 -04:00
Serge Gauthier
08b29336b9 MDL-31356 enrol_imsenterprise: merge with moodle3.2 2016-07-14 09:36:03 -04:00
Dan Poltawski
81e849bc71 MDL-31356 enrol_imsenterprise: add additional test coverage 2016-07-14 09:36:03 -04:00
Dan Poltawski
ecf6a0ab5b MDL-31356 enrol_imsenterprise: Fix behaviour with course idnumber 
When not set we shouldn't throw a warning
 2016-07-14 09:36:03 -04:00
Brian Biggs
93fdbb4292 MDL-31356 enrol_imsenterprise: New Features 
* Feature 1: Allow nested categories when creating courses.
* Feature 2: Allow updates to course Full Name and Short Name.
* Feature 3: Allow setting authentication type for users.
* Feature 4: Allow updates to users.

Also added tests and updated course update routines so it doesn't
muck with DB directly.
 2016-07-14 09:36:02 -04:00
Dan Poltawski
d7f2176fd8 MDL-54671 css: fix lint errors 2016-07-08 12:58:54 +01:00
Eloy Lafuente (stronk7)
ed2d12a125 Merge branch 'MDL-54955-master' of git://github.com/jleyva/moodle 2016-07-05 21:15:31 +02:00
Eloy Lafuente (stronk7)
8a8e436cf7 Merge branch 'MDL-54800-master' of git://github.com/jleyva/moodle 2016-07-05 21:10:28 +02:00
Dan Poltawski
941b725693 Merge branch 'MDL-55027_master' of git://github.com/markn86/moodle 2016-06-30 09:24:56 +01:00
Mark Nelson
a802be7e39 MDL-55027 enrol_lti: avoid invalid image URL causing an exception 2016-06-27 13:27:23 +08:00
Juan Leyva
d889b58747 MDL-54955 webservice: Apply external_format_string in course names 2016-06-20 13:16:52 +01:00
Rajesh Taneja
f55d87c55c MDL-54589 behat: Fixed failures for phantomjs standalone 2016-06-20 16:03:36 +08:00
Juan Leyva
27c7ed0b2e MDL-54800 core_enrol: Return category id in WS get_users_courses 2016-06-15 15:59:07 +01: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
Frederic Massart
a5ea5149b8 MDL-48248 enrol_manual: Handle durations more precise than int days 2016-06-01 15:57:12 +08:00
David Monllao
edf842a462 Merge branch 'MDL-48248-master' of git://github.com/FMCorz/moodle 2016-05-30 13:02:34 +08:00
Frederic Massart
b8f414c29f MDL-48248 enrol_manual: Ensure that the default value is always selected 2016-05-25 10:16:59 +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
David Mudrák
ac5dad467d MDL-54672 behat: Fix i_enrol_user_as() step in non-js sessions 
During the recent reimplementation of the step (eb9ca848), we did not
notice that javascript variant uses the string `assignroles` while the
non-js variant uses string `assignrole`. This caused any "Given I enrol"
steps to fail in non-javascript sessions.
 2016-05-20 20:37:28 +02:00
Dan Poltawski
c9f85a1014 MDL-54641 enrol: fix trailing whitespace in upgrade.txt 2016-05-19 11:34:38 +01:00
Dan Poltawski
0677018ec5 Merge branch 'MDL-54641_master' of https://github.com/snake/moodle 2016-05-19 11:33:53 +01:00
Jake Dallimore
992365f8d5 MDL-54641 enrol: Consolidate 3.1 changes into correct section header. 2016-05-19 17:38:35 +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
Mark Nelson
3f3e7daae1 MDL-54177 enrol_lti: improved lang strings 
Also removed unused strings.
 2016-05-16 13:49:28 +08:00
Mark Nelson
17fa366ab3 MDL-54550 enrol_lti: show plugin description and warning 
- Updated and added plugin description to the settings page.
- Added warning when the auth_lti plugin is not enabled.
- Moved existing 'Allow frame embedding' warning above the
  'User default values' heading.
 2016-05-16 12:18:09 +08:00
David Monllao
ec7b75087c Merge branch 'MDL-54098-master' of git://github.com/FMCorz/moodle 2016-05-13 18:11:27 +08:00
Dan Poltawski
57678be26e Merge branch 'MDL-54103_master' of git://github.com/markn86/moodle 2016-05-11 10:04:07 +01:00
David Monllao
283b1d32bd Merge branch 'MDL-54009-master' of git://github.com/ryanwyllie/moodle 2016-05-10 21:58:41 +08:00
Mark Nelson
27d9859972 MDL-54103 enrol_lti: show frame embedding warning 2016-05-10 15:03:24 +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
b7c7f0d10e MDL-54009 enrol_lti: Captilise language string 2016-05-09 07:09:15 +00:00
Damyon Wiese
d26eae4af4 MDL-54042 user: Add unit test to cover change 2016-05-06 14:07:49 +01:00
Mark Nelson
a8abd53a32 MDL-54030 enrol_lti: confirm tool exists before deleting users 2016-05-06 09:27:35 +08:00
Damyon Wiese
8668796317 MDL-54046 enrol: Make docs urls match the old path 
Previously each enrolment method had it's own url in the docs. Because of the
refactor in 3.1 all pages are now served from the same script. We need to
manually set the docs url so that it points to the old docs pages.
 2016-05-06 09:27:34 +08:00
Mark Nelson
d066ed8db0 MDL-53977 enrol_lti: a hack to workaround a hack to utilise DB caching 2016-05-06 09:27:34 +08:00
Juan Leyva
7c357047cc MDL-54032 webservice: Fix plugin functions not using services 2016-05-03 13:00:13 +02:00
Dan Poltawski
387caf046b NOBUG: Fixed file access permissions 2016-04-29 12:27:27 +01:00
David Monllao
7cbb29e264 Merge branch 'MDL-49414-master' of git://github.com/cameron1729/moodle 2016-04-29 12:18:00 +01:00
Mark Nelson
3bc7252389 MDL-52035 enrol_lti: added fix for oracle 
Also added another unit test for \enrol_lti\helper::count_lti_tools();
 2016-04-29 12:17:55 +01:00
Cameron Ball
f23e9b6ba4 MDL-49414 webservices: Remove deprecated functions 2016-04-27 15:54:38 +08:00