77458 Commits

Author SHA1 Message Date
Dan Poltawski
f6a0594e7e Merge branch 'MDL-52852-master' of git://github.com/jleyva/moodle 2016-03-21 17:27:20 +08:00
Dan Poltawski
121b46e033 Merge branch 'MDL-52830-master' of git://github.com/jleyva/moodle 2016-03-21 17:09:15 +08:00
Dan Poltawski
00a6c59936 MDL-52813 mod_quiz: bump version
Diverge from stable branching
2016-03-21 17:05:05 +08:00
Dan Poltawski
2569face4e Merge branch 'MDL-52813-master' of git://github.com/jleyva/moodle 2016-03-21 16:37:57 +08:00
Dan Poltawski
e372bb043e MDL-53260 cli: fix trailing whitespace 2016-03-21 15:23:37 +08:00
Dan Poltawski
c4173bb8ba Merge branch 'MDL-53260-master' of git://github.com/junpataleta/moodle 2016-03-21 15:14:23 +08:00
Jun Pataleta
830f8bc780 MDL-53260 upgrade: Make lang option default to the site language 2016-03-21 15:08:59 +08:00
Dan Poltawski
fd2cdbd2a7 Merge branch 'MDL-53407-editing-css' of https://github.com/Dagefoerde/moodle 2016-03-21 14:48:41 +08:00
Dan Poltawski
3a0b30c7c7 Merge branch 'MDL-52952-master' of https://github.com/xow/moodle 2016-03-21 14:44:15 +08:00
Dan Poltawski
5821479ef6 Merge branch 'MDL-53239_master' of git://github.com/dmonllao/moodle 2016-03-21 14:12:10 +08:00
Dan Poltawski
732d4f8318 Merge branch 'MDL-53315-imap-namespace' of https://github.com/brendanheywood/moodle 2016-03-21 14:01:46 +08:00
Dan Poltawski
3afc41ea95 Merge branch 'wip-mdl-53564' of https://github.com/rajeshtaneja/moodle 2016-03-21 13:37:00 +08:00
Nadav Kavalerchik
14aaa2d75b MDL-53260 upgrade: Option to display CLI upgrade messages in English 2016-03-21 11:59:50 +08:00
David Monllao
3357822d0c Merge branch 'MDL-52207-master' of git://github.com/cameron1729/moodle 2016-03-21 11:53:30 +08:00
Dan Poltawski
1829dedd0e Merge branch 'MDL-53262-verp-confirm-from-support' of https://github.com/brendanheywood/moodle 2016-03-21 11:37:35 +08:00
Cameron Ball
052141abc7 MDL-52207 upgradelib: Replace uses of Zend_Server_Reflection
Now that Zend has been removed we can only use native PHP reflection
methods.
2016-03-21 11:03:24 +08:00
Cameron Ball
b5e6ec4486 MDL-52207 libraries: Delete Zend framework
Let it RIP.
2016-03-21 11:02:55 +08:00
Dan Poltawski
ac3d7aacfc Merge branch 'MDL-53489' of git://github.com/timhunt/moodle 2016-03-21 11:02:03 +08:00
Rajesh Taneja
d242d4eb22 MDL-53564 behat: Fixed xpath to find social activity block 2016-03-21 10:17:44 +08:00
David Monllao
2904f66421 Merge branch 'MDL-49963' of https://github.com/andrewhancox/moodle 2016-03-21 10:04:29 +08:00
David Monllao
c111ef9718 Merge branch 'MDL-48012_master' of git://github.com/markn86/moodle 2016-03-21 09:41:09 +08:00
Dan Poltawski
d3c65e8c60 Merge branch 'MDL-53207' of https://github.com/dg711/moodle 2016-03-21 09:31:07 +08:00
David Monllao
b756bd551a Merge branch 'MDL-52924-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2016-03-21 09:25:19 +08:00
Dan Poltawski
52c6e158e0 Merge branch 'MDL-53548-master' of https://github.com/sammarshallou/moodle 2016-03-21 09:20:33 +08:00
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
sam marshall
f3474e2216 MDL-53548 Accessibility: Block show/hide keyboard access broken 2016-03-18 13:44:50 +00: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
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
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 b2b4f7c4853d1e38e3f6248a98a66afc4b801f48.
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