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

87027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jake Dallimore
eaa43a132c Merge branch 'MDL-60700-master' of git://github.com/ryanwyllie/moodle 2017-11-07 14:23:50 +08:00
Damyon Wiese
81aa5e196f MDL-59758 core_user: Clean up user renderer 
These functions are not used anywhere by anything.
 2017-11-07 14:18:54 +08:00
Damyon Wiese
b5b81de3d6 MDL-59758 core_user: Replace old bulk actions 
The participants page has some clunky multi page forms for bulk actions. Replaces it with an ajax alternative.
 2017-11-07 14:18:49 +08:00
Ryan Wyllie
f0fc8a194a MDL-60700 calendar: remove bottom margin for description in summary 2017-11-07 06:03:01 +00:00
Andrew Nicols
03561ea899 Merge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle 2017-11-07 13:49:47 +08:00
Ryan Wyllie
6688ae2ba2 MDL-60062 calendar: prevent drag and drop of override events 2017-11-07 05:47:18 +00:00
Jake Dallimore
b44bc9bf6c Merge branch 'MDL-60686-master' of git://github.com/damyon/moodle 2017-11-07 13:39:33 +08:00
Damyon Wiese
65c52e05d1 MDL-58699 mod_quiz: Require javascript for popup 
If any of the access rules require the attempt to open in a new window, assume we
require javascript to attempt the quiz. This makes it harder to bypass the javascript
pseudo security restrictions.
 2017-11-07 12:48:21 +08:00
Damyon Wiese
1ccc9f1953 Merge branch 'MDL-60590_master-fix' of git://github.com/markn86/moodle 2017-11-07 11:59:49 +08:00
Damyon Wiese
efe2681894 MDL-57772 chat: BEEP is back baby! 2017-11-07 11:25:02 +08:00
Mark Nelson
e3a6d44845 MDL-60590 core_enrol: fixed failing Behat scenarios 2017-11-07 11:24:34 +08:00
Damyon Wiese
8aa01fcf61 Merge branch 'MDL-60671-master' of https://github.com/sammarshallou/moodle 2017-11-07 11:05:43 +08:00
Jake Dallimore
8072eb1384 Merge branch 'MDL-60705-master' of https://github.com/sammarshallou/moodle 2017-11-07 10:50:53 +08:00
Damyon Wiese
b9ae53f86b MDL-59758 js: auto_rows module easier to use 
Allow passing the direct text area, or a container.
Trigger change events on the text area, not the container.
Properly handle starting with rows > 1
 2017-11-07 10:36:13 +08:00
Damyon Wiese
5616a31987 MDL-60686 core_users: Reorder filters by utility 
Order the list of filters on the participant page from most useful to least useful.
 2017-11-07 10:12:45 +08:00