Commit Graph

1109 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Skylar Kelty
60444e5327 MDL-48012 tool_recyclebin: added recyclebin to core 2016-03-15 16:58:46 +08:00
dg711
92cec53b47 MDL-53139 admin: case diff issue with email 2016-03-11 16:27:34 +05:30
Rajesh Taneja
c4c2cd59eb MDL-46891 behat: Improved exit status of parallel run
Exit status should contain pass/fail information
of each run it is executing. Every bit of status
will have information of pass/fail status of parallel
process
2016-03-11 10:51:17 +08:00
Rajesh Taneja
0e1c34e51a MDL-46891 behat: Added support for $CFG->behat_profiles
This config will be supported to avoid broken configuration
in future. As this is limited, we need will still use
->behat_config to set config values which can't be set by
behat_profiles
2016-03-11 10:51:17 +08:00
Rajesh Taneja
e01012e96d MDL-46891 behat: Driver specific fixes.
1. Browserkit doesn't handle [] in name
2. Grades are not visible in viewport and might fail
   with few drivers, increasing size of window to ensure
   grades are visible and can be modified.
3. Click edit first to see grade link
4. Expand fields before setting value
5. Updated xpath, as crawler update it.
6. Hover fails to show icon
2016-03-11 10:51:16 +08:00
Rajesh Taneja
42ad096fdb MDL-46891 Behat: Added support for behat 3 2016-03-11 10:51:15 +08:00
Eloy Lafuente (stronk7)
fac004e28b MDL-51167 tool_monitor: fix too strict condition & minor cleanup 2016-03-10 13:17:10 +01:00
Brendan Heywood
644f44cf50 MDL-53314 inboundmessage: Added $CFG->debugimap developer config item 2016-03-09 17:13:14 +11:00
Simey Lameze
b324802f36 MDL-51167 tool_monitor: check course visibility and user capabilities 2016-03-08 03:08:33 +01:00
Dan Poltawski
2158e87492 Merge branch 'MDL-50887-master' of https://github.com/lucisgit/moodle 2016-03-01 14:49:33 +08:00
Andrew Nicols
80f79ad6ec Merge branch 'MDL-50175-master' of git://github.com/danpoltawski/moodle 2016-03-01 08:07:56 +08:00
Ruslan Kabalin
11362ae3ff MDL-50887 antivirus: Use namespace referenced classes. 2016-02-29 09:31:09 +00:00
Andrew Nicols
372d6b923b MDL-30811 core: Replace use of continue_button with redirect 2016-02-29 09:05:58 +08:00
Andrew Nicols
243468030a MDL-30811 output: Tidy up notifications 2016-02-28 19:16:34 +08:00
KeenRivals
83ea83ec19 MDL-50175 graphics: Optimized SVGs with SVGO. 2016-02-25 11:56:42 +00:00
KeenRivals
26c19b02d5 MDL-50175 graphics: Optimized PNG images with optipng
Used options: -o7 -strip all and advdef -z4 -i50.

(With ./lib excluded)
2016-02-25 11:56:37 +00:00
Ruslan Kabalin
001feb6649 MDL-50887 antivirus: Refactor antivirus scanning to use new plugin.
This patch moves existing scanning functionality to plugin level. It does
not add anything new, just refactors the existing functionality.

AMOS BEGIN
  MOV [clamemailsubject,core],[emailsubject,antivirus]
  MOV [clamfailed,core],[clamfailed,antivirus_clamav]
  MOV [clamlost,core],[invalidpathtoclam,antivirus_clamav]
  MOV [clamunknownerror,core],[unknownerror,antivirus_clamav]
  MOV [virusfounduser,core],[virusfounduser,antivirus]
AMOS END
2016-02-25 09:55:45 +00:00
Adrian Greeve
61f7b10b9a MDL-45104 logging: Deprecate writting to the legacy log store. 2016-02-23 11:55:30 +08:00
Dan Poltawski
f155059452 Merge branch 'MDL-48439-change-background-colour-of-tool_capability-table' of git://github.com/synergylearning/moodle 2016-02-16 10:42:33 +00:00
Eloy Lafuente (stronk7)
e8c82aac82 MDL-51580 upgrade: clean < 2.7.0 upgrade steps
This just deletes all the upgrade steps previous to 2.7.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.

Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
2016-02-15 18:38:09 +01:00
Kenny McCormack
882bf2a54d MDL-48439 tool_capbility: Improve visualisation of capability table cells 2016-01-26 12:52:48 +00:00
Mark Nelson
806905b59b MDL-49291 core: final deprecation of sql_*_reader interfaces 2016-01-18 14:24:34 +08:00
Andrew Nicols
f731f9c6d9 Merge branch 'MDL-50829-master' of git://github.com/danpoltawski/moodle 2016-01-13 09:56:31 +08:00
Marina Glancy
3da0c3cbf4 MDL-50851 tool_uploaduser: allow to set interests 2016-01-10 15:25:48 +08:00
Marina Glancy
54f63cd11b MDL-50851 tool_uploadcourse: allow to set tags 2016-01-10 15:25:48 +08:00
Dan Poltawski
0a7051ff5a MDL-50829 lang: fix to RTL/LTR bracket confusion
Thanks to ISHIKAWA Takayuki for the initial patch
2015-12-29 12:30:18 +00:00
David Monllao
a4fb992435 Merge branch 'MDL-52335-master' of git://github.com/marinaglancy/moodle 2015-12-10 15:47:14 +08:00
Dan Poltawski
0ad66dda0e Merge branch 'MDL-52292' of git://github.com/timhunt/moodle 2015-12-03 11:13:26 +01:00