Commit Graph

7320 Commits

Author SHA1 Message Date
Ankit Agarwal 70c72e6623 MDL-50595 tool_lp: Make configure scale popup pretty 2016-04-18 10:58:33 +08:00
Ankit Agarwal ca536a4f81 MDL-50590 tool_lp: Fix error with scale popup 2016-04-18 10:58:32 +08:00
Damyon Wiese 7e8d4dac9b MDL-50308 tool_lp: Big javascript cleanup
This includes:
* Move all JS modules from lib/amd to admin/tool/lp/amd
* Add all jsdocs
* fix all jshint warnings
* Rewrite the actionmenu wrapper to a real amd module
2016-04-18 10:58:32 +08:00
Adrian Greeve d629323f72 MDL-50262 outcomes: Added scales and scale configuration.
Competency frameworks can now specify a scale to determine
proficiency.
2016-04-18 10:58:32 +08:00
Mark Nelson 9408e77eca MDL-49462 tool_lp: added unit tests for additional web services 2016-04-18 10:58:32 +08:00
Mark Nelson e90c24d09d MDL-49462 tool_lp: general bug fixes and tidy up 2016-04-18 10:58:32 +08:00
Mark Nelson 54c5a739dc MDL-49462 tool_lp: added template competencies page 2016-04-18 10:58:32 +08:00
David Monllao 24546ef21b MDL-49460 tool_lp: Some unit tests for plans crud 2016-04-18 10:58:32 +08:00
David Monllao 4db373d5cb MDL-49460 tool_lp: Adding user learning plans
Basic CRUD skeleton with external functions.
2016-04-18 10:58:32 +08:00
Damyon Wiese d9a39950b2 MDL-49459 Learning plans: Support for creating and editing competency frameworks.
This includes an API (\tool_lp\competency_api), a set of web services, unit tests for the web services and a nice UI built as an admin tool.
2016-04-18 10:58:32 +08:00
Ramindu Deshapriya 4d08decb77 MDL-52708 core_admin: Added Behat test to automate MDLQA-8190 2016-04-15 00:04:57 +05:30
Damyon Wiese 11c16f5fc8 MDL-53772 externallib: Deprecate external_function_info() 2016-04-14 15:07:41 +08:00
Eric Merrill e214f22f39 MDL-53795 logging: Add DB index for use when backing up logs 2016-04-12 21:44:15 -04:00
Dan Poltawski 6ff935c206 Merge branch 'MDL-53674-master-eventmsg' of git://github.com/mudrd8mz/moodle 2016-04-11 14:29:14 +01:00
Dan Poltawski 5702a8289b Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle 2016-04-11 09:52:40 +01:00
David Mudrák db1d5b104b MDL-53674 event monitor: Do not send HTML as plain text formatted emails
There were two problems here.

* The $msgdata->fullmessage was always formatted as HTML even if the
  $msgdata->fullmessageformat was set to the original template's format.
* The plain text part of the emailed message contained HTML code.

The patch makes sure that the original template is always formatted into
HTML and then converted to plain text before setting the text/plain
multipart of the sent email.
2016-04-08 15:14:23 +02:00
Rajesh Taneja 921faad9ad MDL-53571 behat: Use Escaper for escaping
xpathLiteral has been depreacted, use Escaper instead
2016-04-06 15:38:31 +08:00
Eloy Lafuente (stronk7) f6825a62ef Merge branch 'wip-mdl-52502' of https://github.com/rajeshtaneja/moodle 2016-04-06 00:12:00 +02:00
Eloy Lafuente (stronk7) 68f009dfb3 Merge branch 'MDL-53669_master' of git://github.com/markn86/moodle 2016-04-05 22:02:02 +02:00
Rajesh Taneja e891c8381e MDL-52502 behat: Ensure php web and cli version is same 2016-04-05 11:46:44 +08:00
Mark Nelson 4981d06dae MDL-53669 tool_recyclebin: removed unused string 2016-03-31 16:02:37 +08:00
Damyon Wiese 1356d85151 MDL-52954 core: Change from pandoc to unoconv - it gives better results
Most importantly it retains formatting better, and supports different charsets far better than pandoc.
2016-03-30 11:48:39 +08:00
Damyon Wiese 2e76c14e11 MDL-52954 core: Add a document converter to file_storage
This lets us convert between common office formats. E.g. docx -> pdf
html -> pdf, html -> ods.

This commit also updates assignment editpdf plugin to use this converter
on all compatible submission files.
2016-03-30 11:48:39 +08:00
David Monllao 13e2c1bf58 Merge branch 'MDL-53314-imap-debugging' of https://github.com/brendanheywood/moodle 2016-03-30 09:49:05 +08:00
Eloy Lafuente (stronk7) 213fdb1d98 Merge branch 'wip-mdl-49150' of https://github.com/rajeshtaneja/moodle 2016-03-30 00:10:46 +02:00
David Monllao dd39020d68 Merge branch 'MDL-53356-master' of git://github.com/cameron1729/moodle 2016-03-29 15:56:13 +08:00
Brendan Heywood 2c8c24412e MDL-53356 admin: Fixed erroneous sectionerror when upgrade is needed 2016-03-23 16:26:04 +08:00
Dan Poltawski c0c26e5e69 Merge branch 'MDL-53260-master' of git://github.com/junpataleta/moodle 2016-03-23 14:40:05 +08:00
Jun Pataleta 54285c3ff5 MDL-53260 upgrade: Fix lang help text description. 2016-03-23 14:13:36 +08:00
Eloy Lafuente (stronk7) debb1c3a6c Merge branch 'MDL-53547' of git://github.com/timhunt/moodle 2016-03-22 22:58:30 +01:00
Tim Hunt 4c8c69ea9f MDL-53547 logstore_database: better DB driver handling in unit test 2016-03-22 06:42:49 +00:00
Rajesh Taneja a1d3a94b1c MDL-49150 behat: Removed unnecessary @javascript tags 2016-03-22 13:54:12 +08:00
Mark Nelson 0c7cca226d MDL-48012 tool_recyclebin: removed indexes as FKs exist 2016-03-22 11:12:08 +08:00
Eloy Lafuente (stronk7) c572ac8f3a Merge branch 'MDL-53357-dont-break-urls' of https://github.com/brendanheywood/moodle 2016-03-22 02:25:40 +01: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 732d4f8318 Merge branch 'MDL-53315-imap-namespace' of https://github.com/brendanheywood/moodle 2016-03-21 14:01:46 +08:00
Nadav Kavalerchik 14aaa2d75b MDL-53260 upgrade: Option to display CLI upgrade messages in English 2016-03-21 11:59:50 +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
David Monllao c111ef9718 Merge branch 'MDL-48012_master' of git://github.com/markn86/moodle 2016-03-21 09:41:09 +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
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
Brendan Heywood 9c489dbcc4 MDL-53357 admin: Don't break urls after saving admin settings 2016-03-17 21:42:15 +11: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
Eloy Lafuente (stronk7) 987226c090 Merge branch 'MDL-53139' of https://github.com/dg711/moodle 2016-03-16 00:12:18 +01:00
Mark Nelson 1c42ad7135 MDL-48012 core: fixed failing unit tests 2016-03-15 16:58:47 +08:00
Mark Nelson c27596c550 MDL-48012 tool_recyclebin: used new hooks in core 2016-03-15 16:58:46 +08:00
Mark Nelson e78cd9b7d2 MDL-48012 tool_recyclebin: converted to an admin tool 2016-03-15 16:58:46 +08:00