f60ad3fdff
Merge branch 'm25_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle into MOODLE_25_STABLE
2013-06-11 12:54:38 +08:00
992c0ec50d
MDL-40120: Fix get_course_records() which breaks in PSQL
2013-06-11 13:47:05 +12:00
aca67ae8b0
MDL-39454 Accesslib: is_siteadmin is a bit slow
2013-06-11 12:27:09 +12:00
534f1476f4
Merge branch 'm25_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com/scara/moodle into MOODLE_25_STABLE
2013-06-10 15:42:53 +08:00
b625e48b87
MDL-39639 Formslib: Hide calendar for datetime element on disable event
2013-06-10 15:29:16 +08:00
f31670ef40
MDL-40008 forms: fixed ordering of the calendar icon and enable checkbox for the date selector element
2013-06-10 14:25:14 +08:00
7f9f03442a
Merge branch 'w24_MDL-39096_m25_obfuscate' of git://github.com/skodak/moodle into MOODLE_25_STABLE
2013-06-10 13:12:16 +08:00
6f4232974e
Merge branch 'wip-MDL-39824-m25' of http://github.com/samhemelryk/moodle into MOODLE_25_STABLE
2013-06-10 10:54:27 +08:00
00afef17bb
Merge branch 'MDL-39979-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
2013-06-10 11:33:59 +12:00
d89fbe0285
MDL-39871 themes: can now specify regions to swap when using rtl langs
...
Conflicts:
lib/pagelib.php
2013-06-10 09:31:05 +12:00
dac7c261ca
MDL-39824 output: fixed bug when moving blocks with rtl lang
2013-06-10 09:29:58 +12:00
ee7a52ae91
MDL-39842 js: fixed block drag and drop
2013-06-10 09:29:58 +12:00
00f906b114
MDL-39824 output: tidied up output before bootstrap cleaning
...
Conflicts:
lib/pagelib.php
2013-06-10 09:29:03 +12:00
2d28b03d90
MDL-39839 renderer: new methods for calls appearing in theme layouts
2013-06-10 09:28:24 +12:00
03fa7a2ba3
MDL-39838 renderer: new methods for body classes and id
2013-06-10 09:28:24 +12:00
cd79352fbd
MDL-39841 renderer: new method to renderer blocks with predictable structure
2013-06-10 09:28:24 +12:00
f082c5e390
MDL-40002 Files: ETag value must be a quoted-string.
...
ETag value must be double quoted, http://tools.ietf.org/html/rfc2616#section-3.11 .
More details about potential impacts in MDL-39832: shortly, at least when using
HTTP Partial GET Requests (HTTP Status: 206) plus X-Sendfile HTTP Header.
In this commit, the impact is to be RFC2616 compliant when using the ETag Header.
2013-06-09 10:14:02 +02:00
06de509918
MDL-39096 fix obfuscate_text() utf-8 compatibility
2013-06-07 22:43:26 +02:00
52286ac358
MDL-39832 Files: Fixed ETag format according with RFC2616.
...
ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11 :
entity-tag = [ weak ] opaque-tag
weak = "W/"
opaque-tag = quoted-string
2013-06-06 23:11:15 +02:00
d618e3c07d
MDL-39832 Files: Revert MDL-39688 commit, 161be92065
...
MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.
2013-06-06 23:11:14 +02:00
333df7d951
MDL-39979 navigation: Remove the use of an undefined variable
2013-06-06 14:53:27 +08:00
92c46e00eb
Merge branch 'w23_MDL-39588_m25_ociinstall' of git://github.com/skodak/moodle into MOODLE_25_STABLE
2013-06-05 16:24:22 +02:00
ea85ee6f63
Merge branch 'w23_MDL-39416_m25_pagelog' of git://github.com/skodak/moodle into MOODLE_25_STABLE
2013-06-05 02:43:48 +02:00
0e73df9df6
Merge branch 'MDL-37332-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
2013-06-05 02:27:35 +02:00
0f51a82bae
Merge branch 'wip-MDL-21097-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
2013-06-05 01:43:11 +02:00
8c8b3eba24
Merge branch 'MDL-39723-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE
2013-06-04 17:48:57 +02:00
cb1318754e
Merge branch 'MDL-39536-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
2013-06-04 13:19:16 +08:00
491e196107
MDL-39536 completion: Unit tests for get_activities and has_activities
2013-06-04 12:58:03 +08:00
13f73be25b
MDL-39536 completion: Prevent DB call when fetching activities
2013-06-04 12:58:02 +08:00
1fe7be205c
Merge branch 'wip-MDL-39801-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
2013-06-04 01:58:27 +02:00
d1963974a9
MDL-39465 Show env. info instead of part twice.
2013-06-04 00:50:55 +02:00
618737d7e9
Merge branch 'MDL-39936-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
2013-06-04 00:05:04 +02:00
f498ae7652
MDL-39416 do not try to get detailed perflog info before PAGE int
2013-06-02 13:35:40 +02:00
dd85f5aed0
MDL-39588 require MOODLELIB Oracle package
...
Previously it was kind of optional, but it is now required. We also attempt to install it automatically now.
2013-06-02 11:14:10 +02:00
1e558fdf66
MDL-39465 detect environment problems in tests
...
This should help explain why something else fails.
2013-05-31 22:03:15 +02:00
e9fd6e5dd6
MDL-37332 portfolio: don't add double slashes
...
get_filepath() always returns trailing slash.
This breaks windows export - thanks to Jason Platts
2013-05-31 11:52:34 +08:00
a74edf03ad
MDL-39801 navigation_node::remove does not allow to insert nodes afterwards
2013-05-31 13:51:13 +10:00
bd205fa484
MDL-39801 navigation_node::remove fails if first child does not have a key
2013-05-31 13:51:13 +10:00
db8d852af9
MDL-21097 Correctly check capabilities for course settings items
...
- Make sure that items in course settings (and frontpage settings) are shown depending on user capabilities
- Make sure user is able to turn editing on on the page even if he has only limited number of seciton/modules managing capabilities
2013-05-31 13:20:10 +10:00
2e80405940
MDL-39936 upgrade: 2.5.0 line incorrectly positioned
2013-05-30 13:40:28 +08:00
4bc4844d5b
Merge branch 'w22_MDL-39676_m25_whereparam' of git://github.com/skodak/moodle into MOODLE_25_STABLE
2013-05-28 15:33:33 +02:00
695f6f3c23
MDL-39723 Remove unnecessary queries for COURSE, SITE
2013-05-28 13:16:03 +01:00
f4075573b9
MDL-39477: Remove some unused instances of $CFG
...
Also change @since tags to 2.5.1 because this will be backported.
2013-05-28 11:11:42 +08:00
a13cbfb3e7
MDL-39702 generators: Adding MOODLE_INTERNAL
...
As discussed generators should include MOODLE_INTERNAL
as they make use of CFG and they don't make sense without
requiring config.php.
2013-05-28 11:10:35 +08:00
e5c6694de8
MDL-39477 repository: Introducing data generators for repositories
2013-05-28 11:08:54 +08:00
d6e2b0a03e
Merge branch 'MDL-39795_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
2013-05-28 00:45:02 +02:00
a665577b37
Merge branch 'MDL-39686_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
2013-05-27 16:28:48 +08:00
c0b59154ba
MDL-39686 behat: Add option to restart the browser
2013-05-27 15:06:15 +08:00
e489df87bf
MDL-39795 behat: Improving find-texts-in-page-contents performance
2013-05-27 14:25:34 +08:00
121e2492e8
Merge branch 'MDL-38239-moodle25' of git://github.com/StudiUM/moodle into MOODLE_25_STABLE
2013-05-27 14:13:36 +08:00
Dan Poltawski