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

5124 Commits

Author SHA1 Message Date
Helen Foster
ba033b861e MDL-48035 Merge English strings from the en_fix language pack 2014-11-04 21:55:26 +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
Pau Ferrer Ocaña
912296ad30 MDL-47227 admin: Fix user bulk selection over 1000 2014-10-28 08:34:01 +01: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
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
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
8a0c649637 MDL-47153 tool_monitor: altered unit tests to pass 2014-10-21 16:00:26 -07:00