mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
79,886 Commits 36 Branches 523 Tags
Commit Graph

79886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Hunt
d0f8daef12 MDL-55815 quiz review: after close should beat immediately after 
This only arises in specific situations: student submitted less than 2
mintues before time close, or when a teacher previews after the close
date. However, in those cases, the old behaviour was confusing. Now,
'After the quiz is closed' takes priority.
 2016-08-31 12:55:21 +01:00
Tim Hunt
daf6becfb0 MDL-55815 quiz: convert attempt state tests to a data provider 2016-08-31 12:54:18 +01:00
Dan Poltawski
35d5053ba2 weekly release 3.2dev 2016-08-25 16:07:36 +01:00
Dan Poltawski
05fd5c4d34 MDL-55072 tests: work around reset bug 2016-08-25 16:04:42 +01:00
Dan Poltawski
4c0385d5db weekly release 3.2dev 2016-08-25 12:09:35 +01:00
Dan Poltawski
bcec0c3e0c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-08-25 12:09:33 +01:00
Dan Poltawski
baa5375a0c Merge branch 'MDL-55127_master-fix-everything' of git://github.com/dmonllao/moodle 2016-08-25 10:26:21 +01:00
David Monllao
fa90f52986 MDL-55127 mod_data: Search entries fixes 
- If the database contains has than 4 valid fields all fields from the 4th one
  to the last one will be merged into the 4th one so we index all entry contents
- get_content_value now receives the whole data_content record as fields may need
  other values than just the content to prepare the value
- phpunit database generator changes to separate checkboxes from radio buttons options
  and to separate multimenu options from menu options
 2016-08-25 16:50:15 +08:00
Dan Poltawski
c52d34b255 Merge branch 'MDL-55320-master-fix2' of https://github.com/lameze/moodle 2016-08-25 08:07:31 +01:00
Simey Lameze
787a4da9f1 MDL-55320 core: Add generaltable class to chart data table 2016-08-25 14:38:36 +08:00
David Monllao
195288fb97 Merge branch 'wip-mdl-55072-fix' of git://github.com/rajeshtaneja/moodle 2016-08-25 10:58:01 +08:00
Rajesh Taneja
cb5949e3f0 MDL-46514 behat: Get config value from db, to avoid cache 2016-08-25 10:33:32 +08:00
Rajesh Taneja
6c1cc55d92
MDL-55072 behat: Cache themesuite and theme contexts 2016-08-25 09:17:38 +08:00
Rajesh Taneja
14f3abee2e
MDL-55072 behat: Changed option to run-with-theme 2016-08-25 08:36:08 +08:00
AMOS bot
587089a516 Automatically generated installer lang files 2016-08-25 00:05:02 +08:00
Dan Poltawski
c46077284a Merge branch 'MDL-55320-fix' of https://github.com/lameze/moodle 2016-08-24 08:20:57 +01:00
Simey Lameze
21575ea31c MDL-55320 theme: remove unnecessary styling 2016-08-24 14:27:39 +08:00
Andrew Nicols
8497f5ece9 Merge branch 'MDL-55127_master-fix-requires' of git://github.com/dmonllao/moodle 2016-08-24 14:04:07 +08:00
David Monllao
70003837db MDL-55127 mod_data: Adding missing required classes 2016-08-24 13:57:44 +08:00
Rajesh Taneja
3037458049 MDL-55072 behat: Fixed behat_selectors to be removed from contexts 2016-08-24 13:24:34 +08:00
David Monllao
4b5e0c542a MDL-55604 cache: Updating comment according to code changes 2016-08-24 09:39:15 +08:00
David Monllao
086ef7d418 Merge branch 'MDL-55604' of https://github.com/mr-russ/moodle 2016-08-24 09:35:39 +08:00
David Monllao
30daa61475 Merge branch 'wip-mdl-55072' of https://github.com/rajeshtaneja/moodle 2016-08-24 09:26:29 +08:00
Russell Smith
7ff43e1acf MDL-55604 cache: Fix identifier and cacheable_object 
When a cachable object is store in the static cache from
the backing store, it was incorrect serialised rather than
using the wake function.  This has been resolved and tests added.

During the investigation into cacheable_object, it was discovered
that set_identifiers never removes identifiers when you call it,
so set_identifiers(array('a')) and set_identifiers(array('b')) really
resulted in array('a','b') as the identifiers rather than 'b'.

The fix for this issue depends on the set_identifiers fix and
they have been coupled together as a result.
 2016-08-24 11:26:20 +10:00
Rajesh Taneja
b4bc4286bb
MDL-55072 behat: Allow behat_selectors to be overridden 
if theme/tests/behat/behat_theme_{THEME_NAME}_behat_selectors.php
file exits, and has class with same file name then we will
call behat_theme_{THEME_NAME}_behat_selectors::register_moodle_selectors()
to register theme specific selectors. If they are different
then core then they will override
 2016-08-24 09:13:13 +08:00
Rajesh Taneja
5aa9b5cee3
MDL-55072 behat: Added support for overriding theme tests 2016-08-24 08:57:15 +08:00
David Monllao
bae868b903 Merge branch 'MDL-55385_master' of https://github.com/marxjohnson/moodle 2016-08-24 08:24:21 +08:00
Dan Poltawski
28b606819b Merge branch 'MDL-55628-master' of https://github.com/sammarshallou/moodle 2016-08-23 15:48:11 +01:00
Dan Poltawski
13b3bf6cd5 MDL-55423 tests: remove non-cross-db testcase 
This isn't used in moodle core and is problematic on oracle, don't test
it.
 2016-08-23 12:36:28 +01:00
Mark Johnson
e1093c7fa8 MDL-55385 output: Support non-integer output_buffering values 2016-08-23 11:19:04 +01:00
Dan Poltawski
7c085e1a2d Merge branch 'wip-MDL-55127_master' of https://github.com/dg711/moodle 2016-08-23 11:12:46 +01:00
Andrew Nicols
f71df007d1 MDL-46654 mod_forum: Reduce complexity of closure 2016-08-23 16:17:07 +08:00
Dan Poltawski
3f92140fc8 Merge branch 'wip-mdl-46514' of https://github.com/rajeshtaneja/moodle 2016-08-23 08:59:24 +01:00
David Monllao
86d6ff2dc8 Merge branch 'MDL-46654-master' of git://github.com/andrewnicols/moodle 2016-08-23 15:30:54 +08:00
Dan Poltawski
0969f0da5b Merge branch 'MDL-48773_m32v1' of https://github.com/sbourget/moodle 2016-08-23 08:18:16 +01:00
Rajesh Taneja
bdcd90b2f3
MDL-46514 behat: section should be set before switch-case 2016-08-23 15:14:39 +08:00
Rajesh Taneja
0c1bcb63c6
MDL-46514 behat: Catch php errors in shutdown hook 
If error is not displayed in web browser then
it will be caught in shutdown hook, so we can
show it to user
 2016-08-23 15:14:38 +08:00
David Monllao
132b75d067 Merge branch 'MDL-55391-master' of git://github.com/danpoltawski/moodle 2016-08-23 13:24:29 +08:00
David Monllao
bab59f1c08 Merge branch 'MDL-54838-master' of https://github.com/nashtechdev01/moodle 2016-08-23 12:42:52 +08:00
sam marshall
5c2ef08fa3 MDL-55628 Completion: Use simpledata for completion cache 
The completion cache is currently not marked as simpledata. On the
course page it is frequently retrieved hundreds of times which results
in many calls to the slow unserialize function. By making a slight
change to the data format (using arrays instead of objects) we can
mark it as simpledata, which will avoid using unserialize.
 2016-08-22 17:13:36 +01:00
Dan Poltawski
080f292ed7 Merge branch 'MDL-55273-cookie-secure-default' of https://github.com/brendanheywood/moodle 2016-08-22 15:25:15 +01:00
Dan Poltawski
c1d5d922a8 Merge branch 'MDL-55320-master' of git://github.com/lameze/moodle 2016-08-22 15:20:17 +01:00
Dan Poltawski
42def6ef5c Merge branch 'MDL-55565-master' of https://github.com/snake/moodle 2016-08-22 14:22:38 +01:00
Dan Poltawski
4ac1bb2f34 Merge branch 'MDL-55605-lesson-restore-bug' of https://github.com/kenneth-hendricks/moodle 2016-08-22 14:13:26 +01:00
Dan Poltawski
74a53156d6 Merge branch 'MDL-55551_m32v1' of https://github.com/sbourget/moodle 2016-08-22 12:53:31 +01:00
Dan Poltawski
293857b5eb Merge branch 'MDL-55557_m32v1' of https://github.com/sbourget/moodle 2016-08-22 12:45:18 +01:00
Dan Poltawski
6f9f149b04 MDL-44712 scorm: make upgrade match install.xml defintion 2016-08-22 12:40:03 +01:00
Andrew Nicols
8381ac52cd MDL-46654 mod_forum: Remove irrelevant digest/subscribe options 
If the user cannot subscribe, there is no point showing the digest options.
 2016-08-22 19:12:20 +08:00
Andrew Nicols
d6c05ad1f1 MDL-46654 mod_forum: Hide digestoptions when no subscription 
Daily digest options should not be generated if the user cannot subscribe
to anything in the first place.
 2016-08-22 19:06:06 +08:00
Dan Poltawski
cfbba4a94c Merge branch 'MDL-54864-master' of https://github.com/snake/moodle 2016-08-22 11:19:32 +01:00