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
84,455 Commits 36 Branches 519 Tags
Commit Graph

84455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
2c69d24037 Merge branch 'MDL-58898-master' of https://github.com/xow/moodle 2017-05-12 12:32:23 +08:00
John Okely
081aad9986 MDL-58898 oauth: Cover orphaned linked logins in unit tests 2017-05-12 12:26:39 +08:00
John Okely
4c8727bad6 MDL-58898 oauth: Remove orphaned linked logins 2017-05-12 12:18:17 +08:00
Jun Pataleta
0e01f68e3c Merge branch 'MDL-58899-master' of https://github.com/snake/moodle 2017-05-12 12:00:52 +08:00
Jake Dallimore
5ffe41b6c5 MDL-58899 auth: improve lang strings for confirmation failures in oauth 2017-05-12 11:45:36 +08:00
David Monllao
3227ac8374 Merge branch 'MDL-58774-master-fix' of git://github.com/andrewnicols/moodle 2017-05-12 11:07:42 +08:00
Andrew Nicols
d9d2c2f86f Merge branch 'MDL-58904' of git://github.com/stronk7/moodle 2017-05-12 10:22:19 +08:00
Andrew Nicols
95dd5e3bd6 MDL-58774 auth_oauth2: Only check unexpired accounts for same issuer 
It shoudl be possible to link multiple OAuth2 sources which have the
same e-mail address to an account.

This patch makes the check for an existing linked account stricter so
that it only checks for linked account records which match the same
issuer, and which do not have expired confirmation tokens.
 2017-05-12 09:44:48 +08:00
Eloy Lafuente (stronk7)
f86e8699b9 MDL-58904 backup: old backups do not contain new fields 
Hence we need to apply DB defaults for them when missing:

  - type = 0
  - timesort = null
 2017-05-11 19:55:21 +02:00
Dan Poltawski
bcf69a655a MDL-58837 js: fix jsdoc error 2017-05-11 14:29:11 +01:00
Dan Poltawski
a1c6871bb3 Merge branch 'wip-MDL-58837-master' of git://github.com/marinaglancy/moodle 2017-05-11 14:26:33 +01:00
Marina Glancy
88a7f77525 MDL-58837 course: do not confirm deleting empty sections 2017-05-11 18:48:08 +08:00
Marina Glancy
f24e17c93e MDL-58837 course: allow to add multiple sections 2017-05-11 18:48:04 +08:00
Jake Dallimore
e84fefdb09 Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle 2017-05-11 11:41:48 +08:00
Eloy Lafuente (stronk7)
3a7afbe9cb Merge branch 'MDL-58874-master' of https://github.com/xow/moodle 2017-05-10 13:31:24 +02:00
Dan Poltawski
e838654b4e Merge branch 'MDL-58877-master-enfix' of git://github.com/mudrd8mz/moodle 2017-05-10 12:01:08 +01:00
Helen Foster
0d86195e8d MDL-58877 lang: Merge English strings from the en_fix language pack 
Significant string changes:

* loginerror_cannotcreateaccounts in auth_oauth2 - more understandable
  error message
* config_keep_groups_and_groupings and config_keep_roles_and_enrolments
  in core_backup - switch fix
 2017-05-10 12:24:36 +02:00
Dan Poltawski
ef1a227e38 Merge branch 'wip-MDL-58867-master' of git://github.com/marinaglancy/moodle 2017-05-10 11:16:19 +01:00
John Okely
0ac1dcd8d1 MDL-58874 icons: Change the icon for grade in course completion report 2017-05-10 15:38:40 +08:00
John Okely
cf7ac86858 MDL-58874 icons: use table for grades icon in grader report 2017-05-10 15:34:45 +08:00
Marina Glancy
cd2c4b8548 MDL-58867 calendar: avoid fatal errors for non-module events 2017-05-10 14:26:14 +08:00
Cameron Ball
79b80ee540
MDL-58777 core: Remove redundant refresh events tasks 
There were 4 instances of the calendar refresh events task being
queued, which is redundant as we now have the "one true task" to
fix the events table, and it needs to be run for everybody.
 2017-05-10 14:16:13 +08:00
David Monllao
cb04995b30 Merge branch 'MDL-58833-master' of git://github.com/andrewnicols/moodle 2017-05-10 14:07:46 +08:00
David Monllao
a5ea94d85f Merge branch 'MDL-58843-master-exchandler' of git://github.com/mudrd8mz/moodle 2017-05-10 14:05:51 +08:00
Dan Poltawski
fd8d1648a7 Merge branch 'MDL-58836-master' of git://github.com/damyon/moodle 2017-05-10 06:56:42 +01:00
David Monllao
265a1eafc5 Merge branch 'MDL-58857-master' of git://github.com/andrewnicols/moodle 2017-05-10 13:50:10 +08:00
Cameron Ball
9eb5a0417c
MDL-58777 mod_assign: Remove unnecessary upgrade step 
This upgrade step was setting the priority field for assign events
in the events table. This is redundant since we queue a task to
refresh all events.

This patch also removes a redundant refresh_events task that is
queued from assign.
 2017-05-10 13:41:18 +08:00
Cameron Ball
56d1ddd775
MDL-58777 mod_assign: Explicitly sort records and set event priority 
The assign update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.

There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).
 2017-05-10 13:41:18 +08:00
Cameron Ball
8dada7e334
MDL-58777 mod_lesson: Explicitly sort records and set event priority 
The lesson update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.

There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).
 2017-05-10 13:41:18 +08:00
Cameron Ball
4133df6fd6
MDL-58777 mod_quiz: Explicitly sort records and set event priority 
The quiz update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.

There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).
 2017-05-10 13:41:18 +08:00
Cameron Ball
9c98546da6
MDL-58777 core: Use component_callback in refresh events task 
Previously we did not require the lib.php files for each module
in this ad-hoc task, which meant that the *_refresh_events functions
would only be called if some lucky sequence of events led to the
lib.php file for the module being required.

Instead we should use the component_callback function which can handle
that stuff automagically.
 2017-05-10 13:41:18 +08:00
Andrew Nicols
865e2bc7dc Merge branch 'MDL-58780-master' of git://github.com/junpataleta/moodle 2017-05-10 11:48:40 +08:00
David Monllao
396ae85082 Merge branch 'MDL-58774-master' of git://github.com/damyon/moodle 2017-05-10 10:43:58 +08:00
Damyon Wiese
4f705f5d0d MDL-58774 auth_oauth2: Prevent duplicate linked logins 2017-05-10 10:17:56 +08:00
Eloy Lafuente (stronk7)
675ffb4d05 Merge branch 'wip-MDL-58854-master' of git://github.com/marinaglancy/moodle 2017-05-10 02:09:02 +02:00
Dan Poltawski
b16603770b Moodle release 3.3rc2 v3.3.0-rc2 2017-05-09 12:42:23 +01:00
Dan Poltawski
ac1a8f7de1 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-05-09 12:42:19 +01:00
Jun Pataleta
834da9a30f Merge branch 'MDL-58860-master' of git://github.com/jleyva/moodle 2017-05-09 17:05:39 +08:00
Dan Poltawski
cd501e12c6 Merge branch 'MDL-58853' of git://github.com/stronk7/moodle 2017-05-09 09:17:47 +01:00
Juan Leyva
b50ff71052 MDL-58860 mod_lesson: Fix get_attempts_overview for no attempts 
WS get_attempts_overview was failing when there weren’t attempts in the
given assignment.
 2017-05-09 10:03:39 +02:00
Andrew Nicols
a011effb49 MDL-58857 admin: Terminate the session if a major upgrade is required 2017-05-09 15:00:00 +08:00
David Mudrák
8a9785a036 MDL-58843 core: Do not expect a particular class of the thrown exception 
Since PHP 7, the custom exception handlers are also called to handle
thrown Errors which are not Exceptions.
 2017-05-09 08:41:41 +02:00
Andrew Nicols
381db2fe8d Merge branch 'MDL-58822-master' of git://github.com/ryanwyllie/moodle 2017-05-09 13:55:20 +08:00
Ryan Wyllie
a1ded17074 MDL-58822 backup: backup and restore new event columns 2017-05-09 05:48:40 +00:00
Ryan Wyllie
9e452e35d0 MDL-58822 backup: backup and restore user override events 2017-05-09 05:48:40 +00:00
Jake Dallimore
977a01c334 Merge branch 'MDL-56251_master-fix2' of https://github.com/markn86/moodle 2017-05-09 13:13:58 +08:00
Mark Nelson
6bee596079 MDL-56251 format_weeks: do not overwrite end date for pre 3.3 backups 2017-05-09 12:44:48 +08:00
Jun Pataleta
b5c24c99a0 MDL-58780 mod_assign: Remove AS keyword in table alias 
* The AS keyword is not recognised by Oracle for table aliases.
This is okay with other databases, but optional, so better to
remove it.
 2017-05-09 11:58:00 +08:00
Marina Glancy
947f5c3448 MDL-58854 theme_boost: override templates for columns 2017-05-09 10:36:16 +08:00
Eloy Lafuente (stronk7)
254d2cf46e MDL-58853 versions: main version bump 2017-05-09 03:00:48 +02:00