71071 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
1ebcb0080b Merge branch '47917-28' of git://github.com/samhemelryk/moodle 2014-11-04 00:03:42 +01:00
Damyon Wiese
edc89dfecb MDL-47927 LTI: Use PARAM_TEXT and p() for returned messages and errors 2014-11-04 11:46:57 +13:00
Frederic Massart
5d0b3b21d6 MDL-47965 tag: Enforcing security of tag auto completion 2014-11-04 11:28:17 +13:00
David Monllao
babaf596e1 MDL-47924 mod_lti: Fixing missing sesskey checkings
Also fixing a missing capability checking.
2014-11-04 11:00:51 +13:00
Yuliya Bozhko
d0053d29ed MDL-47190 Ensure badges cannot be awarded without a role
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2014-11-04 10:16:45 +13:00
Frederic Massart
eb46bf2f4e MDL-47321 iplookup: Prevent guest users from using iplookup 2014-11-04 10:01:43 +13:00
Adrian Greeve
c4a6c65c1b MDL-47697 mod_data: Fix group id change when editing.
When a teacher edits an entry in the database module
it would change the group ID to the one that the teacher
currently had selected.

Thanks to Steve Bond for providing a patch.
2014-11-04 09:58:11 +13:00
Juan Leyva
40afeb4044 MDL-45303 Web Services: forum_discussions not checking groups 2014-11-03 21:55:03 +01:00
Juan Leyva
a0095e5a89 MDL-47766 web services: get_grades exposes hidden grades to students 2014-11-04 09:13:46 +13:00
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
Amanda Doughty
c980dd123a MDL-30968 mod/forum Fixed group link 2014-11-03 14:29:03 +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
Damyon Wiese
c942fddf93 MDL-48006 Atto autosave: Never restore text that is empty. 2014-11-03 11:30:30 +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
1b5b97fac5 MDL-47917 cachestore_memcached: fixed get_many ordering 2014-11-03 14:08:25 +13:00
Sam Hemelryk
84d5a89c84 MDL-48026 usermenu: convert menu nowrap from CSS to method 2014-11-03 13:44:58 +13:00
Sam Hemelryk
8a375d27f2 MDL-48026 mod_quiz: convert menu nowrap from CSS to method 2014-11-03 13:35:29 +13:00
Sam Hemelryk
a2a9468f01 MDL-48026 output: action_menu no wrap improvement
Action menu output component has a new method set_nowrap_on_items
that sets a property to toggle nowrap on menu items.
That can be used to avoid problems when the menu appears within
an absolutely positioned or floated element.
2014-11-03 13:34:02 +13:00
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
Sam Hemelryk
f836166a8a MDL-48025 user: fixed typo in user_search HTML 2014-11-03 10:08:03 +13:00
Sam Hemelryk
70739e6e30 MDL-47969 mod_survey: fixed HTML5 validation of index.php 2014-11-03 08:55:12 +13:00
Sam Hemelryk
e014b6f2c4 MDL-47968 mod_forum: fixed search form HTML5 validation 2014-11-03 08:54:56 +13:00
Eloy Lafuente (stronk7)
bacbb4e279 MDL-47874 dml: add support for replace_all_text to oracle
And, at the same time, fix the implementation so all databases
will be using sql_substr() instead of harcoded "SUBSTRING".
2014-11-02 18:26:18 +01:00
Marina Glancy
41107173e4 MDL-46262 availability: validation of fields without value
Thanks to Tomasz Pawlik | CKO USl for the patch
2014-11-01 16:58:14 +08: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