Commit Graph

136 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Adrian Greeve a19c4b8dd0 MDL-50039 tool_monitor: Behat update to fix selection error 2015-05-07 13:13:04 +08: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
Eloy Lafuente (stronk7) 26ea380d24 MDL-50102 versions: bump all versions and requires near release
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
Adrian Greeve bdf899a503 MDL-49846 tool_monitor: Context simplification and clean up.
Removed some unnecessary variables and simplified the context
usage in the index.php page.
2015-05-04 14:05:44 +08:00
Andrew Nicols 6e9abef568 Merge branch 'MDL-49983-master' of git://github.com/xow/moodle 2015-05-04 12:39:48 +08:00
John Okely 4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Adrian Greeve 19452c99d7 MDL-49846 tool_monitor: Subscription page now filters on site events. 2015-05-04 12:29:54 +08:00
Frederic Massart e14388e3a7 MDL-49972 preferences: Fix incorrect title and headings 2015-04-23 16:05:00 +08:00
Rajesh Taneja 0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
Rajesh Taneja 78429cc7ef MDL-45774 behat: Fixed button name to be pressed 2015-04-14 15:32:18 +08:00
Adrian Greeve 6e918b6437 MDL-45774 navigation: General fixes for the user navigation. 2015-04-13 15:54:24 +08:00
Adrian Greeve 8e94fae962 MDL-49412 behat: Update to tool behat tests.
Part of MDL-45774.
2015-04-10 17:18:24 +08:00
Adrian Greeve f3a493debe MDL-49412 tool_monitor: Minor fixes to stop errors.
Part of MDL-45774.
2015-04-10 17:18:24 +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
Rajesh Taneja 2b51813b11 MDL-48192 tool_monitor: check output buffer and not ignore it.
Check what is thrown in output buffer and
make sure output is expected output.
2014-11-27 17:02:26 +08:00
Eloy Lafuente (stronk7) 147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Mark Nelson 8145ab3372 MDL-48107 tool_monitor: extended automated tests
Also adjusted them so they will pass with these changes.
2014-11-08 00:50:51 -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
Mark Nelson cbc4ecc7f9 MDL-48107 tool_monitor: added total subs to the delete rule string
Also made some minor language string changes.
2014-11-08 00:26:56 -08:00
Damyon Wiese f2e5a435a6 MDL-47900 Event monitor: Fix name of cache lang string for event monitor
AMOS BEGIN
 MOV [cachedef_rules, tool_monitor],[cachedef_eventsubscriptions, tool_monitor]
AMOS END
2014-11-07 17:40:21 +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 c490ede369 MDL-47900 tool_monitor: expanded unit tests
Expanded the unit tests to ensure unnecessary events are not
saved in the DB and altered existing tests so they pass with
the introduction of this feature.
2014-11-06 18:46:45 -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
Ankit Agarwal e53a4b88d6 MDL-47922 tool_monitor: Update strings 2014-11-06 07:42:24 +05:30
John Okely 9aa9a1c70a MDL-47862 tool_monitor: Fix tool monitor navigation tree
Added event monitor rules link to the frontpage navigation tree, when
editing the frontpage rules. Added hack so that when viewing the site
context subscriptions, the link in navigation is correct, allowing the
breadcrumbs to appear
2014-11-06 12:27:51 +13:00
John Okely 8f6b6982fa MDL-47862 event_monitor: Fix context for capability check on subscription page 2014-11-06 12:27:51 +13:00
Dan Poltawski 5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
2014-11-05 12:11:16 +00: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 7aedf52716 MDL-47922 tool_monitor: bump version 2014-11-05 11:42:37 +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 f63c5b0413 MDL-47922 behat: Add a behat test 2014-11-05 10:19:45 +05:30
Ankit Agarwal 236a1f8d31 MDL-47922 tests: Enable tool monitor in various tests 2014-11-05 10:19:45 +05:30
Ankit Agarwal 5ff867362a MDL-47922 tool_monitor: Add a config to disable the tool 2014-11-05 10:19:44 +05:30
Eloy Lafuente (stronk7) de881693f7 MDL-48021 bump: Bump all versions to planned release
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
2014-11-04 17:52:35 +01:00
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
David Monllao 0907f49b4e MDL-47810 tool_monitor: Updating behat scenarios introduced in MDL-47758 2014-11-04 12:23:42 +08:00
Eloy Lafuente (stronk7) b53c2a92d0 Merge branch 'wip-MDL-47976-master' of git://github.com/marinaglancy/moodle 2014-11-04 01:59:23 +01: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 a46b057572 Merge branch 'MDL-47983_master' of git://github.com/dmonllao/moodle 2014-11-03 15:01:59 +00:00
Dan Poltawski 5904a6abe3 MDL-47361 tool_monitor: exit after printing footer 2014-11-03 14:21:50 +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
David Monllao 5cfaaf2d7a MDL-47983 tool_monitor: Removing only-for-admins restriction 2014-11-03 13:22:19 +08:00