mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-08 01:43:32 +02:00
Code Issues Projects Releases Wiki Activity
61,702 Commits 36 Branches 529 Tags
Commit Graph

15985 Commits

Author SHA1 Message Date
Dan Poltawski
a151eb403e Revert "MDL-39832 Files: Revert MDL-39688 commit, f111746140fe80a821ae69e3bf518d950bf188a1" 
This reverts commit 3960c00e3cf129c60b01fecdfe2851ba9ef7ba59.
 2013-06-13 13:56:11 +08:00
Dan Poltawski
db74804ff1 Revert "MDL-39832 Files: Fixed ETag format according with RFC2616." 
This reverts commit 9ab37ae3e07f54bc08644f8462d94bed68ff6c9b.
 2013-06-13 13:56:09 +08:00
Damyon Wiese
7e815a6eac MDL-37459 admin: Set the default setting flags on a new install. 
Make sure the default flags for all settings are saved on a new install.
 2013-06-13 15:20:52 +10:00
Marina Glancy
8ea7d3a2db Merge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle 2013-06-12 17:22:22 +10:00
Marina Glancy
128e9315d6 Merge branch 'MDL-37459-master-fix2' of git://github.com/damyon/moodle 2013-06-12 16:53:49 +10:00
Damyon Wiese
c7cd8d9c84 MDL-37621 assign: Improvements to default settings. 
Added a new adminsetting_configempty type so that module settings
which can have no sensible defaults can still be configured as advanced.
 2013-06-12 14:20:02 +08:00
Sam Hemelryk
c601027d8f Revert "MDL-38555 forms: Prevent same data submission multiple times." 
This reverts commit 9f2f313e9f7c88eab154450de394c2451f530f58.
 2013-06-12 14:22:01 +12:00
Damyon Wiese
459e3c88ca MDL-37459 admin: Default styles for flags for admin settings 2013-06-12 10:06:06 +08:00
Sam Hemelryk
44df0d9aaa Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle 2013-06-12 11:36:40 +12:00
Sam Hemelryk
aae402010b Merge branch 'MDL-35666-master' of git://github.com/mouneyrac/moodle 2013-06-12 10:14:14 +12:00
Sam Hemelryk
5d24aff39f Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle 2013-06-12 09:34:06 +12:00
Sam Hemelryk
7b50002304 Merge branch 'MDL-39964-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-06-12 09:04:22 +12:00
Sam Hemelryk
9439d0506c Merge branch 'MDL-25901-master' of git://github.com/danpoltawski/moodle 2013-06-12 09:00:24 +12:00
Sam Hemelryk
9ce7b61e62 Merge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle 2013-06-12 08:54:09 +12:00
Petr Škoda
a9cda870ba MDL-38109 use always get_plugin_list() to get list of plugins 
get_list_of_plugins() is NOT intended for real plugins, only plugin like directories.
 2013-06-11 10:22:45 +02:00
Marina Glancy
7a70cfe638 Merge branch 'MDL-37459-master' of https://github.com/damyon/moodle 2013-06-11 14:57:34 +10:00
Damyon Wiese
3c88a67821 MDL-37459 admin: Admin settings flags 
Make "Advanced" and "Lockable" flags for any admin setting.
 2013-06-11 12:54:57 +08:00
Dan Poltawski
b6174c9897 Merge branch 'm26_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle 2013-06-11 12:54:24 +08:00
Dan Poltawski
a3f92b2e0e Revert "MDL-26511 Images in Cloze multichoice" 
This reverts commit feec4f89417b13d87a464710b2479704cffbabdb.
 2013-06-11 11:38:34 +08:00
Sam Hemelryk
ae82c28588 Merge branch 'MDL-39490-format_rewrite_order' of git://github.com/mudrd8mz/moodle 2013-06-11 14:16:50 +12:00
Tim Lock
d0ed33d6fd MDL-40120: Fix get_course_records() which breaks in PSQL 2013-06-11 13:45:23 +12:00
Sam Hemelryk
10c98b64e6 Merge branch 'MDL-39454-master' of git://github.com/sammarshallou/moodle 2013-06-11 12:26:55 +12:00
Sam Hemelryk
9052fc4489 Merge branch 'wip-mdl-33379' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-06-11 10:35:10 +12:00
Sam Hemelryk
2afd7d0277 Merge branch 'MDL-32898-master' of git://github.com/ankitagarwal/moodle 2013-06-11 10:31:55 +12:00
Sam Hemelryk
bd7004d51c Merge branch 'wip-mdl-34508' of git://github.com/rajeshtaneja/moodle 2013-06-11 10:29:11 +12:00
Dan Poltawski
0a006517e5 Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com/scara/moodle 2013-06-10 15:42:45 +08:00
Dan Poltawski
f4c824c009 Merge branch 'wip-mdl-39639' of git://github.com/rajeshtaneja/moodle 2013-06-10 15:28:17 +08:00
Dan Poltawski
8a78b9116a Merge branch 'MDL-40008_master' of https://github.com/markn86/moodle 2013-06-10 14:25:03 +08:00
Dan Poltawski
28fa1533f7 Merge branch 'w24_MDL-39096_m26_obfuscate' of git://github.com/skodak/moodle 2013-06-10 13:12:11 +08:00
ppichet
feec4f8941 MDL-26511 Images in Cloze multichoice 
vertical and horizontal answer and in feedback of all qtype answers
 2013-06-10 11:28:46 +08:00
Dan Poltawski
07bac478b6 Merge branch 'wip-MDL-39824-m26' of http://github.com/samhemelryk/moodle 2013-06-10 10:54:22 +08:00
Sam Hemelryk
a6d966885b Merge branch 'MDL-39979-master' of git://github.com/FMCorz/moodle 2013-06-10 11:35:26 +12:00
Sam Hemelryk
a2f8bccf0a MDL-39824 output: fixed bug when moving blocks with rtl lang 2013-06-10 09:10:06 +12:00
Matteo Scaramuccia
06eca48648 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 09:43:36 +02:00
Petr Škoda
66056f994f MDL-39096 fix obfuscate_text() utf-8 compatibility 2013-06-07 22:38:48 +02:00
Sam Hemelryk
018721e685 MDL-39842 js: fixed block drag and drop 2013-06-07 17:33:14 +12:00
Sam Hemelryk
06a72e0192 MDL-39824 output: tidied up output before bootstrap cleaning 2013-06-07 17:31:59 +12:00
Sam Hemelryk
b8035316bb MDL-39839 renderer: new methods for calls appearing in theme layouts 2013-06-07 17:31:27 +12:00
Sam Hemelryk
3707972a78 MDL-39838 renderer: new methods for body classes and id 2013-06-07 17:31:27 +12:00
Sam Hemelryk
8cf2b9ab9b MDL-39841 renderer: new method to renderer blocks with predictable structure 2013-06-07 17:31:27 +12:00
Sam Hemelryk
36b77e3a88 MDL-39871 themes: can now specify regions to swap when using rtl langs 2013-06-07 17:31:27 +12:00
Matteo Scaramuccia
9ab37ae3e0 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:14:44 +02:00
Matteo Scaramuccia
3960c00e3c MDL-39832 Files: Revert MDL-39688 commit, f111746140fe80a821ae69e3bf518d950bf188a1 
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:14:42 +02:00
Frederic Massart
d36dd9eb57 MDL-39979 navigation: Remove the use of an undefined variable 2013-06-06 14:52:49 +08:00
Dan Poltawski
d139e46447 MDL-25901 rss: do not copyright html tag 
They copyright field does not permit html, it should be plain text
 2013-06-06 11:21:19 +08:00
Eloy Lafuente (stronk7)
33a54457ca Merge branch 'w23_MDL-39588_m26_ociinstall' of git://github.com/skodak/moodle 2013-06-05 16:22:58 +02:00
Eloy Lafuente (stronk7)
8c07c404be Merge branch 'w23_MDL-39416_m26_pagelog' of git://github.com/skodak/moodle 2013-06-05 02:43:21 +02:00
Eloy Lafuente (stronk7)
28820155d1 Merge branch 'MDL-37332-master' of git://github.com/danpoltawski/moodle 2013-06-05 02:27:08 +02:00
Eloy Lafuente (stronk7)
32ce8b6803 Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle 2013-06-05 01:43:03 +02:00
Eloy Lafuente (stronk7)
79452da1c8 Merge branch 'MDL-39723-master' of git://github.com/sammarshallou/moodle 2013-06-04 17:47:45 +02:00