Commit graph

71042 commits

Author SHA1 Message Date
Frederic Massart
6849d15df5 MDL-37707 mod_assign: Prevent user from changing grouping in team submissions 2014-10-01 11:27:44 +08:00
Sam Hemelryk
db89450d85 Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle 2014-10-01 15:37:56 +13:00
Dan Marsden
9528f643d1 MDL-47404 filelib: Prevent flash from treating files as uploads
added to send_stored_file as well.
2014-10-01 15:05:56 +13:00
Eloy Lafuente (stronk7)
ed3e85755c Merge branch '47428-28' of git://github.com/samhemelryk/moodle 2014-09-30 23:42:58 +02:00
Petr Skoda
366372c74e MDL-47477 libraries: use smoothness theme for jquery ui 2014-10-01 09:06:01 +13:00
Petr Skoda
5a53b77f71 MDL-47303 libraries: import latest jQuery library and friends 2014-10-01 09:04:20 +13:00
Sam Hemelryk
db34f8cbdb Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle
Conflicts:
	version.php
2014-10-01 08:57:37 +13:00
zbdd
77218e4a52 MDL-42993 auth: spaces removed from usernames by default only
Functionality by default does not change with this patch.
However spaces are no longer stripped when cleaning usernames IF
$CFG->extendedusernamechars has been set.

Also included 2 trim statements where small issues were found with reading
external usernames in that  were not filtered for trailing whitespaces.
2014-10-01 08:24:54 +13:00
Henning Bostelmann
ed8adc7cf5 MDL-47474 Calendar export: Fix user id in authorization check 2014-09-30 19:39:29 +01:00
Dan Poltawski
a96e90e1c0 Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle 2014-09-30 17:30:20 +01:00
Damyon Wiese
0cc1ee1f30 MDL-46171 dml: DML unit test for tricky SQL in assign upgrade
This tests a workaround for set_field_select where the set table and from table are the same.
2014-09-30 23:35:37 +08:00
Dan Poltawski
6315aa24f9 Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle 2014-09-30 16:02:09 +01:00
Dan Poltawski
5990febb0c Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle 2014-09-30 14:35:29 +01:00
Jetha Chan
dc4bff329d MDL-45893 user_menu: fix to hide user_pictures from screen readers 2014-09-30 21:18:17 +08:00
Damyon Wiese
93c51a1d0a MDL-46171 assign: Fix for the update script on MySQL. 2014-09-30 21:16:24 +08:00
Dan Poltawski
f736c1b394 Merge branch '3034-28' of https://github.com/samhemelryk/moodle 2014-09-30 14:04:24 +01:00
Dan Poltawski
a535004e5c MDL-45893 behat: quick fix for usermenu logout button
(This needs revisiting properly - I am not an xpath expert)
2014-09-30 13:54:07 +01:00
Yolanda Ordóñez Rufat
a2ed10a5e7 MDL-47466 calendar: use get_in_or_equal() in function calendar_get_events to fix problem with ORA-01795 2014-09-30 13:23:33 +02:00
Dan Poltawski
8f97a5c66a Merge branch 'MDL-47385-master' of https://github.com/DmitryNefedov/moodle 2014-09-30 11:41:37 +01:00
Dan Poltawski
ac24e87b74 MDL-47195 force an upgrade for classloader changes 2014-09-30 11:40:18 +01:00
Dan Poltawski
7cef39b534 Merge branch 'MDL-47195-master' of git://github.com/andrewnicols/moodle 2014-09-30 11:07:23 +01:00
Frederic Massart
edb6a040cf MDL-47301 libraries: Patch Typo3 for Moodle's use 2014-09-30 17:32:35 +08:00
Frederic Massart
9e7cdcdd69 MDL-47301 libraries: Update Typo3 to v4.7.19 2014-09-30 17:19:23 +08:00
Dan Poltawski
d62f99195a Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-09-30 09:55:03 +01:00
Dan Poltawski
73a37dff73 Merge branch 'MDL-47294-master' of git://github.com/FMCorz/moodle 2014-09-30 08:47:31 +01:00
Dan Poltawski
216b6aa7ee Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2014-09-30 08:35:19 +01:00
Dan Poltawski
53e9b39b18 Merge branch 'm28_MDL-47097' of https://github.com/totara/moodle 2014-09-30 08:30:59 +01:00
Dan Poltawski
d452f49cf9 Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle 2014-09-30 08:29:02 +01:00
Dan Poltawski
0645eb6866 Merge branch 'MDL-46171-master' of git://github.com/damyon/moodle 2014-09-30 08:03:40 +01:00
Andrew Nicols
6c0bfb1449 MDL-46282 core: Add VERP API
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-09-30 14:22:30 +08:00
Sam Hemelryk
6caf85e6d6 Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle 2014-09-30 11:28:26 +13:00
Sam Hemelryk
ff28497a1d Merge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle 2014-09-30 10:35:47 +13:00
Sam Hemelryk
c8398fb95a MDL-45893 user: fixed user menu for guest 2014-09-30 10:25:23 +13:00
Sam Hemelryk
2957fdddd5 Merge branch 'm28_MDL-47170' of https://github.com/totara/moodle 2014-09-30 10:03:06 +13:00
Sam Hemelryk
14aa5a408a MDL-46652 output: more thorough custom menu multilang tests 2014-09-30 09:54:08 +13:00
Sam Hemelryk
3cfbdd9e5a Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle 2014-09-30 09:52:54 +13:00
Sam Hemelryk
fc2856aab1 Merge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies' of https://github.com/mhughes2k/moodle 2014-09-30 08:48:20 +13:00
Daniel Neis Araujo
bad2c9b14f MDL-46978 gradebook: Edit grade item changes visibility of category 2014-09-29 16:46:22 -03:00
Dan Poltawski
1c647a4473 Merge branch 'MDL-46920-master' of git://github.com/jethac/moodle 2014-09-29 16:25:41 +01:00
Juan Leyva
10c5fd10d7 MDL-46054 web_services: Fixed invalid parameter definitions 2014-09-29 16:03:23 +02:00
Marina Glancy
bd132709c4 MDL-46054 web_services: wrong key in exception string 2014-09-29 16:03:22 +02:00
Marina Glancy
dc14212b61 MDL-46054 web_services: bug fix in core_user_get_users
Thanks to Mikko Rantanen for the patch
2014-09-29 16:03:17 +02:00
Dan Poltawski
190ceae64b Merge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle 2014-09-29 12:46:11 +01:00
Dan Poltawski
e9eb00a0d7 Merge branch 'MDL-47163-master' of git://github.com/jleyva/moodle 2014-09-29 12:29:59 +01:00
Dan Poltawski
17382ec952 Merge branch 'MDL-47307-master' of git://github.com/FMCorz/moodle 2014-09-29 12:04:01 +01:00
Dan Poltawski
c7ed7235c7 Merge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle 2014-09-29 11:58:14 +01:00
Dan Poltawski
2633f23627 Merge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle 2014-09-29 11:12:29 +01:00
Dan Poltawski
156cd01e7b Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle 2014-09-29 10:42:50 +01:00
Dmitry Nefedov
b34eb03bb5 MDL-46391 messages: Display search button under contact list.
Add search button to only Message navigation -> Contacts section.
2014-09-29 17:30:54 +08:00
Dan Poltawski
f03b612191 Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-09-29 10:30:42 +01:00