70922 Commits

Author SHA1 Message Date
Zachary Durber
5467cc051c MDL-48031 gradebook: Fix for bulk updating users in single view. 2014-11-05 13:20:40 +08:00
Eloy Lafuente (stronk7)
8d3c518bd5 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-05 01:16:05 +01:00
Helen Foster
ba033b861e MDL-48035 Merge English strings from the en_fix language pack 2014-11-04 21:55:26 +01:00
Dan Poltawski
f61619597b Merge branch 'MDL-47893-master' of git://github.com/zbdd/moodle 2014-11-04 16:50:47 +00:00
Dan Poltawski
f820acf01e Merge branch 'MDL-47944-master' of git://github.com/andrewnicols/moodle 2014-11-04 16:30:17 +00:00
Eloy Lafuente (stronk7)
6ce4b8ea30 Moodle release 2.8rc1 v2.8.0-rc1 2014-11-04 11:45:59 +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
Andrew Nicols
a35ce611cf MDL-47944 mod_forum: Improve discussion subscription icon/link
* make the link text clickable
* changes the link text when unsubscribed to the action text "Subscribe"
2014-11-04 15:46:05 +08:00
Damyon Wiese
888d0822bd Merge branch 'MDL-47806' of github.com:mr-russ/moodle 2014-11-04 14:34:43 +08:00
Damyon Wiese
0c4a7f96cc Merge branch 'MDL-47810_master-fix-MDL-47758-changes' of git://github.com/dmonllao/moodle 2014-11-04 14:17:46 +08:00
Zachary Durber
50e30bd4e3 MDL-47893 gradebook: Progress bar and continues for grade saving.
When you save a grade you are notified of how many grades have
been updated and any warnings.
2014-11-04 13:57:03 +08:00
Damyon Wiese
7a056947e3 Merge branch 'MDL-45636-course_master' of https://github.com/eSrem/moodle 2014-11-04 13:47:51 +08:00
David Monllao
0907f49b4e MDL-47810 tool_monitor: Updating behat scenarios introduced in MDL-47758 2014-11-04 12:23:42 +08:00
Marina Glancy
1d9155872f Merge branch 'MDL-48006-master' of git://github.com/damyon/moodle 2014-11-04 10:47:09 +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
Eloy Lafuente (stronk7)
ddb5bc5fcd Merge branch '47969-28' of git://github.com/samhemelryk/moodle 2014-11-04 01:56:59 +01:00
Eloy Lafuente (stronk7)
882f915922 Merge branch '47968-28' of git://github.com/samhemelryk/moodle 2014-11-04 01:55:08 +01:00
Petr Skoda
76ae1f6068 MDL-47868 ws: verify upload areas 2014-11-04 01:48:17 +01:00
Petr Skoda
7ee4642bcb MDL-48013 calendar: force download of user files 2014-11-04 01:40:52 +01:00
Eloy Lafuente (stronk7)
bebd3ce8fc Merge branch 'MDL-47207_master' of git://github.com/dmonllao/moodle 2014-11-04 01:20:51 +01:00
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
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