1
0
mirror of https://github.com/moodle/moodle.git synced 2025-04-10 10:52:14 +02:00

78316 Commits

Author SHA1 Message Date
Mark Nelson
01bb32a2b1 MDL-52035 enrol_lti: added enrol plugin 2016-04-26 16:15:47 +08:00
Mark Nelson
1d8886fa31 MDL-52035 auth_lti: added auth plugin 2016-04-26 15:58:08 +08:00
Mark Nelson
30498d9a0e MDL-52035 core_enrol: allow redirection to another page 2016-04-26 15:58:08 +08:00
Mark Nelson
581ea5013a MDL-52035 core_block: avoid PHP error when there is no region
This occurs when sharing a quiz via the LTI provider when it
adds a 'fake block' for quiz navigation. There may be other
occurrences.
2016-04-26 12:08:31 +08:00
Mark Nelson
466a1713a0 MDL-52035 core: added ability to override pagelayout
This is required by the LTI plugin when we share an
activity. We do not want the user to be shown the
navigation blocks etc. The activity should be the
only thing displayed.
2016-04-26 12:08:31 +08:00
Eloy Lafuente (stronk7)
6c1342d7e5 weekly release 3.1dev 2016-04-22 10:56:57 +02:00
Eloy Lafuente (stronk7)
16d26ae0c1 NOBUG: Fixed file access permissions 2016-04-22 10:56:57 +02:00
Eloy Lafuente (stronk7)
7e122c6e29 NOBUG: Fixed SVG browser compatibility 2016-04-22 10:56:53 +02:00
Andrew Nicols
e1bb3cd3c2 Merge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle 2016-04-22 14:25:03 +08:00
Simey Lameze
7c2bdca2f6 MDL-52781 core_user: remove invalid countries from unit tests 2016-04-22 14:10:55 +08:00
Andrew Nicols
284ac4240f Merge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle 2016-04-22 13:23:16 +08:00
Simey Lameze
aa788b3c42 MDL-52781 core_user: fix wrong lang check 2016-04-22 13:07:22 +08:00
David Monllao
c047386123 Merge branch 'MDL-53451-master-fixup3' of https://github.com/FMCorz/moodle 2016-04-22 12:59:59 +08:00
Frederic Massart
5592edb646 MDL-53451 competency: Improve performance by bypassing api::is_enabled() 2016-04-22 11:34:39 +08:00
Simey Lameze
48da3eef6e MDL-52490 mod_assign: fix lang strings to make it consistent 2016-04-22 10:25:07 +08:00
Dan Poltawski
86dd906aa7 Merge branch 'MDL-46092' of git://github.com/timhunt/moodle 2016-04-21 13:21:03 +01:00
Tim Hunt
0569063924 MDL-46092 quiz nav: fix buttons in requiresgrading state 2016-04-21 12:25:45 +01:00
Dan Poltawski
2b311b2d3e Merge branch 'MDL-51603-fixes' of git://github.com/dmonllao/moodle 2016-04-21 09:24:28 +01:00
David Monllao
547d779012 MDL-51603 dataformat_ods: Setting the sheet name
Clearning according to Box\Spout\Writer\Common\Sheet::isNameValid
2016-04-21 16:20:36 +08:00
David Monllao
fef111472c MDL-51603 dataformats: Using the long name instead of the short one 2016-04-21 16:20:36 +08:00
David Monllao
bc3b5a6a2f MDL-51603 quiz statistics: Using dataformats selector 2016-04-21 16:20:36 +08:00
David Monllao
9df4ae4189 MDL-51603 dataformats: coding_exception if output buffering 2016-04-21 16:20:36 +08:00
Brendan Heywood
5b95105600 MDL-51603 dataformat: Fixed worksheet title bug 2016-04-21 16:20:36 +08:00
Andrew Nicols
6ab41abd3e Merge branch 'MDL-52781-master' of git://github.com/lameze/moodle 2016-04-21 15:54:45 +08:00
Simey Lameze
94a578af82 MDL-52781 tool_uploaduser: add invalid data warnings if validation fails 2016-04-21 15:34:32 +08:00
Simey Lameze
5e60be8aaf MDL-52781 auth_db: deprecate clean_data method.
The old clean_data method has been deprecated as the user_create_user and user_updated user
    will be responsible by validating the user data.
2016-04-21 15:24:36 +08:00
Simey Lameze
ac9768fc1b MDL-52781 core_user: replace direct PARAM_ usages.
This commit replace as much as possible of clean_param and PARAM_ usages related to user object.
Also few unit tests has been changed to match the new validation
2016-04-21 15:24:36 +08:00
Simey Lameze
7a06720604 MDL-52781 core_user: add validation to user insertion and updating method
The new validation were added to user_create_user and user_update_user,
displaying debug message if some invalid data has been found.
Also the unit tests of those methods has been changed to match the methods behaviour.
2016-04-21 15:24:35 +08:00
Simey Lameze
4ce0931462 MDL-52781 core_user: improve core_user::fill_properties_cache() 2016-04-21 15:24:35 +08:00
Frederic Massart
3577bbe101 MDL-53451 tool_lpmigrate: Keep course competency on module failure
When permissions are lacking and the course module competencies could
not be migrated we must keep the course competency to preserve the
original competency in the course module.
2016-04-21 11:40:36 +08:00
Dan Poltawski
8ef18bda2b Merge branch 'MDL-46092' of git://github.com/timhunt/moodle 2016-04-20 22:20:35 +01:00
Tim Hunt
de2fec2e9a MDL-46092 bootstrapbase: add OU quiz styling
It is a nicer default to have in Moodle that what we had before.
2016-04-20 15:43:34 +01:00
Dan Poltawski
17883c016b Merge branch 'wip-MDL-52642-master' of git://github.com/abgreeve/moodle 2016-04-20 13:30:38 +01:00
Dan Poltawski
795adc89af Merge branch 'MDL-52490_master' of https://github.com/dmonllao/moodle 2016-04-20 12:38:15 +01:00
Dan Poltawski
d6c8570f55 Merge branch 'MDL-53095-master' of git://github.com/lameze/moodle 2016-04-20 11:49:50 +01:00
Dan Poltawski
913dcb1b81 Merge branch 'MDL-53451-master-fixup' of https://github.com/FMCorz/moodle 2016-04-20 11:28:55 +01:00
Dan Poltawski
4ee37fe04b Merge branch 'wip-MDL-53798-master' of https://github.com/marinaglancy/moodle 2016-04-20 11:09:48 +01:00
Frederic Massart
d789158566 MDL-53451 tool_lpmigrate: Fixing broken logic found in tests
Thanks to MSSQL, the only one with failures.
2016-04-20 17:52:09 +08:00
Dan Poltawski
ab64fe91fc Merge branch 'wip-MDL-51354_master' of https://github.com/cdsmith-umn/moodle 2016-04-20 10:33:23 +01:00
Dan Poltawski
ad2382730e Merge branch 'MDL-53309_master-second-attempt' of git://github.com/dmonllao/moodle 2016-04-20 10:27:57 +01:00
David Monllao
15a813cda2 Merge branch 'MDL-53599' of git://github.com/nhoobin/moodle 2016-04-20 16:38:57 +08:00
David Monllao
6870e1fa77 Merge branch 'MDL-53757_master' of git://github.com/markn86/moodle 2016-04-20 15:52:57 +08:00
Frederic Massart
4fd183d3c3 MDL-53451 competency: Hook for scale_used used undefined variable 2016-04-20 15:44:01 +08:00
Frederic Massart
0abaf33e00 MDL-53451 competency: Fixing database errors on Oracle
- Random ordering caused by absence of ORDER BY clause
- Invalid query statemennt due to wrong string concatenation
- Cannot GROUP BY with CLOB columns
2016-04-20 15:44:01 +08:00
Andrew Nicols
eb91deaa85 Merge branch 'MDL-51603-dataformat-MDL-34925-user-download' of https://github.com/brendanheywood/moodle 2016-04-20 14:45:44 +08:00
David Monllao
ba44323329 MDL-51603 dataformat: Removing subsystem from the list 2016-04-20 14:41:28 +08:00
David Monllao
a5acf308ae Merge branch 'MDL-51603-dataformat' of https://github.com/brendanheywood/moodle
Conflicts:
	lib/tests/component_test.php
2016-04-20 12:37:05 +08:00
David Monllao
65f9001d31 Merge branch 'MDL-48089-master' of git://github.com/danpoltawski/moodle 2016-04-20 12:24:07 +08:00
David Monllao
18641bf6e1 Merge branch 'MDL-48506_master' of git://github.com/markn86/moodle 2016-04-20 11:54:38 +08:00
Nick Phillips
7bdc3ba6e6 MDL-53757 core_calendar: always show whole day's events in 'day' view 2016-04-20 11:34:19 +08:00