mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 09:00:30 +01:00
Code Issues Projects Releases Wiki Activity
87,042 Commits 36 Branches 527 Tags
Commit Graph

87042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sara Arjona
4bcb0a9a1d MDL-60550 user: Add more restrictions in keyword searches 
Original patch provided by Tim Schroeder.
 2017-11-09 16:29:29 +08:00
David Monllao
a4e0b7468c Merge branch 'MDL-60718-master' of git://github.com/sarjona/moodle 2017-11-09 09:27:01 +01:00
David Monllao
7fdcdc04ff Merge branch 'MDL-60615-master' of git://github.com/damyon/moodle 2017-11-09 08:48:48 +01:00
Damyon Wiese
bef5a8ca10 Merge branch 'MDL-60752-master' of git://github.com/andrewnicols/moodle 2017-11-09 15:08:11 +08:00
Damyon Wiese
246698e779 MDL-60615 imscc: string to array fix 
Sloppy typing in the imscc converter is causing errors on php7.1

Variable is initialised as a string and then used as an array.
 2017-11-09 15:05:36 +08:00
Jake Dallimore
4f3262fede Merge branch 'MDL-60753_master' of git://github.com/markn86/moodle 2017-11-09 14:47:23 +08:00
Andrew Nicols
f169f4fd21 MDL-60752 lti: Compare text in types_config properly 2017-11-09 14:25:51 +08:00
Mark Nelson
d48d1ba19a MDL-60753 report_competency: fixed dialogue failing to show 2017-11-09 14:11:24 +08:00
Jun Pataleta
7a571b813a Merge branch 'MDL-60628-master' of git://github.com/lameze/moodle 2017-11-09 17:08:46 +13:00
Simey Lameze
754016ab33 MDL-60628 calendar: amend web service unit test 2017-11-09 11:43:49 +08:00
Simey Lameze
10c17dcc10 MDL-60628 calendar: support category events on get_calendar_events ws 2017-11-09 11:29:07 +08:00
Andrew Nicols
5518a32de5 Merge branch 'MDL-60579-master-fix2' of https://github.com/damyon/moodle 2017-11-09 11:18:14 +08:00
Damyon Wiese
56f05f23c6 MDL-60579 user: Don't lose text filters 
When replacing a group filter with a different group filter - don't forget all the current text filters that have
been applied.
 2017-11-09 11:06:30 +08:00
Damyon Wiese
bb869f05e8 MDL-60579 user: Move defines into library 
Entry page user/index.php was defining constants that were used by the renderer.
This means the renderer was tied to user/index.php.
 2017-11-09 11:06:30 +08:00
Andrew Nicols
7cf4331a6f MDL-60579 user: Correct PARAM type for filters 
Damyon pointed out during the integration of this fixset, that the
PARAM type is incorrect.
 2017-11-09 10:07:13 +08:00
Andrew Nicols
762f8dc1db MDL-60579 user: Add missing case breaks 2017-11-09 09:07:34 +08:00
Andrew Nicols
a997dc9da5 MDL-60579 user: Correct search for strings 2017-11-09 09:07:21 +08:00
Andrew Nicols
446b21b512 MDL-60579 user: Check filter strings have correct part count 2017-11-09 09:07:02 +08:00
Andrew Nicols
3968d2ca7e MDL-60579 user: Prevent behat from interacting til setup complete 2017-11-09 09:05:22 +08:00
Sara Arjona
0c0d460e8b MDL-60718 analytics: Avoid duplicates for users with 2 enrolments 2017-11-08 19:12:59 +01:00
David Monllao
ed0e2cea00 Merge branch 'MDL-60732-master' of git://github.com/damyon/moodle 2017-11-08 17:48:07 +01:00
David Monllao
7effd6dd79 Merge branch 'MDL-60720-master' of https://github.com/sammarshallou/moodle 2017-11-08 17:27:15 +01:00
David Monllao
29adfbc3c8 Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle 2017-11-08 15:56:25 +01:00
David Monllao
4e73acf3cf Merge branch 'MDL-60579-master' of https://github.com/mihailges/moodle 2017-11-08 12:16:20 +01:00
David Monllao
fcafb22c22 MDL-60733 oauth: Remove outdated comment 2017-11-08 12:04:31 +01:00
David Monllao
6463a047a2 Merge branch 'MDL-60733-master' of git://github.com/damyon/moodle 2017-11-08 12:03:43 +01:00
David Monllao
ccf7578373 Moodle release 3.4rc2 v3.4.0-rc2 2017-11-08 09:47:39 +01:00
David Monllao
68ba214c65 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-11-08 09:47:38 +01:00
Damyon Wiese
a471bc4971 MDL-60732 core_user: Show group filters 
Always show the group filters, even if the course is in NO_GROUPS mode.
 2017-11-08 16:45:42 +08:00
Damyon Wiese
b6319f70bd Merge branch 'MDL-60590-master' of git://github.com/andrewnicols/moodle 2017-11-08 15:46:44 +08:00
Damyon Wiese
d3882ea4a3 MDL-60733 core: B/C for google_oauth 
The google_oauth class extends oauth2client which was modified to send "Accept" headers.

The "Accept" headers break picasa and could break any other plugin that was using google_oauth.
 2017-11-08 15:41:53 +08:00
Andrew Nicols
e759c9ed83 MDL-60590 enrol_manual: Fix for race condition in button calculation 2017-11-08 15:31:10 +08:00
Jun Pataleta
c9f995872f Merge branch 'MDL-60700-master-fix' of git://github.com/andrewnicols/moodle 2017-11-08 15:17:25 +13:00
Andrew Nicols
2e36c42625 MDL-60700 calendar: Update behat test or new normal 2017-11-08 10:13:20 +08:00
Jun Pataleta
7a2300fd82 Merge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle 2017-11-08 14:43:15 +13:00
AMOS bot
f3342e1010 Automatically generated installer lang files 2017-11-08 00:05:03 +00:00
David Mudrák
ea90412944 MDL-60717 lang: Reflect the string change in behat scenario file 2017-11-07 21:49:18 +01:00
Helen Foster
8d64443452 MDL-60717 lang: Merge English strings from the en_fix language pack 
Significant string changes:

- needbcmath,auth_ldap - 'grace logins' changed to 'expired password
  checking'
 2017-11-07 21:30:14 +01:00
sam marshall
4b0facc984 MDL-60720 core_search: Indexing halts on failed get_document 
The recordsets used for search indexing sometimes return results
which are invalid (e.g. cannot be found in database). When this
happens, the result in the iterator for the recordset will be
false. Due to a bug, the iterator used to stop when it encountered
a false value, which prevented indexing from getting past the
problematic record.

In addition, the iterator that skips future data resulted in the
current() function of its parent indicator being called twice per
entry, which meant that search indexing called get_document()
twice as many times.
 2017-11-07 16:36:37 +00:00
David Monllao
d6d2cec4a0 Merge branch 'MDL-59758_notes-fix' of git://github.com/dmonllao/moodle 2017-11-07 14:01:35 +01:00
David Monllao
57c9b7fc37 MDL-59758 user: Notes publish state adapted to ws 2017-11-07 13:53:21 +01:00
David Monllao
cae37299f3 Merge branch 'MDL-59758-master' of git://github.com/damyon/moodle 2017-11-07 12:37:30 +01:00
Mihail Geshoski
c835126185 MDL-60579 enrolments: Applied filters lost on certain actions 
AMOS BEGIN
    CPY [invalidrequest,enrol_lti],[invalidrequest,enrol]
AMOS END
 2017-11-07 16:17:00 +08:00
Jake Dallimore
5243e93661 Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle 2017-11-07 16:03:43 +08:00
Jake Dallimore
b135c42a17 Merge branch 'MDL-60700-int-fix-1' of github.com:ryanwyllie/moodle 2017-11-07 15:44:12 +08:00
Ryan Wyllie
ec8f488f30 MDL-60700 clean: add course link to activity event summary modal 2017-11-07 07:36:49 +00:00
David Monllao
aa30dc8860 MDL-59256 analytics: Respect activities specific access conditions 2017-11-07 08:14:53 +01:00
David Monllao
76f98c3bd5 MDL-59256 analytics: Move get_activities method to CoI scope 
CoI = community of inquiry model
 2017-11-07 08:14:49 +01:00
Jake Dallimore
7783fd0ec1 Merge branch 'MDL-57772-master' of git://github.com/damyon/moodle 2017-11-07 15:01:31 +08:00
Damyon Wiese
a6943ebb59 MDL-59758 core_user: Pluralise bulk actions 
Don't say 1 people.
 2017-11-07 14:39:04 +08:00