14183 Commits

Author SHA1 Message Date
Aparup Banerjee
0c4ee46d77 Merge branch 'w35_MDL-34877_m24_tinymcesettings' of git://github.com/skodak/moodle 2012-08-28 13:56:15 +08:00
Aparup Banerjee
9455f48280 Merge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle 2012-08-28 11:45:11 +08:00
Marina Glancy
a3c94686aa MDL-34290 curl class: add functions to return error code and to download one file 2012-08-28 10:23:36 +08:00
Adrian Greeve
96729f6d2d MDL-34075 - lib - Alteration to the csv import lib to include rfc-4180 compliance 2012-08-28 09:23:16 +08:00
Eloy Lafuente (stronk7)
1a5367873d Merge branch 'w35_MDL-35060_m24_sesstest' of git://github.com/skodak/moodle 2012-08-28 02:27:34 +02:00
Eloy Lafuente (stronk7)
2b64e24ebe MDL-35089 conditionals: detected one place missing sectioncache
Thanks to MDL-34936 and unit tests this was discovered like 2 new
places calling to get_fast_modinfo() without the sectioncache
column contents. Potential performance problem, leading to
reseting and recalculation of caches all the time.
2012-08-28 01:38:09 +02:00
Eloy Lafuente (stronk7)
d683fcdf98 Merge branch 'MDL-34993' of git://github.com/timhunt/moodle 2012-08-27 18:35:23 +02:00
Eloy Lafuente (stronk7)
6b2b869049 Merge branch 'MDL-35055' of git://github.com/timhunt/moodle 2012-08-27 16:16:14 +02:00
Eloy Lafuente (stronk7)
aec4783bf6 Merge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle 2012-08-27 15:58:19 +02:00
David Monllao
65cd3f9c16 MDL-35029 core_session Refresh guest session if autologin as guest is enabled 2012-08-27 17:03:11 +08:00
Aparup Banerjee
a1a5d8968e Merge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle 2012-08-27 14:20:15 +08:00
Aaron Barnes
1caeb4b450 MDL-32386 completion: Fix incorrect method parameters 2012-08-27 10:57:52 +12:00
Petr Škoda
882fb83519 MDL-35061 add more custom fields for enrol instances
This delays the splitting of plugin specific enrol info from shared enrol table.
2012-08-26 15:55:03 +02:00
Petr Škoda
33c7a2d121 MDL-35060 remove unused session test file 2012-08-25 10:14:38 +02:00
Andrew Robert Nicols
fd0680ff4a MDL-34936 Warn if the sectioncache property is missing in a get_fast_modinfo call 2012-08-24 15:43:38 +01:00
Tim Hunt
aa5f05110f MDL-35055 question import: slight error with the Match grades option.
Even in the 'Error if grade not listed case', it was applying a small
tolerance. In the case of a fuzzy match, it was returning the inexact
grade from the import file, rather than the precise grade that Moodle
was expecting.

That causes problems when the editing form is displayed, because the
value from the database does not match any of the available options, so
the grade is changed to 0%.
2012-08-24 15:34:20 +01:00
sam marshall
1d1917aeaa MDL-31973 Groups: groups_members table should have 'component', 'itemid' fields 2012-08-24 15:30:13 +01:00
Petr Škoda
b3aefe3cc8 MDL-34990 improve custom toolbar setting parsing
It is probably better to parse the setting every time because somebody may put unsupported values directly into config.php, performance should not be an issue because we do not have editors on every page.
2012-08-24 16:11:00 +02:00
Petr Škoda
0bc9b897f9 MDL-34879 add upgrade.txt notes to editor_tinymce 2012-08-24 16:11:00 +02:00
Petr Škoda
883ecce0e9 MDL-34955 fix missing string 2012-08-24 16:11:00 +02:00
Petr Škoda
0b7858221c MDL-34955 add full TinyMCE subplugin management 2012-08-24 16:11:00 +02:00
Petr Škoda
caaccae5da MDL-34878 add custom TinyMCE toolbar setting 2012-08-24 16:10:59 +02:00
Petr Škoda
116ad39b7a MDL-34877 add tinymce subplugin setting support
Includes migration of spell related settings to spellchecker plugin.
2012-08-24 16:10:59 +02:00
Ankit Agarwal
5fbe2118bc MDL-34549 libraries: Changing strictness of context::instance_by_id() when required 2012-08-24 11:30:35 +08:00
Ankit Agarwal
d197ea4300 MDL-34549 libraries: Replace get_context_instance_by_id() by context::instance_by_id() 2012-08-24 11:30:10 +08:00
Tim Lock
3033853942 MDL-31623 Course: Course reset bypass modules, which are removed 2012-08-24 10:58:53 +08:00
Tim Hunt
d2acbd1ad4 MDL-34993 questions: convert numeric fields to float on load.
NUMBER(X,Y) typically come back from the DB as strings. If you don't
convert them to float, then when you display them, it appears as
1.0000000, which is not normally what you want.

Also, increase the size of the field on the edit form, so if you
question does have default mark 0.1234567, you can see that!
2012-08-23 19:28:05 +01:00
Eloy Lafuente (stronk7)
7f4de36ddb MDL-31957 Course reset: Add missing global 2012-08-23 02:04:13 +02:00
Dan Poltawski
957a5fa7a4 MDL-34853 tests - fix broken phpunit test 2012-08-22 10:13:52 +08:00
Eloy Lafuente (stronk7)
b6b34345ac Merge branch 'MDL-34853' of local stronk7 repo.
(originally w34_MDL-34853_m24_durationsetting @ git://github.com/skodak/moodle.git)
2012-08-22 03:41:14 +02:00
Eloy Lafuente (stronk7)
444af7c65f MDL-34853 code style fixes 2012-08-22 03:25:40 +02:00
Petr Škoda
38257347ed MDL-34853 add new admin setting for duration (time in seconds) 2012-08-22 03:00:11 +02:00
Petr Škoda
090b173437 MDL-34853 add weeks unit to forms element duration 2012-08-22 03:00:11 +02:00
Eloy Lafuente (stronk7)
df27efbd46 Merge branch 'wip-mdl-32759-warning' of git://github.com/rajeshtaneja/moodle 2012-08-22 02:33:34 +02:00
Eloy Lafuente (stronk7)
1f0f592cea Merge branch 'MDL-34866' of git://github.com/rlorenzo/moodle 2012-08-22 01:47:20 +02:00
Eloy Lafuente (stronk7)
77dd8ab1de Merge branch 'w34_MDL-34893_m24_phpunitparams' of git://github.com/skodak/moodle 2012-08-21 21:18:15 +02:00
Dan Poltawski
d81c02feef Merge branch 'w34_MDL-34876_m24_tinymceuninstall' of git://github.com/skodak/moodle 2012-08-21 15:44:46 +08:00
Petr Škoda
2cd58c83ea MDL-34876 improve coding style 2012-08-21 09:40:10 +02:00
Dan Poltawski
f418f82e52 Merge branch 'MDL-34648-master' of git://github.com/FMCorz/moodle 2012-08-21 14:39:54 +08:00
Adrian Greeve
2b7ece005e MDL-6424 - blocks - Adding a warning screen when the user clicks the delete link. 2012-08-21 14:31:24 +08:00
Dan Poltawski
b6476885a4 Merge branch 'wip-mdl-34293' of git://github.com/rajeshtaneja/moodle 2012-08-21 13:56:58 +08:00
Rajesh Taneja
4625404451 MDL-34293 Themes: Added tbody to flexible table 2012-08-21 13:50:38 +08:00
Frederic Massart
ad778c84e8 MDL-34648 Course: Added capability to control sections moving 2012-08-21 13:31:19 +08:00
Dan Poltawski
6c6604350d Merge branch 'w34_MDL-34901_m24_useraccess' of git://github.com/skodak/moodle 2012-08-21 12:02:17 +08:00
Dan Poltawski
74c0bc34d7 Merge branch 'MDL-34742-master' of git://github.com/FMCorz/moodle 2012-08-21 11:59:14 +08:00
Dan Poltawski
d642260cfe Merge branch 'w34_MDL-34954_m24_subplugins' of git://github.com/skodak/moodle 2012-08-21 10:34:28 +08:00
Eloy Lafuente (stronk7)
fffb9b9064 Merge branch 'w34_MDL-34912_m24_description' of git://github.com/skodak/moodle 2012-08-21 02:39:10 +02:00
Eloy Lafuente (stronk7)
ee998a687c Merge branch 'MDL-34889' of git://github.com/timhunt/moodle 2012-08-21 02:24:50 +02:00
Eloy Lafuente (stronk7)
afe404068d Merge branch 'MDL-29847' of git://github.com/timhunt/moodle 2012-08-21 01:28:34 +02:00
Eloy Lafuente (stronk7)
57733008c9 Merge branch 'MDL-31957-master' of git://github.com/sammarshallou/moodle 2012-08-21 01:21:18 +02:00