mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 07:22:39 +02:00
Code Issues Projects Releases Wiki Activity
71,031 Commits 36 Branches 528 Tags
Commit Graph

5143 Commits

Author SHA1 Message Date
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
Damyon Wiese
086e5b7b9e Merge branch 'MDL-47360-master' of git://github.com/lameze/moodle 2014-11-05 15:12:56 +08: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
Helen Foster
ba033b861e MDL-48035 Merge English strings from the en_fix language pack 2014-11-04 21:55:26 +01:00
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)
990ebf08c7 Merge branch 'MDL-47883-master-foundlangfile' of git://github.com/mudrd8mz/moodle 2014-11-04 02:03:11 +01: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
Mark Nelson
8ad2de40b1 MDL-47361 tool_monitor: altered behat tests so they pass 2014-11-02 20:50:16 -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
Ankit Agarwal
1af956998e MDL-47465 tool_monitor: add a new column to subs 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
David Mudrák
fb1f2b9b27 MDL-47883 admin: Fix missing string in the plugin validation 2014-10-31 12:54:22 +01:00
Mark Nelson
eb0aabde73 MDL-47758 tool_monitor: altered behat tests so they pass 2014-10-31 01:16:10 -07: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
Marina Glancy
2e7eca137c MDL-47976 tool_monitor: fix ordering in unittest 2014-10-31 15:25:54 +08: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
Dan Poltawski
b373c35071 Merge branch 'wip-MDL-47919-master' of git://github.com/marinaglancy/moodle 2014-10-29 12:42:55 +00:00
Damyon Wiese
412430c392 Merge branch 'MDL-47805-master' of git://github.com/ankitagarwal/moodle 2014-10-29 14:46:06 +08:00
Damyon Wiese
cf63799155 Merge branch 'MDL-47227_master' of https://github.com/crazyserver/moodle 2014-10-29 14:44:08 +08:00
Marina Glancy
cc37a58d06 MDL-47919 tool_monitor: adjustments to behat tests 2014-10-28 17:17:00 +08:00