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
Sam Hemelryk
db310f7737
Merge branch 'MDL-47870-master2' of git://github.com/ankitagarwal/moodle
2014-10-28 17:27:09 +13:00
Ankit Agarwal
d71e42d7e8
MDL-47870 tool_monitor: Fix event select dropdown
2014-10-28 09:49:08 +05:30
Jetha Chan
b865a3e2d1
MDL-47559 user_menu: customusermenu setting
2014-10-27 20:04:45 +08:00
Dave Cooper
d7f9acc46a
MDL-47833 core: Change default expiry for message inbound handlers
2014-10-27 11:53:33 +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
John Okely
4809376f13
MDL-47813 tool_monitor: Fix rule manager unit tests in oracle
2014-10-24 11:49:18 +02:00
Sam Hemelryk
065448834c
Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle
2014-10-24 11:48:22 +02: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
John Okely
220602b7f0
MDL-47767 tool_monitor: Add links between subscribe and rule manager
2014-10-24 11:48:12 +02:00
Marina Glancy
c3b545a92a
Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle
2014-10-24 11:48:09 +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
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
8a0c649637
MDL-47153 tool_monitor: altered unit tests to pass
2014-10-21 16:00:26 -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
Marina Glancy
e94925ddd2
Merge branch 'MDL-47728_master' of git://github.com/markn86/moodle
2014-10-21 11:56:31 +08:00
Sam Hemelryk
56f9e921f4
MDL-46133 tool_monitor: version bump for events
2014-10-21 15:22:10 +13:00
Sam Hemelryk
263f8cff7e
Merge branch 'MDL-46133_master' of https://github.com/markn86/moodle
2014-10-21 14:39:34 +13:00
Ankit Agarwal
5875e287a5
MDL-47759 tool_monitor: Fix permissions issue
2014-10-20 13:45:51 +05:30
Adrian Greeve
c42d18183a
MDL-47675 phpunit: Update unit tests to pass on MSSQL
...
Unit tests were failing on MSSQL. gc_collect_cycles() was
removed from the phpunit utils.php file to save time in running
the tests, but MSSQL doesn't clean up open files as well as
other databases.
This patch includes the garbage collection for the unit tests
that require it.
2014-10-20 14:26:11 +08:00
Damyon Wiese
47d6e6a7d3
MDL-47503 Grades: Completely remove aggregationsubcats
...
This setting is not compatible with combinations of aggregation methods
and the ways in which it does and does not work are not documented. It
was voted to remove it completely by the gradebook workshop, so I have
completely removed it and added a warning for all affected courses + restored
backups.
2014-10-20 12:03:18 +08:00
Adrian Greeve
3275892c03
MDL-47757 events: Fixed doc block and missing string.
...
The language events were missing the @since tag and
the grade single view report was missing a language
string.
2014-10-20 09:55:09 +08:00
Mark Nelson
0b0a08e7b0
MDL-47728 tool_monitor: added capability check before displaying link
2014-10-18 20:15:35 -07:00
Mark Nelson
154423f6fb
MDL-46133 tool_monitor: added unit tests
2014-10-16 20:42:38 -07:00
Mark Nelson
ad6f25cd8e
MDL-46133 tool_monitor: added event cleanup task
2014-10-16 20:42:25 -07:00
Dave Cooper
b0001c15f2
MDL-47707 tool_monitor: Changed navigation position of event monitor.
...
This issue is part of the MDL-45758 epic.
2014-10-16 16:50:11 +08:00
Damyon Wiese
bd71cb83df
MDL-45758 Event monitor: Improve the help string.
2014-10-16 14:34:52 +08:00
Damyon Wiese
b8bd29da41
Merge branch 'event_monitor' of git://github.com/ankitagarwal/moodle
2014-10-16 13:20:45 +08:00
Ankit Agarwal
d6e0e275dd
MDL-45758 tool_monitor: Update behat tests
2014-10-15 13:59:19 +05:30
Ankit Agarwal
ffe9ed541c
MDL-45758 tool_monitor: Update subscriptions management UI
2014-10-15 13:59:18 +05:30
John Okely
cfa91962d1
MDL-47243 behat: Add data generators for gradeitems scales and outcomes
2014-10-15 14:33:26 +08:00
Ankit Agarwal
067e9599ac
MDL-45758 tool_monitor: Update navigation nodes
2014-10-15 11:33:31 +05:30
Ankit Agarwal
e8a925a60e
MDL-45758 tool_monitor: Update js to get around chrome bug
2014-10-15 07:41:06 +05:30
Ankit Agarwal
75cae53b7b
MDL-45758 tool_monitor: Peer review changes
2014-10-15 07:41:06 +05:30
Ankit Agarwal
758793d889
MDL-45758 tool_monitor: Fix lang strings for caps
2014-10-15 07:41:06 +05:30
Simey Lameze
77098e6dc1
MDL-45758 tool_monitor: Add behat tests to subscription management
...
Original issue - MDL-47148
2014-10-15 07:41:06 +05:30
Simey Lameze
9031b34da3
MDL-45758 tool_monitor: Behat tests for rule management
...
Original issue - MDL-47148
2014-10-15 07:41:06 +05:30
Ankit Agarwal
2161de73d8
MDL-45758 tool_monitor: Add tests for the observers
...
Original issue - MDL-47376
2014-10-15 07:41:06 +05:30
Ankit Agarwal
e24e0d24b9
MDL-45758 tool_monitor: Add observers to handle user and module deletion
...
Original issue - MDL-47376
2014-10-15 07:41:06 +05:30
Ankit Agarwal
5833307eab
MDL-45758 tool_monitor: Add unit tests for the universal observer
...
Original issue - MDL-46132
2014-10-15 07:41:06 +05:30
Ankit Agarwal
bb550efc0d
MDL-45758 tool_monitor: Add a universal event observer
...
This observer does the following task:-
1) It monitors all events and stores relevant data in a temporary table
2) It doesn't write the events straight away, it buffers them, so there is only one db write per request
3) It calculates and sees if there are subscriptions related to those events who need to be notified
4) If there are such cases, it schedules a adhoc task for the same
Original issue - MDL-46132
2014-10-15 07:41:06 +05:30
Ankit Agarwal
1ebfdaec04
MDL-45758 tool_monitor: Add a adhock task to send notifications
...
Original issue - MDL-46132
2014-10-15 07:41:05 +05:30