mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-01 06:22:39 +01:00
Code Issues Projects Releases Wiki Activity
84,657 Commits 36 Branches 523 Tags
4cc2f33b08
Commit Graph

84657 Commits

Author SHA1 Message Date
Josh Ebarvia
0a0e2843fd MDL-58795 gradereport_grader: Prevent duplicates in grader report 
Currently, the sorting being used for the grader report table
(asc/desc arrows) is just the grade_grades.finalgrade.
This adds grade_grades.userid in the sort to prevent duplicate
in records returned when using pages.
 2017-05-16 18:29:24 +09:30
Jake Dallimore
8e123642e7 Merge branch 'MDL-58723-master' of git://github.com/junpataleta/moodle 2017-05-16 15:15:04 +08:00
Jun Pataleta
4eec39e2b2 MDL-58723 calendar: Better testing of forever recurring events 
* Change the start date of the parent event to the current date
  for tests that with events that recur forever.
* Limit query results to 100 for events that recur forever that can
  generate more than 100 event records.
 2017-05-16 14:39:53 +08:00
Andrew Nicols
1d52a56e48 Merge branch 'MDL-58756-statslib-roles-multilang' of https://github.com/lucaboesch/moodle 2017-05-16 13:52:05 +08:00
Luca Bösch
4bd112e4de MDL-58756 stats: Use multilang with role. 2017-05-16 07:29:09 +02:00
Dmitrii Metelkin
597c6f2a09 MDL-58811 backup: fix an extra slash on restore for the legacy files 2017-05-16 14:35:16 +10:00
David Monllao
8a0d6655f2 Merge branch 'MDL-58884-master' of git://github.com/StudiUM/moodle 2017-05-16 10:41:41 +08:00
Jake Dallimore
9f13573c43 Merge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle 2017-05-16 09:57:05 +08:00
sam marshall
ec5ec9bce5 MDL-58947 Search: Label URLs not correctly calculated 2017-05-15 17:45:45 +01:00
AMOS bot
eaf052890f Automatically generated installer lang files 2017-05-16 00:06:43 +08:00
Dan Poltawski
5ff3609556 Merge branch 'MDL-58929-master' of git://github.com/ankitagarwal/moodle 2017-05-15 12:07:13 +01:00
Dan Poltawski
52836e3c73 Merge branch 'MDL-58936_master' of git://github.com/markn86/moodle 2017-05-15 11:45:17 +01:00
Dan Poltawski
ca4f5a68bc Merge branch 'MDL-58496-master' of git://github.com/cameron1729/moodle 2017-05-15 11:14:19 +01:00
Dan Poltawski
6dbfda8109 Merge branch 'MDL-58916-master' of https://github.com/xow/moodle 2017-05-15 11:01:13 +01:00
Dan Poltawski
4010466614 Merge branch 'MDL-58841-master' of git://github.com/cameron1729/moodle 2017-05-15 10:46:00 +01:00
Dan Poltawski
a4cc28017f Merge branch 'MDL-58852-choice-chart-options-multilang' of https://github.com/lucaboesch/moodle 2017-05-15 10:23:02 +01:00
Dan Poltawski
bbc9e4f540 Merge branch 'MDL-58932' of git://github.com/stronk7/moodle 2017-05-15 08:57:09 +01:00
Andrew Nicols
86ef13916d Merge branch 'MDL-58893-master-missing-div' of https://github.com/dmitriim/moodle 2017-05-15 15:12:38 +08:00
Andrew Nicols
ffd795ab95 Merge branch 'MDL-58920-calculated-question-edit-name-multilang' of https://github.com/lucaboesch/moodle 2017-05-15 13:57:04 +08:00
Dmitrii Metelkin
f62497ce8e MDL-58893 portfolio: add missing closing div 2017-05-15 15:53:21 +10:00
Mark Nelson
004dcb4f58 MDL-58936 core: ensure 'page->context' is not null 
When using $page->context it calls magic_get_context() in lib/pagelib.php.
This method sets the context to context_system::instance() if it is currently
null and returns that as the context. However, when installing a new site
context_system::instance() also returns null.
 2017-05-15 12:29:15 +08:00
Ankit Agarwal
b5eff76621 MDL-58929 converters: Make link title consistent 2017-05-15 09:45:09 +05:30
John Okely
40ca0bd914 MDL-58916 user_profile: Pass site context when determining menu options 2017-05-15 12:12:54 +08:00
Eloy Lafuente (stronk7)
1820d0bb6d MDL-58932 backup: Bump release to 3.4 2017-05-15 00:43:40 +02:00
Luca Bösch
46470ad02c MDL-58852 choice: Use multilang for choice options in charts 2017-05-14 21:31:10 +02:00
Luca Bösch
06147c5ab3 MDL-58920 questions: Calculated question name passing multilang. 
In "Shared wild cards" table calculated question name do pass format_string to process multilang tags.
Thus, not breaking the layout any more.
 2017-05-14 21:30:18 +02:00
Eloy Lafuente (stronk7)
17fb1d84a2 weekly back-to-dev release 3.4dev 2017-05-14 11:53:28 +02:00
Eloy Lafuente (stronk7)
8f568743d7 NOBUG: Change travis.yml back to master 2017-05-14 11:46:35 +02:00
Eloy Lafuente (stronk7)
b87a580aa3 Moodle release 3.3 v3.3.0 2017-05-14 11:46:35 +02:00
Eloy Lafuente (stronk7)
206da19cd8 NOBUG: Change travis.yml to MOODLE_33_STABLE 2017-05-14 11:46:34 +02:00
AMOS bot
5c3287d5d8 Automatically generated installer lang files 2017-05-14 00:04:26 +08:00
AMOS bot
cc9857b71a Automatically generated installer lang files 2017-05-13 00:04:20 +08:00
Dan Poltawski
49fa410dd1 Moodle release 3.3rc3 v3.3.0-rc3 2017-05-12 10:02:41 +01:00
Dan Poltawski
f0cba09e16 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-05-12 10:02:40 +01:00
Dan Poltawski
4f3962e4b4 Merge branch 'MDL-58904-master-fix' of https://github.com/snake/moodle 2017-05-12 15:49:02 +08:00
Jake Dallimore
c0af95d789 MDL-58904 restore: temp fix for event priority notices 2017-05-12 15:10:23 +08:00
Jun Pataleta
ae9da6a222 Merge branch 'MDL-58905_master' of git://github.com/dmonllao/moodle 2017-05-12 14:57:49 +08:00
David Monllao
56fb39316f MDL-58905 auth_oauth2: Return if no issuers allow login 2017-05-12 14:52:07 +08:00
David Monllao
ac8a0c4077 MDL-58905 auth_oauth2: Add plugin enabled checkings 2017-05-12 14:36:01 +08:00
David Monllao
011591a148 MDL-58905 auth_oauth2: No linked accounts if the plugin is not enabled 2017-05-12 14:36:01 +08:00
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
Damyon Wiese
95e13556df MDL-58908 auth_oauth2: Don't kill gravatar 
If gravatar is enabled, don't update profile pictures.
 2017-05-12 11:43:47 +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