mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
70,883 Commits 36 Branches 519 Tags
Commit Graph

70883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Okely
c844af2569 MDL-47921 mod_lti: Add access control to mod/lti/launch.php 2014-11-04 09:09:26 +13:00
Dave Cooper
40a0465823 MDL-47050 core_wordlist: Updated wordlist to include only animals. 2014-11-04 09:03:08 +13: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
Dan Poltawski
1a27142afe Merge branch 'MDL-47903-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	mod/forum/version.php
    mod/forum/db/upgrade.php
 2014-11-03 12:28:33 +00:00
Andrew Nicols
a6d7a81271 MDL-48020 mod_forum: Add missing sesskey check in AJAX subscription 2014-11-03 11:02:41 +00:00
Marina Glancy
8bd6b270b2 Merge branch 'MDL-47987-master' of git://github.com/andrewnicols/moodle 2014-11-03 17:21:55 +08:00
Damyon Wiese
ac87cab989 Merge branch 'MDL-48010' of git://github.com/timhunt/moodle 2014-11-03 17:15:25 +08:00
Petr Skoda
1993cc02b6 MDL-47287 prevent web access to phpunit boostrap 2014-11-03 17:10:33 +08:00
Marina Glancy
d9fb78c981 Merge branch 'wip-mdl-45204-m' of git://github.com/rajeshtaneja/moodle 2014-11-03 17:03:57 +08: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
Andreas Grabs
b7f75a9c05 MDL-47865 mod_feedback - XSS through $searchstring in mod/feedback/mapcourse.php 2014-11-03 14:56:10 +08:00
Damyon Wiese
c3a0452a5b MDL-47926 LTI: Fix missing sesskey checks and add content type headers to redirect 2014-11-03 14:43:54 +08:00
Damyon Wiese
219ebf9bb4 Merge branch 'wip-MDL-45538-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	version.php
 2014-11-03 14:10:43 +08:00
Damyon Wiese
f6b7d7322a Merge branch 'MDL-26447_master' of https://github.com/crazyserver/moodle 2014-11-03 13:50:38 +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
Damyon Wiese
520a32c3d4 Merge branch 'wip_MDL-47966_m28_defaultheaders' of https://github.com/skodak/moodle 2014-11-03 12:20:58 +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
Sam Hemelryk
ac4ed127de MDL-47978 mod_quiz: more explicit selector for action menu change 2014-11-03 11:39:30 +13:00
Sam Hemelryk
968cc37437 Merge branch 'MDL-47978' of git://github.com/timhunt/moodle 2014-11-03 11:27:55 +13:00
Tim Hunt
f9476f4d0e MDL-48010 grade import from URL: don't corrupt the URL. 2014-10-31 19:52:33 +00:00
Tim Hunt
b4a40e451d MDL-48008 gradeimport_xml: report errors usefully 2014-10-31 19:52:31 +00:00
Tim Hunt
262105faf9 MDL-47978 quiz editing: fix display of last add menu 2014-10-31 18:23:45 +00:00
Eloy Lafuente (stronk7)
6863c0de49 Merge branch 'MDL-47892-master' of git://github.com/lameze/moodle 2014-10-31 18:57:30 +01:00
Tim Hunt
58413f613e MDL-47963 quiz editing: fix failing unit tests 
The unit tests were initialising the structure class in a different way
from real use. That was clearly silly, so I got rid of create_for,
leaving just the real create_for_quiz.
 2014-10-31 17:22:38 +00:00
Dan Poltawski
1de9b5072a Merge branch 'MDL-47797' of git://github.com/timhunt/moodle 2014-10-31 16:48:30 +00:00
Tim Hunt
234c5337f7 MDL-47797 quesion preview: improve the behat script 
Tests a few more buttons, and also verify more of the UI.
 2014-10-31 15:52:55 +00:00
Tim Hunt
40459677a0 MDL-47797 question preview: show more technical info 
It is helpful for developers creating question types (at least) to be
able to see this.
 2014-10-31 15:52:54 +00:00
Dan Poltawski
b4eaafd744 Merge branch 'MDL-47963' of git://github.com/timhunt/moodle 2014-10-31 13:14:59 +00:00
Dan Poltawski
9ebee5df8e on-demand release 2.8beta+ 2014-10-31 09:09:03 +00: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
Rajesh Taneja
54957bdbf7 MDL-45204 phpunit: Fixed test_localcachedir test 
make_localcache_directory is the first call to make
localcache, which is already created by reset. So deleting
existing localcache directory will pass this test
 2014-10-31 16:07:47 +08: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
David Monllao
f5d3d0f498 MDL-47864 grade_report: Edulevels according to default user permissions 2014-10-31 14:01:30 +08:00
Sam Hemelryk
1a14f8a6de MDL-47959 mod_quiz: fixed 0 questions bug 2014-10-31 13:35:25 +13:00
Andrew Nicols
4c34089889 MDL-47987 mod_forum: Users subscribe to discussions not forums 
Correct language string which describes users subscribing to a discussion,
and use it when subscribing on post.
 2014-10-31 07:51:48 +08:00
Sam Hemelryk
323ed3bbf0 Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle 2014-10-31 11:15:12 +13:00
pau.ferrer-ocana
5ea0d026b0 MDL-47875 choice: chat module strings not required from Choice anymore 
AMOS BEGIN
 CPY [chatintro,mod_chat],[description,mod_choice]
AMOS END
 2014-10-30 22:41:23 +01:00
Sam Hemelryk
3ea5ff8941 Merge branch 'MDL-42875_master' of https://github.com/crazyserver/moodle 2014-10-31 10:27:46 +13:00