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
2daa9998ae
MDL-39746 - Themes - Hiding the user picture on the forum page when the screensize is too small to allow for it
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-06-11 11:25:04 +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
96241e57e9
Merge branch 'MDL-39947_25' of https://github.com/aolley/moodle into MOODLE_25_STABLE
2013-06-10 16:20:30 +08:00
ade2afc29f
Merge branch 'MDL-39338_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-06-10 16:07:28 +08: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
a327e87866
Merge branch 'MDL-40018_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
2013-06-10 15:00:20 +08:00
0f74c82897
Merge branch 'MDL-40013_25stable' of git://github.com/oasychev/moodle into MOODLE_25_STABLE
2013-06-10 14:58:12 +08:00
3ee63c14e0
MDL-40080 Remove unused strings from the core_hub subsystem
2013-06-10 14:41:53 +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
9d1a909f0e
Merge branch 'w24_MDL-28394_m25_enrolrestore' of git://github.com/skodak/moodle into MOODLE_25_STABLE
2013-06-10 12:17:04 +08:00
c9d1c4993d
Merge branch 'm25_MDL-37968' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE
2013-06-10 12:09:59 +08:00
7b9caeb92b
MDL-39016 theme_bootstrapbase: Added login info and home link to footer in both boostrapbase & clean layout/general.php
2013-06-10 16:04:22 +12:00
49acbbad2f
MDL-40009 notes: corrected the form element names passed to setType
2013-06-10 15:55:53 +12:00
afe247a0ca
Merge branch 'w24_MDL-39549_m25_cohortsearch' of git://github.com/skodak/moodle into MOODLE_25_STABLE
2013-06-10 15:48:11 +12:00
f7c2942961
Merge branch 'MDL-39971_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
2013-06-10 15:09:34 +12: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
f981643f58
Merge branch 'MDL-39978_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
2013-06-10 14:44:40 +12:00
2f8602990f
Merge branch 'w24_MDL-32480_m25_imscp' of git://github.com/skodak/moodle into MOODLE_25_STABLE
2013-06-10 14:41:07 +12:00
7174920aaa
MDL-39824 theme: tweaking upgrade note version
2013-06-10 14:34:25 +12:00
57ecff6356
MDL-39608 - Bootstrap - Chaning the thresholds and width values for the Form labels
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-06-10 14:28:54 +12:00
a1d43d9e4f
MDL-36090 core_grade: added logging of overriding of student grades
2013-06-10 12:35:03 +12:00
08c2a3ca1f
Merge branch 'wip-MDL-40088-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
2013-06-10 12:14:04 +12:00
fbc635e400
MDL-39227 - SCORM - repositioning the navigation panel to be visible in all themes at all resolutions
2013-06-10 11:59:36 +12: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
ddf1b0741d
MDL-39824 theme: changes recorded in theme/upgrade.txt
2013-06-10 09:29:58 +12:00
dac7c261ca
MDL-39824 output: fixed bug when moving blocks with rtl lang
2013-06-10 09:29:58 +12:00
8504444307
MDL-40089 theme_clean: simplified layouts and converted to new OUTPUT API
2013-06-10 09:29:58 +12:00
602255df1a
MDL-40089 theme_clean: moved general to columns3.php as prep
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
6964e6a580
MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods.
2013-06-10 09:29:58 +12:00
5c8c94eabe
MDL-40089 theme_bootstrapbase: moved general to columns3.php as prep
2013-06-10 09:29:57 +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
788e1924a2
MDL-39549 fix cohort search in course categories
2013-06-07 22:07:53 +02:00
d98b9a945e
MDL-28394 fix enrolment method restore logic
...
This patch fixes:
* missing enrolment methods after 1.9 backup restore - defaults are added
* enrolment methods are restored only when users option is enabled
* manual enrolment override option is disabled if users not available
2013-06-07 10:03:25 +02:00
4ab6c6fbc0
MDL-32480 allow external https links in IMSCP too
2013-06-07 09:58:54 +02:00
a2ec961309
MDL-32480 fix display of IMS content packages with external links
2013-06-07 09:58:53 +02:00
86882b6dfe
MDL-40088 fixed bug with not visible course section
2013-06-07 13:58:57 +10:00
ff3a54a5f7
MDL-37968 course_overview: add dim class to hidden courses for teachers.
2013-06-07 14:39:29 +12:00
82887b29e8
MDL-39338 core_question: Make history box a .well
2013-06-06 22:57:09 +01: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
Dan Poltawski