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

4080 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
b878578d90 Merge branch 'MDL-61252-master' of git://github.com/andrewnicols/moodle 2018-01-23 02:13:10 +01:00
Andrew Nicols
caa9cb7124 MDL-61252 mod_quiz: Fix ambiguous behat check 2018-01-23 08:21:22 +08:00
Eloy Lafuente (stronk7)
a610100586 Merge branch 'MDL-61077' of git://github.com/timhunt/moodle 2018-01-22 02:26:04 +01:00
Tim Hunt
bccad386b0 MDL-61077 question stats: make calculations more robust 2018-01-15 16:07:57 +00:00
David Monllao
f4a30c5fdf Merge branch 'MDL-41090_rebased' of https://github.com/andrewhancox/moodle 2018-01-15 15:52:29 +01:00
Andrew Hancox
f3d9872aa3 MDL-41090 questions: Allow embedding files in response comments 2018-01-15 11:19:06 +00:00
Juan Leyva
01a79b4e86 MDL-60908 mod_quiz: Return question state only when configured 
The question state should be returned following the quiz review options
settings.
 2018-01-09 16:54:32 +08:00
David Monllao
b5e7264543 Merge branch 'MDL-61107' of git://github.com/timhunt/moodle 2018-01-02 08:34:39 +01:00
David Monllao
ce37a8cc7e MDL-51089 mod_quiz: Hide first page last node 2017-12-28 10:15:08 +01:00
David Monllao
f108433bcb Merge branch 'MDL-50246-master' of https://github.com/lucaboesch/moodle 2017-12-27 17:54:57 +01:00
Tim Hunt
d2e1aa76e1 MDL-61107 quiz editing: handle invalid Maximum grade input 2017-12-22 13:35:29 +00:00
Luca Bösch
4bfcdfed4e MDL-50246 quiz: Add selected questions to quiz btn disabled 0 selected 2017-12-22 09:25:12 +01:00
Luca Bösch
11f2cec1ac MDL-51089 quiz: "Add" menu in edit quiz more keyboard accessible 2017-12-22 09:23:07 +01:00
David Monllao
d41203c55f Merge branch 'MDL-61045' of git://github.com/timhunt/moodle 2017-12-19 06:43:17 +01:00
Simey Lameze
7a1a9ec635 MDL-57431 mod_quiz: remove unnecessary class from selector 2017-12-19 12:47:43 +08:00
Eloy Lafuente (stronk7)
dc3f4ac929 Merge branch 'MDL-60750-master' of git://github.com/lameze/moodle 2017-12-19 00:56:14 +01:00
Eloy Lafuente (stronk7)
10d22cceb5 Merge branch 'MDL-56932-master' of git://github.com/lameze/moodle 2017-12-18 11:40:17 +01:00
Damyon Wiese
2d08e6565a Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle 2017-12-18 12:51:33 +08:00
Tim Hunt
06b4ab81a8 MDL-61045 quiz settings: add back missing disabledIf 
This got broken in Moodle 2.1 by MDL-20636.
 2017-12-15 13:11:57 +00:00
Simey Lameze
3bf572411a MDL-56932 theme_boost: fix quiz max mark input height 2017-12-13 10:21:17 +08:00
Mathew May
aa6b85d2b7 MDL-57431 mod_quiz: Quiz editing help icon fix 2017-12-12 09:56:05 +08:00
Simey Lameze
97f4556a94 MDL-60750 mod_quiz: only apply form css rules on clean theme 2017-12-11 16:56:06 +08:00
Luca Bösch
41d335f31a MDL-60920 quiz: removed legacy "edit questions" button 2017-12-08 14:13:05 +01:00
Eloy Lafuente (stronk7)
e4eba4c346 MDL-59159 upgrade: clean < 3.1.0 upgrade steps 
LTS (3.5) requires previous LTS (3.1)

This just deletes all the upgrade steps previous to 3.1.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.

Also includes an upgrade step to prevent upgrading from any
version < 2016052300 (v3.1.0) as anti-cheating measure.

Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
 2017-12-04 01:18:57 +01:00
Eloy Lafuente (stronk7)
8c9eecdea7 Merge branch 'MDL-60682' of git://github.com/timhunt/moodle 2017-11-28 20:37:59 +01:00
Jun Pataleta
012398a8c2 Merge branch 'MDL-54693-quiz-override-help-icon' of https://github.com/lucaboesch/moodle 2017-11-28 20:10:08 +13:00
Damyon Wiese
bdb157653b Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle 2017-11-28 11:38:40 +08:00
sam marshall
a938e4096c MDL-60174 core_dml: fix miscellaneous incorrect recordset usage 
The new recordset support for Postgres requires transactions and
will cause errors if recordsets are not closed correctly. This
commit fixes problems that were identified during unit tests, and
via some basic code analysis, across all core code. Most of these
are incorrect usage of recordset (forgetting to close them).
 2017-11-27 11:10:33 +00:00
Luca Bösch
b4fcf278c2 MDL-54693 quiz: Info for attempts allowed in user and group override. 2017-11-23 19:11:11 +01:00
Luca Bösch
99618f89bf MDL-27230 quiz: remove and update group overrides in calendar 2017-11-23 16:42:20 +01:00
Tim Hunt
223419d92c MDL-60682 forms: date/times should use step 1 minute by default 2017-11-21 14:50:28 +00:00
Eloy Lafuente (stronk7)
6499085f36 MDL-60784 upgrade: add 3.4.0 separation line to all upgrade scripts 2017-11-12 18:43:30 +01:00
Eloy Lafuente (stronk7)
ba854606e6 MDL-60764 versions: bump all versions and requires near release 
version = 2017111300 release version
requires= 2017110800 current rc2 version
 2017-11-10 02:52:53 +01:00
David Monllao
29adfbc3c8 Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle 2017-11-08 15:56:25 +01:00
Jun Pataleta
7a2300fd82 Merge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle 2017-11-08 14:43:15 +13: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
Jake Dallimore
5243e93661 Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle 2017-11-07 16:03:43 +08:00
David Monllao
aa30dc8860 MDL-59256 analytics: Respect activities specific access conditions 2017-11-07 08:14:53 +01: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
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
Ryan Wyllie
478b1d194f MDL-60062 calendar: remove validate_event_timestart callback 2017-11-07 01:25:33 +00:00
Ryan Wyllie
9aac9f7074 MDL-60062 quiz: add support for drag drop of calendar events 2017-11-07 01:25:32 +00:00
Jun Pataleta
a56833d49d Merge branch 'MDL-60611' of git://github.com/stronk7/moodle 2017-11-07 10:14:24 +13:00
Eloy Lafuente (stronk7)
801a372dad MDL-60611 phpunit: switch to namespaced phunit classes 2017-11-02 23:45:34 +01:00
Damyon Wiese
5dbd051502 Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle 2017-11-02 14:39:32 +08:00
Jake Dallimore
9daa5874a0 Merge branch 'MDL-60607' of git://github.com/timhunt/moodle 2017-10-31 12:57:36 +08:00
Tim Hunt
ade8dd5d08 MDL-60607 quiz reports: catch separate groups & user has no group case 2017-10-30 17:57:30 +00:00
Tim Hunt
eefa2c88e0 MDL-60607 quiz reports: move duplicate code to superclass method 2017-10-30 13:43:36 +00:00
Tim Hunt
dae0ccfc45 MDL-59606 quiz responses: fix edge cases in the report 
This patch conbines valuable contributions from Kashmira Nagwekar and
Luca Bösch. Many thanks to them. However, the final form of the fix,
and hence the blame, falls to me -- Tim.

There were several issues here:

* The load_questions_usages_by_activity method in
  question/engine/datalib.php was incorrectly treating the case
  when no data was returned. (Looks like a historic copy-pase from
  other methods that fetch one item by unique id, which therefore
  must exist.)

* The report was not correctly handling the display when the 'Which
  tries' was set to 'with, and without, attempts'.

* It was possible to select the 'All tries' option when also saying
  'Users without attempts'. This combination makes not sense, so
  a disabledIf rule was added to the form.
 2017-10-27 16:57:01 +01:00