Commit graph

77964 commits

Author SHA1 Message Date
Dan Poltawski
ef67e6c5f8 Merge branch 'MDL-53412-master' of git://github.com/merrill-oakland/moodle 2016-03-21 08:57:22 +08:00
David Monllao
7960ad0571 Merge branch 'MDL-53509-master' of git://github.com/andrewnicols/moodle 2016-03-21 08:42:58 +08:00
David Monllao
e787e681fc Merge branch 'MDL-49934-master' of git://github.com/jleyva/moodle 2016-03-21 08:39:15 +08:00
Brendan Heywood
6aec2748ee MDL-53262 inboundmessage: Fix inconsistent confirm From vs email body 2016-03-20 15:51:42 +11:00
Brendan Heywood
d4274a5f2b MDL-53315 inboundmessage: Add support for IMAP Namespaces 2016-03-20 15:50:09 +11:00
dg711
c55494fef7 MDL-53207 message: display stock pic for msg from\to unreal user 2016-03-19 23:36:41 +05:30
Pau Ferrer Ocaña
176bcaa928 MDL-53409 question: Add tests for core_question_update_flag 2016-03-18 15:08:22 +01:00
Pau Ferrer Ocaña
7361b9682e MDL-53409 question: New WS core_question_update_flag 2016-03-18 15:08:17 +01:00
sam marshall
f3474e2216 MDL-53548 Accessibility: Block show/hide keyboard access broken 2016-03-18 13:44:50 +00:00
Juan Leyva
48abca7996 MDL-53034 mod_quiz: New WS mod_quiz_get_quiz_feedback_for_grade 2016-03-18 09:56:31 +01:00
Juan Leyva
3e5c19a0ed MDL-52888 mod_quiz: New Web Service mod_quiz_view_attempt_review 2016-03-18 09:50:06 +01:00
Juan Leyva
d9ef6ae0c2 MDL-52888 mod_quiz: New Web Service mod_quiz_view_attempt_summary 2016-03-18 09:49:29 +01:00
Juan Leyva
899983ee58 MDL-52888 mod_quiz: New Web Service mod_quiz_view_attempt 2016-03-18 09:27:43 +01:00
Mark Nelson
93af6a610e MDL-48012 tool_recyclebin: multiple changes before integration
- Added new icon for the recycle bin.
- Fixed issue where the course expiry setting was being used to display
  the expiry messages in the category bin.
- Fixed failing Behat tests.
- Tidied Behat tests.
  - General tidy up.
  - Deleted three Behat feature files.
    - Deleted 'delete_confirmation.feature' as it's testing JS functionality
      that was removed (see comment further down). The 'basic_functionality.feature'
      now tests deleting an activity and a course.
    - Deleted 'description.feature' and added the tested functionality to
      'basic_functionality.feature'.
    - Deleted 'logs_test.feature' and moved testing to PHPUnit tests.
  - Added another scenario for restoring a course.
- Removed protected mod settings - it was discussed that this was not a necessary
  feature. We should not be treating the recycle bin as a backup.
- Renamed events to conform to guidelines.
- Wrote new PHPUnit tests for events.
- Tidied up existing PHPUnit tests and extended them.
- Alphabetised lang file.
- Made changes to strings and string identifiers in the lang file and changed usages in code.
- Changed setting names to better identify their purpose.
- Renamed classes and file names so it's easier to identify their purpose.
- Renamed the 'deleted' column to 'timecreated' for consistency with other
  Moodle tables, and to easily identify what the value represents.
- Changed the columns 'category' and 'course' to 'categoryid' and
  'courseid' respectively.
- Changed the name of the table indexes for consistency with core.
- Removed module.js and any use of it and replaced with Moodle core libraries
  for JS confirmation.
- Removed 'noevent' argument in delete_item().
- Removed unnecessary capabilities - we can use the same capabilties for both
  recycle bins based on the context the capability was given.
- Removed '_' in the capability definitions to keep it consistent with core.
- Set page layout and headings for index.php - varies between the course and
  category recycle bins.
- Deleted styles.css and centred columns using the flexible_table API.
- Fixed IDE and codechecker complaints.
- Made use of the files API, rather than writing directly to
  "$CFG->dataroot . '/recyclebin'".
- Used make_temp_directory rather than expecting it to exist.
- Replaced debugging function calls with calls to the backup API to
  display errors.
- Deleted the temporary backup file after a successful restore, or if it fails.
- If the restore fails for a course, delete the course we created.
- Removed unnecessary '\' characters when not in namespace.
- Used configduration class for expiry times in the settings.
- Cleanup course bin when a course is deleted.
- Cleanup a category bin when a category is deleted.
- Removed unnecessary throw tags.
- Changed default settings.
2016-03-18 14:12:08 +08:00
Grigory Baleevskiy
53754839d2 MDL-52978 core_lib: fixed wrong days showing for dates in datepicker 2016-03-18 12:29:58 +08:00
David Monllao
8f8517ec1f MDL-53543 cache: Invalidate grade_categories by event
We can switch the cache to session level if we are able to purge
different users caches, not only the one that belongs to the user
updating a grade category.
2016-03-18 10:02:05 +08:00
Adrian Greeve
30f4e2d305 MDL-53465 lib: Upgrade PHPMailer to 5.2.14 2016-03-18 09:32:39 +08:00
Adrian Greeve
1549528a67 MDL-53458 lib: Upgrade Mustache.js to 2.2.1 2016-03-18 09:31:49 +08:00
Adrian Greeve
f9c2f88e39 MDL-53457 lib: Upgrade Mustache to 2.10.0 2016-03-18 09:30:56 +08:00
Adrian Greeve
dba57f8d6e MDL-52619 lib: Update of ADODB to 5.20.3 2016-03-18 09:29:22 +08:00
Marina Glancy
372a92a7dc MDL-50941 mod_feedback: change default legnth for shorttext to 255 2016-03-18 08:18:54 +08:00
Marina Glancy
eb97811bee MDL-52760 forms: notify form changes in autocomplete element 2016-03-18 08:16:55 +08:00
Marina Glancy
67fc782fe8 MDL-53274 core: in AJAX throw exception if page context was not set 2016-03-18 08:08:50 +08:00
Marina Glancy
21d9596cca MDL-53254 tags: tags management inplace editable 2016-03-18 08:07:19 +08:00
Marina Glancy
352bfbf55c MDL-53254 tags: tag collections inplace editable 2016-03-18 08:07:19 +08:00
Marina Glancy
131b78b9a7 MDL-53254 tags: tag areas inplace editable 2016-03-18 08:07:19 +08:00
Marina Glancy
5e9b2eda3c MDL-45274 mod_feedback: show heading on non-respondents page 2016-03-18 07:56:50 +08:00
Marina Glancy
4832a0b3dd MDL-53227 mod_feedback: merge files complete_guest.php and complete.php
Simplify access check, add behat tests
2016-03-18 07:54:59 +08:00
Juan Leyva
3589b6591a MDL-52868 mod_quiz: New Web Service mod_quiz_get_attempt_review 2016-03-17 17:15:52 +01:00
Juan Leyva
98e6869088 MDL-52863 mod_quiz: New Web Service mod_quiz_process_attempt 2016-03-17 16:49:40 +01:00
Juan Leyva
4911b5b254 MDL-52863 mod_quiz: Move processattempt.php code to new API 2016-03-17 16:49:39 +01:00
Eloy Lafuente (stronk7)
fed66ad9e2 weekly release 3.1dev 2016-03-17 14:00:25 +01:00
Eloy Lafuente (stronk7)
9ea396b8bd Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-03-17 14:00:20 +01:00
Brendan Heywood
9c489dbcc4 MDL-53357 admin: Don't break urls after saving admin settings 2016-03-17 21:42:15 +11:00
David Monllao
8454494abc Merge branch 'm31_MDL-48680_Add_Score_Status_Events' of git://github.com/scara/moodle 2016-03-17 16:34:44 +08:00
Eric Merrill
5dc4624ced MDL-53412 search: Correctly handle Solr over SSL 2016-03-17 01:13:15 -04:00
David Monllao
5a3ddfd2e2 Merge branch 'wip-mdl-46891-m' of git://github.com/rajeshtaneja/moodle 2016-03-17 12:45:47 +08:00
Rajesh Taneja
8c66773dac MDL-46891 behat: Allow replacing string in profile for parallel run
Adding a replace with run process in profile
should be allowed
2016-03-17 12:20:22 +08:00
David Monllao
01f4ea8cce MDL-53239 grader report: Add all names to error msg 2016-03-17 10:57:57 +08:00
Dan Poltawski
922c611ff4 Merge branch 'MDL-51374_multiple-connections' of git://github.com/dmonllao/moodle 2016-03-17 10:50:06 +08:00
Dan Poltawski
6f1cd967b5 Revert "MDL-52133 mod_assign: Pass userid param when saving grade"
This reverts commit b2b4f7c485.
2016-03-17 09:31:08 +08:00
Andrew Nicols
48a9ef9e96 MDL-53509 mod_forum: Stop over-escaping quoted variables
{{# quote }}<a href=\"foo\">{{/ quote }}

becomes:

    "<a href=\\"foo\\">"

This causes a mustache syntax error.

The quote helper negates the need to escape quotes in normal use, e.g.:

    {{# quote }}<a href="foo">{{/ quote }}

which instead becomes:

    "<a href=\"foo\">"
2016-03-17 08:33:48 +08:00
Matteo Scaramuccia
beafa1c376 MDL-48680 mod_scorm: Fixed the missing keys when updating a record.
Thanks to Rajesh Taneja for his testing.
2016-03-16 23:39:16 +01:00
Juan Leyva
bdf1ac2796 MDL-52924 mod_assign: New WS mod_assign_get_submission_status 2016-03-16 17:23:20 +01:00
Juan Leyva
3216f6160b MDL-52924 mod_assign: Move renderables creation to methods 2016-03-16 17:23:19 +01:00
David Monllao
a696bb9ebd MDL-51374 dml: Identifying the cache with connection data 2016-03-16 17:17:39 +08:00
David Monllao
94ffadcdcd Merge branch 'MDL-52788-master' of git://github.com/jleyva/moodle 2016-03-16 14:47:07 +08:00
Andrew Nicols
3e9cf4f941 Merge branch 'MDL-52821-master-fix' of github.com:xow/moodle 2016-03-16 13:53:57 +08:00
David Monllao
f18561a2e2 MDL-51374 dml: simpledata to temp_tables cache 2016-03-16 13:43:36 +08:00
John Okely
a7be136f20 MDL-52821 lti: Remove summary from unit test 2016-03-16 13:24:22 +08:00