mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-26 19:03:38 +02:00
Code Issues Projects Releases Wiki Activity
85,557 Commits 37 Branches 536 Tags
Commit Graph

85557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
f4cc24ca64 Merge branch 'MDL-59671-master' of git://github.com/lameze/moodle 2017-08-08 11:46:51 +08:00
Simey Lameze
c34e200241 MDL-59671 core_calendar: action events edition needs to be on module 2017-08-08 11:44:27 +08:00
Simey Lameze
1106040a4d MDL-59671 core_calendar: add visibility logic to template 2017-08-08 11:44:19 +08:00
Simey Lameze
4df03a279a MDL-59671 core_calendar: check if the event can be deleted 2017-08-08 11:44:11 +08:00
Simey Lameze
6fb751562a MDL-59671 core_calendar: move logic to calendar event exporter 2017-08-08 11:44:03 +08:00
David Monllao
9eebb3c38b Merge branch 'MDL-59448-master' of https://github.com/xow/moodle 2017-08-08 04:25:06 +02:00
David Monllao
e8e53efba8 Merge branch 'MDL-58889-master' of https://github.com/xow/moodle 2017-08-08 04:23:31 +02:00
Andrew Nicols
286a38eeaa Merge branch 'MDL-59700-master' of git://github.com/cameron1729/moodle 2017-08-08 10:12:35 +08:00
John Okely
8b0e965d30 MDL-59448 boost: Make info colour accessible and match default primary 2017-08-08 08:37:46 +08:00
John Okely
2fd7cdbe83 MDL-58889 boost: Use underline links in footer 
It's impossible to gain the right colour contrast against a dark footer
using the same primary colour that gets 4.5 against white.
 2017-08-08 08:34:15 +08:00
Andrew Nicols
a72e7d4974 Merge branch 'MDL-59725-master' of https://github.com/xow/moodle 2017-08-08 08:30:33 +08:00
Eloy Lafuente (stronk7)
9af66ed103 Merge branch 'MDL-59614-master' of git://github.com/junpataleta/moodle 2017-08-08 01:48:35 +02:00
Eloy Lafuente (stronk7)
a0d85e1828 Merge branch 'MDL-59506-master' of git://github.com/andrewnicols/moodle 2017-08-07 19:55:19 +02:00
Eloy Lafuente (stronk7)
d4c8235f87 Merge branch 'MDL-59638_master' of git://github.com/dmonllao/moodle 2017-08-07 19:48:17 +02:00
Dan Poltawski
9ebc67f4a2 Merge branch 'MDL-59172-master' of https://github.com/snake/moodle 2017-08-07 16:20:11 +01:00
David Monllao
bfdc340061 Merge branch 'MDL-59642-master' of git://github.com/andrewnicols/moodle 2017-08-07 14:41:32 +02:00
David Monllao
d5a99c450a MDL-59116 analytics: Add rangeindex field to predict_samples index 2017-08-07 12:39:20 +02:00
Dan Poltawski
7cb60527f4 Merge branch 'MDL-59666-master' of git://github.com/junpataleta/moodle 2017-08-07 09:31:34 +01:00
Cameron Ball
03756f0bdb
MDL-59700 filestorage: Rework repositories to avoid add_file_to_pool 
For historical reasons repositories need to call add_file_to_pool
to sync file records. However now that a before_file_created hook
has been added additional information is needed by add_file_to_pool.

Ideally add_file_to_pool and friends will become private/protected,
so we need to remove all uses of it in core.

This patch adds some new methods to the file class to allow syncing
to be managed internally by the file and the file_storage class.
 2017-08-07 15:50:15 +08:00
Dan Poltawski
3d3be6ec05 Merge branch 'MDL-59116_master' of git://github.com/dmonllao/moodle 2017-08-07 08:45:01 +01:00
David Monllao
db208667a3 Merge branch 'MDL-59532-master' of git://github.com/jleyva/moodle 2017-08-07 09:42:08 +02:00
David Monllao
8f2cee482d Merge branch 'MDL-59644-master' of git://github.com/lameze/moodle 2017-08-07 09:34:36 +02:00
David Monllao
bfaf47e168 Merge branch 'wip-MDL-59655-master' of git://github.com/marinaglancy/moodle 2017-08-07 09:27:38 +02:00
David Monllao
21e68c5ff1 Merge branch 'MDL-59656_master' of git://github.com/markn86/moodle 2017-08-07 09:26:03 +02:00
David Monllao
0370931076 Merge branch 'wip-MDL-59055-master' of git://github.com/marinaglancy/moodle 2017-08-07 09:21:21 +02:00
Andrew Nicols
53ce3e4f74 Merge branch 'MDL-59727-master' of git://github.com/junpataleta/moodle 2017-08-07 14:51:19 +08:00
Andrew Nicols
2101612b10 Merge branch 'MDL-51745-master' of https://github.com/jebarviabb/moodle 2017-08-07 14:47:31 +08:00
David Monllao
7643d75af0 Merge branch 'MDL-59734-master' of git://github.com/andrewnicols/moodle 2017-08-07 08:31:24 +02:00
Andrew Nicols
ab96699e52 Merge branch 'MDL-59726-master' of git://github.com/junpataleta/moodle 2017-08-07 14:28:23 +08:00
Josh Ebarvia
79189e975c MDL-51745 mod_lesson: Use format_text in response feedback 2017-08-07 15:53:11 +09:30
David Monllao
68c406ffdd Merge branch 'MDL-59668_master' of git://github.com/markn86/moodle 2017-08-07 08:22:01 +02:00
Andrew Nicols
c9d781d207 Merge branch 'MDL-59665_master' of git://github.com/dmonllao/moodle 2017-08-07 13:53:19 +08:00
Andrew Nicols
36f207ec43 Merge branch 'MDL-59662-errors-typo' of https://github.com/lucaboesch/moodle 2017-08-07 13:34:42 +08:00
Jun Pataleta
85437c91f8 MDL-59614 course: Behat tests for activity navigation 
Part of MDL-59313.
 2017-08-07 13:29:31 +08:00
David Monllao
00da1e6010 MDL-59116 analytics: Multiple predictions for each analysable time range 
Now we only predict using the most recent range available, this means
that if someone upgrades to moodle 3.4 at three quarters of a course
we will only calculate the latest range, previous ranges were not
displayed anyway once more recent predictions were available.

This commit deletes all previous predictions :) this shouldn't be a
problem in master as we don't provide any guarantee, the alternative
(retrive sampleids from mdl_files) would have been slow and a waste of
time as well as require horrible code in an upgrade step (text fields
do not accept defaults nor we can use NOTNULL).
 2017-08-07 06:56:11 +02:00
Andrew Nicols
a41ef5ece5 Merge branch 'MDL-59698-master' of git://github.com/damyon/moodle 2017-08-07 12:43:42 +08:00
Andrew Nicols
ab202d9247 Merge branch 'MDL-59728-boost-question-bank-header-align' of https://github.com/lucaboesch/moodle 2017-08-07 12:36:38 +08:00
Cameron Ball
8243706542
MDL-59700 filestorage: Add before_file_created hook 2017-08-07 12:27:04 +08:00
Andrew Nicols
aca995a2f4 Merge branch 'MDL-59206-master' of git://github.com/damyon/moodle 2017-08-07 11:35:26 +08:00
John Okely
5918f31e32 MDL-58889 boost: Make text and link colours AA compliant 
We have to choose a colour that is 4.5:1 against white and 3:1 against
the text colour. I darkened the link colour somewhat and darkened the
text colour
 2017-08-07 11:14:00 +08:00
Jun Pataleta
e004de157c MDL-59727 core_user: Fix Behat tests for bulk enrolment test 2017-08-07 10:49:07 +08:00
Jun Pataleta
f156e3dd92 MDL-59726 behat: Fix Behat tests affected by the new participants filter 2017-08-07 10:04:54 +08:00
Andrew Nicols
5bc4c797a7 MDL-59506 core_lock: use a null lock during install 
Use a different lock factory during installation which does not actually
lock at all.
 2017-08-07 09:59:44 +08:00
Damyon Wiese
fe9965e305 MDL-59055 grades: behat test 2017-08-07 09:57:52 +08:00
Marina Glancy
20060b3b2e MDL-59055 grades: provide backward-compatibility of changes 2017-08-07 09:56:14 +08:00
Marina Glancy
be85f0cf88 MDL-59055 grades: fix bug displaying item id instead of grade 
Thanks to Marcelo Santos for initial patch
 2017-08-07 09:56:14 +08:00
Andrew Nicols
ed7431a37b MDL-59734 auth_ldap: Fix role sync 
The unit tests were failing because the upgrade step was missed.
In addition, there was a typo in a variable name, which meant that the
role was not actually synchronised.
 2017-08-07 09:42:24 +08:00
Jake Dallimore
4d068a6708 MDL-59172 user: user_can_view_profile() now checks viewalldetails cap 2017-08-07 09:27:04 +08:00
John Okely
5d9e7abbaf MDL-59725 assignsubmission_file: Don't use click interface in behat 2017-08-07 09:25:46 +08:00
John Okely
29b31865d7 MDL-59725 assignsubmission_file: Improve accepted types string 2017-08-07 09:25:20 +08:00