Commit Graph

19397 Commits

Author SHA1 Message Date
Adrian Greeve ede53ca719 MDL-57649 mod_lesson: Improvement to upgrade query.
We only need one record for each filearea that we
are removing.
2017-07-20 09:59:42 +08:00
Adrian Greeve 8c69d94957 MDL-57649 mod_lesson: Additional refinement to upgrade script. 2017-07-19 15:47:46 +08:00
David Monllao cab4f7efcb Merge branch 'wip-MDL-39471-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE 2017-07-18 10:49:25 +02:00
Dan Poltawski 9ee78ba22e Merge branch 'm33_MDL-59109_Backup_Missing_AutoCommit' of https://github.com/scara/moodle into MOODLE_33_STABLE 2017-07-18 09:45:23 +01:00
David Monllao fda4dac9a2 Merge branch 'wip-MDL-59377-33-3' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE 2017-07-17 11:05:15 +02:00
Dani Palou 7ebaf90cfe MDL-59068 lesson: Revert MDL-54849
MDL-54859 made the 'wrong jump' setting useless, since clicking 'No' always sends the user to the next page.
2017-07-17 10:09:58 +02:00
Dan Poltawski 3841028a98 Merge branch 'wip-MDL-57649-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE 2017-07-17 09:01:33 +01:00
David Monllao f00cf2b8cd Merge branch 'wip-MDL-55912-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE 2017-07-17 09:09:09 +02:00
Marina Glancy 17a4f1f382 MDL-59377 mod_label: set showdescription to be always 1 2017-07-17 13:44:20 +08:00
Andrew Nicols 57158d7df5 Merge branch 'mdl55979-moodle33' of https://github.com/tlock/moodle into MOODLE_33_STABLE 2017-07-17 12:29:30 +08:00
Adrian Greeve 2722f49fee MDL-39471 mod_assign: Comment visibility in blind marking.
Students can now see the identity of anyone making comments.
Markers on the otherhand can only see the identity of themselves
when making comments.
2017-07-17 09:25:55 +08:00
Adrian Greeve 4846429ebd MDL-55912 mod_assign: Set grader details to the correct user. 2017-07-17 09:22:29 +08:00
Adrian Greeve 93dbfb431c MDL-57649 mod_lesson: Delete answer files correctly.
The files associated with answers and responses were
not being deleted due to the fact that the wrong itemid
was being used.
2017-07-17 09:17:23 +08:00
Matteo Scaramuccia bea214a406 MDL-59109 scorm: Save autocommit setting in the backup. 2017-07-15 00:12:55 +02:00
Eloy Lafuente (stronk7) 5fbd782f16 Merge branch 'MDL-54965-33' of git://github.com/tobiasreischmann/moodle into MOODLE_33_STABLE 2017-07-11 13:41:43 +02:00
David Monllao 88e51d2279 Merge branch 'wip-MDL-59363-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE 2017-07-11 12:37:09 +02:00
Dan Poltawski cd8133b891 MDL-59287 upgrade.txt: avoid misleading versions 2017-07-11 11:29:44 +01:00
Dan Poltawski cc5590d73a Merge branch 'wip-MDL-59287-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE 2017-07-11 11:29:42 +01:00
Dan Poltawski 9054d6a40b Merge branch 'wip-MDL-40408-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE 2017-07-10 14:36:39 +01:00
David Monllao e5a2a8e148 Merge branch 'MDL-52501-m33' of https://github.com/NeillM/moodle into MOODLE_33_STABLE 2017-07-10 14:38:59 +02:00
Tobias Reischmann d251762b9e MDL-54965 mod_data: removed unused code in display_add_field()
Since the refactoring towards using the filepicker for file and picture
fields there are several variables, which are set but never read. Thus,
I removed them.
2017-07-10 14:15:23 +02:00
Tobias Reischmann de099c972a MDL-54965 mod_data: Init draft area for empty file/pic fields
When a file or picture field was added with existing records, these
records could not be saved, since the draft area was not created
properly.

Co-authored-by: Jérôme Mouneyrac <mouneyrac>
2017-07-10 14:15:23 +02:00
Adrian Greeve 2470f714b3 MDL-59287 calendar_events: Update modules to create all events.
All events equals all calendar events including completion events.
2017-07-10 09:41:21 +08:00
Neill Magill 5c4ace36c1 MDL-52501 assign: Fix group submissions without submission record
Based on work by Tim Lock <tim.lock@blackboard.com>

While upgrading to Moodle 2.8 or above it is possible for it to fail if
the site has multiple graded attempts for a user without an associated
submission record. This caused the upgrade to violate the databases
unique key rules.

This same issue could apply to a backup that was created of an
assignment that had this issue, when it is restored into Moodle 2.8 or
later.

This change adds the attempt number from the grade table into the query
that is inserting the new submission record (thanks to Tim). It also
moves the insert query before the latest flag is set on submission
records to ensure that only one has it, without this it is possible that
multiple submission records would be marked as the latest after an
upgrade or restore.
2017-07-06 15:29:01 +01:00
Eloy Lafuente (stronk7) c88b34c0fa Merge branch 'MDL-59398-33-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_33_STABLE 2017-07-05 11:52:27 +02:00
Helen Foster 05263df3b0 MDL-59398 lang: Merge English strings from the en_fix language pack 2017-07-05 09:31:39 +02:00
Ankit Agarwal 49371ca433 MDL-56565 forum: Add sitename as heading when there is nothing to display 2017-07-04 10:11:37 +08:00
Ankit Agarwal 5697a42fc2 MDL-56565 forum: Make sure userfullname is not disclosed 2017-07-04 10:11:37 +08:00
Simey Lameze 88d7acff69 MDL-59008 mod_resource: add option to serve external files embed 2017-07-03 13:45:40 +08:00
Mark Nelson 6b661ab0a2 MDL-56046 mod_quiz: do not close the sheet twice 2017-06-28 14:14:28 +08:00
Marina Glancy bd845341f4 MDL-59363 mod_workshop: user object must have alternative name fields 2017-06-28 11:37:29 +08:00
Eloy Lafuente (stronk7) 65e5e9f454 Merge branch 'MDL-57809-33-progressbar' of https://github.com/roperto/moodle into MOODLE_33_STABLE 2017-06-27 20:17:34 +02:00
Danny Jung 67c112bf9c MDL-59073 Workshop: Prevent submission without content or file 2017-06-27 17:05:35 +02:00
David Monllao 61812e3dd8 Merge branch 'wip-MDL-59308-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE 2017-06-27 16:42:33 +02:00
Eloy Lafuente (stronk7) aff28d6243 Merge branch 'MDL-59296-33' of git://github.com/crazyserver/moodle into MOODLE_33_STABLE 2017-06-27 11:40:03 +02:00
Josh Ebarvia 74823e4e45 MDL-49484 mod_lesson: Fix lesson page headers when editing 2017-06-24 05:23:52 +09:30
Pau Ferrer Ocaña 16f2fe5514 MDL-59296 data: Fix latlong field search 2017-06-23 09:15:35 +02:00
Daniel Thee Roperto e318be3772 MDL-57809 weblib: Added missing NO_OUTPUT_BUFFERING directive. 2017-06-23 09:43:32 +10:00
Marina Glancy 3d8a2c5cd9 MDL-59308 calendar: pass module context when known
this will protect us from exceptions when context for removed instance can not be retrieved
2017-06-22 16:01:33 +08:00
Marina Glancy 11438f4253 MDL-40408 mod_data: skip metadata fields during import 2017-06-14 11:32:24 +08:00
Dan Poltawski 5d7d2c0a45 Merge branch 'MDL-59171-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE 2017-06-13 14:40:45 +01:00
Eloy Lafuente (stronk7) ca1e040bbf Merge branch 'wip-MDL-58523-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE 2017-06-13 11:21:12 +02:00
Eloy Lafuente (stronk7) 9bcb6e1bec MDL-46322 database: alias sort fields to avoid ambiguous naming 2017-06-13 09:17:04 +01:00
Marina Glancy 9bdff1611b MDL-58523 mod_feedback: deleting response should reset completion 2017-06-13 14:36:24 +08:00
Jake Dallimore ca18b0c33d Merge branch 'MDL-51691-moodle33' of https://github.com/jebarviabb/moodle into MOODLE_33_STABLE 2017-06-13 10:32:45 +08:00
Eloy Lafuente (stronk7) 48b929667e Merge branch 'MDL-59032-33' of git://github.com/damyon/moodle into MOODLE_33_STABLE 2017-06-13 01:28:22 +02:00
Josh Ebarvia fe3d722d69 MDL-51691 assignsubmission_feedback: Fix delete comments 2017-06-13 08:35:25 +09:30
Eloy Lafuente (stronk7) 7041dc6f8a Merge branch 'MDL-59132-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE 2017-06-13 00:45:09 +02:00
Dan Poltawski c0f4b8b3c1 Merge branch 'mdl46322-moodle33' of https://github.com/AndresMelo/moodle into MOODLE_33_STABLE 2017-06-12 10:29:18 +01:00
Jake Dallimore 2c12e7f534 MDL-59042 upgrade: fix for non existent table in core upgrade.
Moved upgrade step to the assign mod where table is known to exist.
2017-06-12 15:26:03 +08:00