mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-26 00:31:35 +02:00
Code Issues Projects Releases Wiki Activity
79,654 Commits 37 Branches 540 Tags
a9b1af901b1acf032b9daa1c7b79b225a11f544b
Commit Graph

76 Commits

Author SHA1 Message Date
Jake Dallimore
ea106d2a1d MDL-53431 tool_monitor: Access control for tool monitor subscriptions 2016-07-05 10:36:27 +08: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
Damyon Wiese
ac82a9a8b4 MDL-46455 Events: Add db mapping info even if not part of backup 
We can return db mapping info even for objects that are not included
in backup/restore and it may be useful in future (no use in core yet).
 2015-10-12 16:41:02 +08:00
Damyon Wiese
0817451470 MDL-46455 events: Add mapping info to events 
This commit covers all events outside of /mod/. It adds mapping info for restoring
events, or the default implementation which returns false if mapping is not required.
 2015-10-11 18:14:58 -07:00
Adrian Greeve
0f510be763 MDL-50039 tool_monitor: Additional checks for subscription. 
Additional capability checks are now in place to stop unauthorised
users from accessing the event monitor subscription page.

Thanks to Eloy Lafuente for creating a gist with ideas of tackling
No site level capability to the rule subscription.
 2015-05-07 13:13:04 +08:00
Adrian Greeve
19452c99d7 MDL-49846 tool_monitor: Subscription page now filters on site events. 2015-05-04 12:29:54 +08:00
Adrian Greeve
25c634df29 MDL-49726 navigation: Update event monitor subscription. 
It is now possible for users with the right permissions
to subscribe to events. The link is on the preferences page.

Part of MDL-45774.
 2015-04-10 17:18:22 +08:00
Mark Nelson
bb286b6d5f MDL-47871 tool_monitor: allow teachers to duplicate site rules 2015-01-26 19:32:59 -08:00
Mark Nelson
884652378a MDL-48107 tool_monitor: prevent site rule removal when deleting a course 2014-11-08 00:49:00 -08:00
Damyon Wiese
d04803595c Merge branch 'MDL-47900_master' of https://github.com/markn86/moodle 2014-11-07 16:58:52 +08:00
Marina Glancy
293f1b4d85 Merge branch 'MDL-47869-master' of git://github.com/lameze/moodle 2014-11-07 15:03:32 +08:00
Mark Nelson
475635f52d MDL-47900 tool_monitor: created list of rules MUC 2014-11-06 18:46:44 -08:00
Simey Lameze
7c2a2e1a93 MDL-47869 tool_monitor: Add sorting on event monitor pages 2014-11-06 14:53:10 +08:00
Dan Poltawski
90de57db26 Merge branch 'MDL-48068-master' of git://github.com/FMCorz/moodle 2014-11-05 12:03:48 +00:00
Dan Poltawski
7ea14bb819 Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle 2014-11-05 11:18:22 +00:00
Frederic Massart
00d03b0b8a MDL-48068 tool_monitor: Link to course points to the right course 2014-11-05 15:06:27 +08:00
Simey Lameze
0194d87ec5 MDL-47360 tool_monitor: add more help link and default template message 2014-11-05 14:57:53 +08:00
Ankit Agarwal
5ff867362a MDL-47922 tool_monitor: Add a config to disable the tool 2014-11-05 10:19:44 +05:30
Mark Nelson
4e86f45a3e MDL-47361 tool_monitor: added missing column 
Also reworded a string as the fields have been renamed.
 2014-11-04 00:15:41 -08:00
Dan Poltawski
712b72c0f0 Merge branch 'MDL-47864_master' of git://github.com/dmonllao/moodle 2014-11-03 15:20:58 +00:00
Dan Poltawski
971163afaa Merge branch 'MDL-47810_master' of git://github.com/dmonllao/moodle 2014-11-03 15:03:51 +00:00
Dan Poltawski
e3d86c322b Merge branch 'MDL-47361_master' of https://github.com/markn86/moodle 
Conflicts:
	admin/tool/monitor/edit.php
	admin/tool/monitor/lang/en/tool_monitor.php
 2014-11-03 13:55:31 +00:00
David Monllao
88f64b5111 MDL-47810 tool_monitor: action_link when there is only 1 option 
When the rule plugin is not a module you can subscribe
to it without having to select to which module instance
you want to subscribe, so there is no need to display
a drop down menu.
 2014-11-03 15:22:24 +08:00
Mark Nelson
7293e97162 MDL-47361 tooL_monitor: string and UI changes 2014-11-02 19:05:29 -08:00
Sam Hemelryk
cf03313342 Merge branch 'MDL-47465-master' of git://github.com/ankitagarwal/moodle 2014-11-03 15:30:08 +13:00
Ankit Agarwal
c4e3e12884 MDL-47465 tool_monitor: Ignore used events 
An event that has already contributed to a notification should not contribute to another notification for the same subscription.
This needs to be done so we do not overwhelm the user.
 2014-11-03 07:18:13 +05:30
Eloy Lafuente (stronk7)
6863c0de49 Merge branch 'MDL-47892-master' of git://github.com/lameze/moodle 2014-10-31 18:57:30 +01:00
Mark Nelson
c4701daa75 MDL-47758 tool_monitor: prevent DB error when revisiting a delete URL 2014-10-31 01:16:10 -07:00
Mark Nelson
a724ceb99f MDL-47919 tool_monitor: only use set_label() on valid object 2014-10-31 00:56:47 -07:00
Simey Lameze
ed9084f70b MDL-47892 tool_monitor: add count_rule_subscriptions method and unit tests 2014-10-31 15:10:19 +08:00
Simey Lameze
107b55bd74 MDL-47892 tool_monitor: disable plugin and event fields if theres subscriptions for the rule 2014-10-31 14:41:24 +08:00
David Monllao
0151ef57f5 MDL-47864 tool_monitor: Change edulevels 
Considering that the most common use case
to manage rules is an admin CRUDing them.
 2014-10-31 14:01:31 +08:00
Marina Glancy
376d0317f1 MDL-47919 tool_monitor: refer to fields by labels in behat 2014-10-30 14:03:10 +08:00
Damyon Wiese
412430c392 Merge branch 'MDL-47805-master' of git://github.com/ankitagarwal/moodle 2014-10-29 14:46:06 +08:00
Frederic Massart
d9e879e5d1 MDL-47889 tool_monitor: Test handles random DB ordering 
On Oracle, the subscriptions are not ordered in the same way
than in other DB engines, so we do not rely on that ordering
any more in the test.
 2014-10-28 13:52:45 +08:00
Dan Poltawski
f6dbc2bb9c Merge branch 'MDL-47782-master' of git://github.com/lameze/moodle 
Conflicts:
	admin/tool/monitor/lang/en/tool_monitor.php
 2014-10-24 15:25:42 +01:00
Dan Poltawski
e29ec53238 Merge branch 'MDL-47778_master' of https://github.com/markn86/moodle 2014-10-24 14:53:21 +01:00
Dan Poltawski
4fdd69373b Merge branch 'MDL-47767-master' of git://github.com/xow/moodle 2014-10-24 11:48:13 +02:00
John Okely
6a6dd57c90 MDL-47767 tool_monitor: Use renderers for links between subscription and rule managers 2014-10-24 11:48:13 +02:00
Marina Glancy
13c9e9c043 Merge branch 'MDL-47759-master' of git://github.com/ankitagarwal/moodle 2014-10-24 11:48:08 +02:00
Simey Lameze
7bd88b0039 MDL-47782 tool_monitor: Added context column on rule management page. 
AMOS BEGIN
CPY [context,message],[context,tool_monitor]
AMOS END
 2014-10-24 15:41:45 +08:00
Ankit Agarwal
a8ea7cccce MDL-47805 tool_monitor: More info in adhoc task 2014-10-24 11:24:53 +05:30
Mark Nelson
5e83b20527 MDL-47778 tool_monitor: changes made to get_user_courses_select() 
The changes -

1) Ensure courses exist before we loop to avoid PHP warning.
2) Checked that the number of courses to display do not exceed the max setting.
3) Used format_string() instead of format_text().
4) Used the course context instead of system context.
 2014-10-23 20:20:41 -07:00
Mark Nelson
11c2bf3f73 MDL-47153 tool_monitor: added subscription_criteria_met event 2014-10-21 16:00:18 -07:00
Mark Nelson
1adb0031c0 MDL-47153 tool_monitor: added subscription_deleted event 2014-10-21 15:48:10 -07:00
Mark Nelson
229f841907 MDL-47153 tool_monitor: added subscription_created event 2014-10-21 15:48:10 -07:00
Mark Nelson
91df5f7e37 MDL-47153 tool_monitor: added rule_deleted event 2014-10-21 15:48:09 -07:00
Mark Nelson
12b9969ef9 MDL-47153 tool_monitor: added rule_updated event 2014-10-21 15:48:09 -07:00
Mark Nelson
e9da23369f MDL-47153 tool_monitor: added rule_created event 2014-10-21 14:19:16 -07:00
Ankit Agarwal
5875e287a5 MDL-47759 tool_monitor: Fix permissions issue 2014-10-20 13:45:51 +05:30