17519 Commits

Author SHA1 Message Date
Dan Poltawski
17ac1b5349 Merge branch 'MDL-30811-master' of git://github.com/andrewnicols/moodle 2016-02-29 13:43:53 +08:00
Andrew Nicols
372d6b923b MDL-30811 core: Replace use of continue_button with redirect 2016-02-29 09:05:58 +08:00
Andrew Nicols
d954b54f9e MDL-30811 forum: Update use of redirect to include message and type 2016-02-29 09:05:57 +08:00
Andrew Nicols
a31d1e5726 Merge branch 'wip-MDL-52397-master' of git://github.com/abgreeve/moodle 2016-02-29 08:33:41 +08:00
Adrian Greeve
50c734e8a5 MDL-52397 mod_assign: Unit tests for feedback plugins.
Testing that the new method is_feedback_modified() works
as it should with the standard plugins.
2016-02-24 15:09:27 +08:00
Adrian Greeve
238c05c23c MDL-52397 mod_assign: Added new method to feedback plugins.
Added a method to the feedback plugins to check if feedback
has been modified. This allows for a more accurate record
of when the grade has been modified.
2016-02-24 15:09:08 +08:00
Dan Poltawski
fef5360053 Merge branch 'MDL-42460-master' of git://github.com/marinaglancy/moodle 2016-02-23 14:36:54 +00:00
David Monllao
c625b01a4c MDL-31989 mod_survey: Prevent templates from being indexed 2016-02-23 19:58:52 +08:00
David Monllao
69d66020ce MDL-31989 search: get_config method to search areas
Also content_to_text moved to weblib.
2016-02-23 10:47:59 +00:00
David Monllao
e2be996171 MDL-31989 search: New search areas
Some search areas have been introduced as part of the initial search API
and search engine API implementation.
- Forum posts
- Glossary enties
- All moodle activities
2016-02-23 10:47:57 +00:00
Andrew Nicols
bde3e8c5d1 Merge branch 'MDL-49338' of git://github.com/timhunt/moodle 2016-02-23 13:32:00 +08:00
Andrew Nicols
7bf992cccb Merge branch 'wip-MDL-53129-master' of https://github.com/marinaglancy/moodle 2016-02-23 13:22:49 +08:00
Marina Glancy
42756192d7 MDL-53129 mod_feedback: forms cleanup and behat tests 2016-02-23 13:17:21 +08:00
Eloy Lafuente (stronk7)
a4a44e2c27 Merge branch 'MDL-52806' of git://github.com/timhunt/moodle 2016-02-22 23:04:43 +01:00
Eloy Lafuente (stronk7)
153fbcd24a Merge branch 'MDL-53065' of git://github.com/timhunt/moodle 2016-02-22 23:01:04 +01:00
Michael Milette
89e68e6c1e MDL-42460 mod_feedback: Fix markup validation 2016-02-22 22:41:32 +08:00
Tim Hunt
293f5d1b11 MDL-53065 quiz redo question: avoid PHP notice in edge case
When selecting the variant of the new question, we need to add the
new question to the usage before trying to select a variant.

Also, we need to acutally use the selected variant number!
2016-02-19 12:10:39 +00:00
Tim Hunt
a10bd0d9a8 MDL-52806 quiz manual grading: show right answer for auto-graded Qs 2016-02-19 12:06:24 +00:00
Tim Hunt
de3b803dea MDL-49338 quiz stats: preview urls wrong for question variants 2016-02-19 12:01:05 +00:00
Rajesh Taneja
2aacd415e1 MDL-50484 mod_lesson: Use group to add multiple radio inputs
https://docs.moodle.org/dev/lib/formslib.php_Form_Definition#radio
Radio input should be added in group and not individual, so
that each element created has unique id and template
2016-02-19 14:00:03 +08:00
Dan Poltawski
0b14d8612b Merge branch 'MDL-51214-master' of git://github.com/andrewnicols/moodle 2016-02-17 07:58:15 +00:00
Marina Glancy
7c5c80350c MDL-49807 mod_wiki: section detection regexp fix 2016-02-17 13:11:10 +08:00
Eloy Lafuente (stronk7)
45cb6145fb Merge branch 'MDL-51852-master' of git://github.com/andrewnicols/moodle 2016-02-17 02:03:48 +01:00
Andrew Nicols
a6fc917168 MDL-51852 mod_forum: Respect timed discussions in emails 2016-02-17 07:57:57 +08:00
Eloy Lafuente (stronk7)
c70d54405b Merge branch 'MDL-29506-master' of git://github.com/andrewnicols/moodle 2016-02-16 17:50:22 +01:00
Eloy Lafuente (stronk7)
8bd2db2023 Merge branch 'MDL-52997-email-threading' of https://github.com/brendanheywood/moodle 2016-02-16 17:11:10 +01:00
Dani Palou
85894eda01 MDL-52993 wiki: Add unit tests for wiki_user_can_edit
Note: amended on integration to fix some comments.
2016-02-16 16:44:41 +01:00
Dani Palou
bb05505e00 MDL-52993 wiki: Fix wiki_user_can_edit for collab and separate groups 2016-02-16 16:44:07 +01:00
Dan Poltawski
821296dc7b Merge branch 'MDL-52862_master' of https://github.com/juancs/moodle 2016-02-16 15:18:46 +00:00
Dan Poltawski
0aefe91c50 Merge branch 'MDL-52990-email-themes' of https://github.com/brendanheywood/moodle 2016-02-16 11:17:54 +00:00
Dan Poltawski
3a9cc98c80 Merge branch 'MDL-34160-forum-subject' of https://github.com/brendanheywood/moodle 2016-02-16 11:04:41 +00:00
Dan Poltawski
cfdc1bb0ca Merge branch 'MDL-52879' of git://github.com/timhunt/moodle 2016-02-16 10:26:57 +00:00
Eloy Lafuente (stronk7)
5d8dfdef1d Merge branch 'MDL-51929-master' of git://github.com/dpalou/moodle 2016-02-16 11:22:53 +01:00
Dan Poltawski
6bb1bd930f Merge branch 'MDL-49612-master' of git://github.com/dpalou/moodle 2016-02-16 09:30:12 +00:00
Dan Poltawski
d330eb4342 Merge branch 'master_MDL-50620' of https://github.com/danmarsden/moodle 2016-02-16 09:09:08 +00:00
Dani Palou
052da7304a MDL-51929 external: Apply new validate_courses to data/lti/survey 2016-02-16 08:26:07 +01:00
Brendan Heywood
efd420608e MDL-52990 email: Added site wide email mustache templates 2016-02-16 16:39:25 +11:00
David Monllao
7fadf9edff Merge branch 'MDL-52414_m31v7' of https://github.com/sbourget/moodle 2016-02-16 12:44:09 +08:00
Stephen Bourget
e6e5d0104f MDL-52414 Lesson: Fix lesson defaults 2016-02-15 23:05:37 -05:00
David Monllao
fb2d4baf57 MDL-51196 mod_forum: Updating required context vars 2016-02-16 11:22:29 +08:00
David Monllao
0511b81240 Merge branch 'MDL-51196-text-email-permalink' of https://github.com/brendanheywood/moodle 2016-02-16 11:17:20 +08:00
David Monllao
88acc87d8c MDL-51839 mod: Info about removing icon.gif files 2016-02-16 11:02:49 +08:00
David Monllao
11ce3ffccc Merge branch 'MDL-51839-master' of git://github.com/andrewnicols/moodle 2016-02-16 10:58:22 +08:00
Brendan Heywood
091420f9e6 MDL-34160 mod_forum: Add extra site and course vars to postmailsubject 2016-02-16 13:06:22 +11:00
Andrew Nicols
5ddf81cd27 MDL-51214 block_news_items: Rename to "Latest announcements" 2016-02-16 10:05:27 +08:00
Andrew Nicols
265a9bf769 MDL-51214 mod_forum: Update News forum => Announcements 2016-02-16 10:05:24 +08:00
Eloy Lafuente (stronk7)
be5955edf0 Merge branch 'MDL-52969-email-unsubscribe' of https://github.com/brendanheywood/moodle 2016-02-16 02:54:08 +01:00
David Monllao
44ad0f2c8d Merge branch 'MDL-51580' of git://github.com/stronk7/moodle 2016-02-16 05:03:28 +08:00
Eloy Lafuente (stronk7)
20c3e2c9fc MDL-51580 lang strings: Delete unused lang strings
With previous commit some lang strings became unused. As far as they
are not reusable we are deleting them plain and straight. This is the
list of strings, for reference:

- orphanedquestionscategory
- orphanedquestionscategoryinfo

- oauth2upgrade_message_small
- oauth2upgrade_message_subject
- oauth2upgrade_message_content

- apiv1migration_message_small
- apiv1migration_message_subject
- apiv1migration_message_content

- security_key_notice_message_small
- security_key_notice_message_subject
- security_key_notice_message_content

- pendingupgrades_message_small
- pendingupgrades_message_subject
- pendingupgrades_message_content
2016-02-15 18:38:21 +01:00
Eloy Lafuente (stronk7)
1405f010b7 MDL-51580 upgradelib: Delete stuff used by removed upgrade steps
This commits removes stuff from different upgradelib files, used
exclusively by the already deleted upgrade steps. Given such
exclusivity it was not needed to proceed with a 2-phase deprecation
as far as the functions were 100% internal to upgrade.

This is the list of deleted functions, all them docummented in their
corresponding upgrade.txt files:

- repository_picasa_admin_upgrade_notification();
- repository_googledocs_admin_upgrade_notification();
- repository_boxnet_admin_upgrade_notification();
- repository_alfresco_admin_security_key_notice();
- qtype_essay_convert_to_html();
- portfolio_picasa_admin_upgrade_notification();
- portfolio_googledocs_admin_upgrade_notification();
- portfolio_boxnet_admin_upgrade_notification();
- mod_book_migrate_moddata_dir_to_legacy();
- mod_book_migrate_all_areas();
- mod_book_migrate_area();
- mod_assignment_pending_upgrades_notification();
- upgrade_mysql_fix_unsigned_and_lob_columns();
- upgrade_course_completion_remove_duplicates();
- upgrade_save_orphaned_questions();
- upgrade_rename_old_backup_files_using_shortname();
- upgrade_mssql_nvarcharmax();
- upgrade_mssql_varbinarymax();
- upgrade_fix_missing_root_folders();
- upgrade_course_modules_sequences();
- upgrade_grade_item_fix_sortorder();
- upgrade_availability_item();
2016-02-15 18:38:21 +01:00