Commit graph

16864 commits

Author SHA1 Message Date
Petr Škoda
ad35231698 MDL-40210 do not use CAP_PREVENT for role defaults! 2013-06-17 12:12:36 +02:00
Dan Poltawski
85db00e0c3 Merge branch 'MDL-39825_dev_master' of https://github.com/totara/openbadges 2013-06-17 16:40:24 +08:00
Dan Poltawski
af08eb9912 Merge branch 'MDL-39474-master' of git://github.com/sammarshallou/moodle 2013-06-17 15:36:15 +08:00
Ankit Agarwal
5b23d9adac MDL-39152 webservices: Rename external_api::get_context() to external_api::get_context_from_params() 2013-06-17 15:18:49 +08:00
Rajesh Taneja
d8372b54b9 MDL-16982 Administration: Moved bulk action outside loop and using profile api to save data 2013-06-17 12:55:09 +08:00
Dan Poltawski
f1da132271 MDL-40207 simplepie: reduce false failures in unit tests
The simplepie tests time out too quickly due to a low connect timeout,
to fix this:

* Introduced a way to set the timeout during intitial construction
* Converted the unit tests to use a high timeout value
2013-06-17 10:32:25 +08:00
Sam Hemelryk
67b34c34f0 MDL-40136 cache: fixed dirroot change bugs with plugin caches 2013-06-17 09:23:50 +12:00
Russell Smith
62d6f183c4 MDL-40103 Backup: Move install.xml templates to inline XML 2013-06-15 15:07:03 +10:00
Russell Smith
283e448ab3 MDL-40103 stats: Move db temp templates to inline xmldb tables
Move all statistics temporary tables into the code.  We are not
going to continue to use database templates.  They were a mix
of reading the install.xml and tables in the database.  It is
much clearer to have them created inline at the point they are
used in the code.
2013-06-15 15:03:02 +10:00
David Monllao
051e9663f0 MDL-39634 behat: Removing unused arguments
Also adding deprecated methods.
2013-06-14 16:14:04 +08:00
Ankit Agarwal
aac70ffc18 MDL-39152 webservices: Abstract context fetching
Since many apis in future will need to provide alternative method to fetch context, I have abstracted this bit into the core external_api class
2013-06-14 15:47:48 +08:00
Petr Škoda
35ea5db031 MDL-33955 add file download and curl unit tests 2013-06-14 08:03:50 +02:00
Petr Škoda
220eef0e4c MDL-33955 make downalod_file_content() use curl class and cleanup
The options in constructor were renamed to setttings in order to prevent confusion.
This removes ignored CURLOPT_BINARYTRANSFER, add newline header cleaning,
reworks proxy settings and some other minor issues.
2013-06-14 08:03:49 +02:00
Petr Škoda
9936c2a54c MDL-33955 fix sloppy whitespace in curl class 2013-06-14 08:03:49 +02:00
Dan Poltawski
a151eb403e Revert "MDL-39832 Files: Revert MDL-39688 commit, f111746140"
This reverts commit 3960c00e3c.
2013-06-13 13:56:11 +08:00
Dan Poltawski
db74804ff1 Revert "MDL-39832 Files: Fixed ETag format according with RFC2616."
This reverts commit 9ab37ae3e0.
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
Ruslan Kabalin
761670208a MDL-38555 forms: Prevent same data submission multiple times.
This disables Submit button when the form has been submitted to
prevent consequent submissions before the page has been loaded.
2013-06-12 15:19:47 +01: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 9f2f313e9f.
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
sam marshall
5c92e7a740 MDL-39474 Library: Make a fast way to check developer debug mode 2013-06-11 16:29:00 +01: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 feec4f8941.
2013-06-11 11:38:34 +08:00
Rajesh Taneja
d836e3ed1f MDL-16982 Administration: Integrated Inaki's suggestions 2013-06-11 10:27:43 +08:00
Rajesh Taneja
57d135a1c6 MDL-16982 Administration: Cleaned whitespaces and alignment in orignal patch 2013-06-11 10:27:43 +08:00
Gilles-Philippe Leblanc
b88adb55fc MDL-16982 Administration: Adding data mapping for custom user fields 2013-06-11 10:27:37 +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
Yuliya Bozhko
1dcb9ff1f5 MDL-39825 badges: Remove badges from course navigation when course badges are disabled 2013-06-10 16:21:55 +12: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