Dan Poltawski
99da334454
Merge branch 'MDL-34228-master' of git://github.com/sammarshallou/moodle
2012-10-16 16:19:25 +08:00
Dan Poltawski
ac088b1c21
Merge branch 'w42_MDL-35904_m24_mainadmin' of git://github.com/skodak/moodle
2012-10-16 14:50:30 +08:00
Dan Poltawski
ea0a092e99
Merge branch 'wip-mdl-32218' of git://github.com/rajeshtaneja/moodle
2012-10-16 14:35:28 +08:00
Dan Poltawski
9b0a3e17ba
Merge branch 'wip-MDL-35769-master' of git://github.com/marinaglancy/moodle
2012-10-16 13:41:17 +08:00
Sam Hemelryk
f7de90a74a
MDL-33857 fixed up whitespace
2012-10-16 13:32:34 +08:00
Sam Hemelryk
2bbf03ce3b
Merge branch 'wip-MDL-33857-master' of git://github.com/marinaglancy/moodle
2012-10-16 13:31:44 +08:00
Sam Hemelryk
8422094d91
Merge branch 'MDL-35198' of git://github.com/mouneyrac/moodle
2012-10-16 11:23:24 +08:00
Aparup Banerjee
2872bd5101
Merge branch 'wip-MDL-35850-master' of git://github.com/abgreeve/moodle
2012-10-16 11:08:01 +08:00
Dan Poltawski
43c7341b82
Merge branch 'wip-MDL-32184-master' of http://github.com/phalacee/moodle
2012-10-16 10:48:23 +08:00
Aparup Banerjee
cb6b5fb625
Merge branch 'wip-MDL-35265-master' of git://github.com/abgreeve/moodle
...
Conflicts:
version.php
2012-10-16 10:46:11 +08:00
Dan Poltawski
dab6b11914
Merge branch 'w42_MDL-35955_m24_geckospell' of git://github.com/skodak/moodle
2012-10-16 09:57:30 +08:00
Dan Poltawski
f186ad1f90
Merge branch 'wip-MDL-35339-master' of git://github.com/marinaglancy/moodle
2012-10-15 17:19:44 +08:00
Marina Glancy
44aa854e93
MDL-35339 coding style corrections
2012-10-15 16:57:25 +08:00
Dan Poltawski
348be850c9
Merge branch 'w42_MDL-35854_m24_usergenerator' of git://github.com/skodak/moodle
2012-10-15 16:03:53 +08:00
Marina Glancy
dddbbac3f7
MDL-35661 Check that plugin is installed before including settings.php
2012-10-15 15:47:41 +08:00
Aparup Banerjee
de5a44eb3a
Merge branch 'w42_MDL-36031_m24_messagesink' of git://github.com/skodak/moodle
2012-10-15 14:36:02 +08:00
Aparup Banerjee
af6b7edaee
Merge branch 'MDL-30845-master' of git://github.com/ankitagarwal/moodle
2012-10-15 14:21:11 +08:00
Marina Glancy
a49e2ea7e6
MDL-35769 Course formats: Added function format_base::default_blocks() to replace format config.php
2012-10-15 14:14:33 +08:00
Marina Glancy
b46be6adf4
MDL-35339 Better cache reset for get_fast_modinfo(), allow exec get_fast_modinfo($courseid)
2012-10-15 14:08:15 +08:00
Marina Glancy
38b19bbca1
MDL-35339 call rebuild_course_cache() always (and only) after changing course modules or sections
2012-10-15 14:08:14 +08:00
Marina Glancy
384c3510a9
MDL-35339 Course functions unit tests
2012-10-15 14:08:14 +08:00
Marina Glancy
4ede27b253
MDL-35339 deprecate get_course_section() replace with course_create_sections_if_missing()
...
By passing course object instead of course id we ensure proper cache reset"
2012-10-15 14:08:14 +08:00
Marina Glancy
9796014660
MDL-35339 added deprecated information in upgrade.txt
2012-10-15 14:08:14 +08:00
Marina Glancy
d57aa283f7
MDL-35339 Deprecate get_all_mods() add get_module_types_names()
...
- added function get_module_types_names() returning the list of localised strings used for module names;
- added function cm_info::get_used_module_names();
- added magic properties cm_info:: and cm_info:: returning human readable module name;
- replaced usage of function get_all_mods() with get_fast_modinfo() and get_module_types_names();
- function print_section_add_menus() may now retrieve the modules names list itself;
- deprecated function get_all_mods()
2012-10-15 14:08:13 +08:00
Marina Glancy
722e6ba947
MDL-35339 Deprecate add_mod_to_section(), create new function course_add_cm_to_section()
...
Function add_mod_to_section() has very confusing arguments when object looks like record from
table course_modules but field ->section refers to relative section number (course_sections.section).
In table course_modules the field section refers to course_sections.id.
Also add_mod_to_section() does not update table course_modules and does not call rebuild_course_cache()
which developer can forget to do afterwards.
- Added function course_add_cm_to_section()
- In the core code add_mod_to_section() is replaced with course_add_cm_to_section()
- Function add_mod_to_section() is deprecated
2012-10-15 14:08:13 +08:00
Marina Glancy
99e9f9a69d
MDL-35339 deprecate function get_all_sections()
2012-10-15 14:08:13 +08:00
Ankit Agarwal
83e9b8f9de
MDL-30845 formslib: Freeze should always be with persistantfreeze set to false since Frozen text fields are now rendered as input fields
2012-10-15 14:01:46 +08:00
Ankit Agarwal
3ec55b9e0a
MDL-30845 accessibility: changing the way input fields are rendered when they are not-editable
2012-10-15 14:01:46 +08:00
Dan Poltawski
6bea7da1ab
Merge branch 'wip-MDL-35661-master' of git://github.com/marinaglancy/moodle
2012-10-15 13:31:10 +08:00
Eloy Lafuente (stronk7)
990853afbe
Merge branch 'wip-MDL-25290-m24-compact' of git://github.com/samhemelryk/moodle
2012-10-14 23:32:40 +02:00
Petr Škoda
4c9e03f0ac
MDL-36031 implement message redirection for unit testing
2012-10-13 20:00:54 +02:00
Petr Škoda
fe67134eaa
MDL-35854 fix username generator
...
This eliminates infinite loop and also fixes potentially invalid email derived from usernames created from unicode first/last name.
2012-10-13 09:57:35 +02:00
Petr Škoda
550790153a
MDL-35904 send notifications from main admin and improve coding style
2012-10-13 09:52:45 +02:00
Petr Škoda
3ed5751685
MDL-35904 improve caching in get_admin() and fix order of records from get_admins()
2012-10-13 09:52:39 +02:00
Petr Škoda
83828a7725
MDL-35955 use built in spell checker if tinymce spelling plugin disabled
2012-10-13 09:49:58 +02:00
Eloy Lafuente (stronk7)
05c301a109
Merge branch 'w41_MDL-35691_m24_intsizes' of git://github.com/skodak/moodle
2012-10-10 10:58:22 +02:00
Petr Škoda
633f324896
MDL-35691 fix bogus mysql integer size detection
2012-10-10 10:33:18 +02:00
Marina Glancy
43aadf0401
MDL-33857 Increase performance of queries for Server files repository (small improvements)
2012-10-10 15:21:27 +08:00
Marina Glancy
b8de262139
MDL-33857 Increase performance of queries for Server files repository
...
- file_info class now has new methods get_non_empty_children and count_non_empty_children; added default implementation;
- all core classes extending file_info have their implementation of those methods;
- class repository_local_file used for caching get_children() results is removed;
- class repository_local rewritten to use new methods from file_info;
- added caching of retrieved modules in file_browser::get_file_info_context_module() - this query is slow and executed multiple times on big servers
2012-10-10 15:21:26 +08:00
Sam Hemelryk
c2e899a444
MDL-22955 output: Forced SVG use in unit tests for pix to fix unit test fails
2012-10-10 14:14:50 +08:00
Aparup Banerjee
e5dba28cca
Merge branch 'w41_MDL-35839_m24_enroldeletecleanup' of git://github.com/skodak/moodle
2012-10-10 10:29:33 +08:00
Eloy Lafuente (stronk7)
dbaf9d448d
Merge branch 'wip-MDL-22955-m24' of git://github.com/samhemelryk/moodle
2012-10-10 00:35:11 +02:00
Eloy Lafuente (stronk7)
2beba29760
MDL-35898 test reset: tidyup comments (forgot to amend previous commit, grrr).
2012-10-09 11:56:42 +02:00
Eloy Lafuente (stronk7)
02c4953ea5
Merge branch 'w41_MDL-35898_m24_coursereset' of git://github.com/skodak/moodle
2012-10-09 11:54:15 +02:00
Petr Škoda
13d5c93872
MDL-35898 include static course caches in test resets
2012-10-09 09:43:08 +02:00
Aparup Banerjee
7b1c902acc
Merge branch 'wip-MDL-30754-m24' of git://github.com/samhemelryk/moodle
2012-10-09 14:32:13 +08:00
Adrian Greeve
f417479e3d
MDL-35850 - Lib - csv files are now trimmed for white space and new lines at the end of the file.
2012-10-09 13:16:26 +08:00
Aparup Banerjee
99baba4079
Merge branch 'w41_MDL-35795_m24_hebrewunzip' of git://github.com/skodak/moodle
2012-10-09 10:16:30 +08:00
Marina Glancy
2567584d5e
MDL-35661 Loading of plugin settings for webservices plugins (plugininfo_webservice)
...
- webservicesettings must be only created if user has site:config capability, otherwise the nodes are added to non-existing parent
2012-10-09 09:58:00 +08:00
Marina Glancy
c517dd68f7
MDL-35661 Loading of plugin settings for repositories plugins (plugininfo_repository)
2012-10-09 09:57:59 +08:00