Commit Graph

15302 Commits

Author SHA1 Message Date
Petr Škoda db217f006c MDL-41819 try to work around max_input_vars restriction 2013-12-02 08:30:47 +08:00
Dan Poltawski 117c147757 Merge branch 'w48_MDL-37016_m24_sloppymysql' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-11-25 13:41:00 +08:00
Damyon Wiese 45d9d6d710 Merge branch 'wip-mdl-42924-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-11-25 13:17:13 +08:00
Eloy Lafuente (stronk7) 0ecaebd487 Merge branch 'wip-MDL-29071-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-11-24 16:51:37 +01:00
Petr Škoda 709752225c MDL-37016 fix sloppy mysql nulls in event.uuid 2013-11-24 15:13:27 +08:00
Marina Glancy 6cf0f60c7d MDL-29071 ddl: unittest for objects name length 2013-11-21 12:41:03 +11:00
Marina Glancy f0a9fb36a3 MDL-29071 ddl: make sure object name never exceeds max length
Many thanks to Ray Bon for finding the problem
2013-11-21 12:40:58 +11:00
Rajesh Taneja 183c7cb3f5 MDL-42924 Administration: use normalize_component to extract plugin name and type 2013-11-19 12:02:16 +08:00
Ankit Agarwal 34f1a739f1 MDL-42767 notes: Delete notes on a course delete 2013-11-18 16:09:16 +08:00
Damyon Wiese 2847f9c8fc Merge branch 'MDL-33536-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-11-13 13:12:19 +08:00
Damyon Wiese 3699331396 MDL-33536 Navigation: Add missing require_once for safety. 2013-11-13 10:05:37 +08:00
Eloy Lafuente (stronk7) e39e0243b2 Merge branch 'wip_24_mdl-42723' of https://github.com/iarenaza/moodle into MOODLE_24_STABLE 2013-11-13 00:53:23 +01:00
Tim Hunt bf2324ef15 MDL-40481 quiz responses report needs cols need text_sorting 2013-11-11 14:15:14 +00:00
Frederic Massart d311f9cc75 MDL-42668 portfolio_boxnet: Migration to APIv2
Conflicts:

	lib/boxlib.php
	portfolio/boxnet/lib.php
2013-11-07 14:39:44 +08:00
Dan Poltawski b1455d0d74 Merge branch 'MDL-42666-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-11-07 11:44:53 +08:00
Damyon Wiese 711f77e4ca Merge branch 'MDL-42605-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-11-07 11:05:32 +08:00
Frederic Massart 393133707a MDL-42666 repository_boxnet: Downloading a file follows locations 2013-11-06 14:05:00 +08:00
Frederic Massart 3d115053d2 MDL-42666 repository_boxnet: Revoke access token when logging out 2013-11-06 14:03:43 +08:00
Frederic Massart 27db0b4376 MDL-42666 oauthlib: Getter methods for accesstoken, client id and secret 2013-11-06 14:03:43 +08:00
Frederic Massart 82efa6c9f2 MDL-42666 repository_boxnet: Convert repository to APIv2
The support for downloading images when they are references
from Box.net have been dropped in this script as the new
API does not support references. Unfortunately the old
references thumbnails will not be updated any more.

Conflicts:

	lib/upgrade.txt
	repository/boxnet/lib.php

Conflicts:

	lib/upgrade.txt
	repository/boxnet/lib.php
2013-11-06 14:03:24 +08:00
Petr Škoda e02256507c MDL-38743 add private cache headers 2013-11-06 13:58:15 +08:00
Iñaki Arenaza bcad5fa2de MDL-42723: Hide and handle LDAP error when user not in context being checked
MDL-41304 only fixed the case when 'Search subcontext' is enabled. We need to
fix the case when it's not enabled too.

While silencing errors with an @ should be avoided if possible, there's no
other way to prevent the warnings in this case.
2013-11-05 17:13:16 +01:00
Damyon Wiese b7a1f71911 Merge branch 'wip-MDL-38228-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-11-05 21:49:12 +08:00
Marina Glancy a78bb0cc83 Merge branch 'MDL-40267-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-11-05 17:45:38 +11:00
Marina Glancy ba5ecbc72a MDL-38228 upgrade: Rewrite script that fixes corrupt course modules to sequence relation 2013-11-05 14:15:17 +11:00
Dan Poltawski d320d0b285 MDL-40267 forms: fix utf8 string length rules 2013-11-05 10:19:22 +08:00
Eloy Lafuente (stronk7) 9424bcb66e MDL-40267 forms: added some tests for the range rule 2013-11-05 10:10:51 +08:00
Dan Poltawski c512b7cc65 MDL-42533 conditionlib: Add clarifying comments 2013-11-04 22:04:30 +08:00
Dan Poltawski 8a7078b28b Merge branch 'MDL-42533-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-11-04 21:55:40 +08:00
Dan Poltawski 8cd148efe0 Merge branch 'MDL-42551_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-11-04 16:22:50 +08:00
Marina Glancy abaaa8cdae Merge branch 'MDL-42617_24' of git://github.com/jleyva/moodle into MOODLE_24_STABLE 2013-11-04 16:15:13 +11:00
Marina Glancy b3e58b7d0b Merge branch 'MDL-42664-performance_measuring_filter_manager_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-11-04 13:18:39 +11:00
Damyon Wiese d98f1751e8 Merge branch 'wip-MDL-28463-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-11-01 22:53:01 +08:00
David Mudrák f23a63b545 MDL-42664 Fix the filter_manager instantiation
For legacy reasons, the $CFG->perfdebug uses values 7 for disabled and 15 for
enabled. Because of this typo, Moodle has always created instance of the slower
performance_measuring_filter_manager instead of the standard filter_manager,
regardless the perfdebug setting.
2013-11-01 09:24:10 +01:00
Marina Glancy accfa102fe Merge branch 'MDL-41624_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-10-31 22:20:20 +11:00
Juan Leyva e5663dfd70 MDL-42617 Add support for frozen fields in searchableselector form elements 2013-10-31 11:49:14 +01:00
Sam Hemelryk 5b09d5e8cf MDL-33536 navigation: hide hidden categories from the navbar
Conflicts:
	lib/navigationlib.php
2013-10-31 17:13:44 +08:00
Michael Aherne de4d45ce8e MDL-42517 testing Changed events test to use assertDebuggingCalled() 2013-10-31 13:25:36 +08:00
Frederic Massart c64eea0a51 MDL-42605 portfolio_flickr: Photos can be added to a set on export 2013-10-31 10:32:22 +08:00
Jean-Michel Vedrine 0e099cc444 MDL-41624 DragMath crashes Firefox 2013-10-30 18:25:02 +01:00
Damyon Wiese 87c3a9fd9f Merge branch 'wip-MDL-41337-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-10-30 10:54:13 +08:00
Sam Hemelryk 1f26c7053a Merge branch 'MDL-42542-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-10-30 08:38:47 +08:00
Marina Glancy 54a0a16b53 MDL-41337 files: Fixed bug with accidental delete of the root directory 2013-10-29 20:30:26 +11:00
Damyon Wiese 9ac938636f Merge branch 'MDL-40470-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-10-29 13:55:28 +08:00
Andrew Nicols 3bdbe1b08b MDL-40470 JavaScript: Correct issue when checking select change in Firefox 2013-10-29 10:43:06 +08:00
Marina Glancy eaccd0d486 MDL-28463 conditionlib: 10 minutes lifetime of cached grades 2013-10-29 13:21:12 +11:00
Dan Poltawski acb1bf6fac Merge branch 'wip-mdl-42491-m24' of git://github.com/deraadt/moodle into MOODLE_24_STABLE 2013-10-28 11:33:36 +08:00
Eloy Lafuente (stronk7) 5c550aaafc MDL-42551 timezone info: updated to 2013h 2013-10-26 17:15:21 +02:00
Frederic Massart cbd0157d66 MDL-42542 portfolio: Fix handlerfile in portfolio event handler 2013-10-25 16:02:21 +08:00
Frederic Massart c9bcb47d54 MDL-42533 conditionlib: Field name is translated for students 2013-10-25 09:52:02 +08:00