Commit graph

16864 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f8c54a7469 MDL-37516 Translate fieldnames on output only.
This reverts a change performed by the previous commit where user
fieldnames were being translated (and cached) when fetched,
causing the information to remain static later, not responding
to language switches (and perhaps leading to other problems if those
structures are used lated for DB / $USER comparisons.

With the commit, the translation happens on output, so no
potential interferences will happen and, also, the information
changes dynamically on lang switching.
2013-07-02 20:39:05 +02:00
sam marshall
6316bfa0c7 MDL-37516 Conditional activities: user field condition display fixes 2013-07-02 20:00:17 +02:00
Eloy Lafuente (stronk7)
1203222a3c Merge branch 'MDL-40246_master' of git://github.com/dmonllao/moodle 2013-07-02 14:27:34 +02:00
Eloy Lafuente (stronk7)
3c2e7a0e7c Merge branch 'MDL-34472-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	lib/upgrade.txt
2013-07-02 14:09:11 +02:00
Damyon Wiese
f48f4827d1 Merge branch 'w27_MDL-40299_m26_textlib' of https://github.com/skodak/moodle 2013-07-02 15:23:38 +08:00
Dan Poltawski
fe6d32fcb3 Merge branch 'MDL-40282' of github.com:colchambers/moodle 2013-07-02 15:15:04 +08:00
Ankit Agarwal
bfb99cc619 MDL-34472 phpunit: Make sure a debugging is thrown when get_context_instance() is called 2013-07-02 15:09:01 +08:00
Rajesh Taneja
cc1b501595 MDL-40127 Enrolments: Added status to instance info and removed displaying of enrolment form with notice
get_enrol_info will return status of enrolment instance, to notify webservice if enrolment is possible or not
If enrolment is not possible then don't show enrolment form
show_enrolme_link will use can_self_enrol to varify if enrolment link should be shown or not.
2013-07-02 14:35:33 +08:00
Rajesh Taneja
85d1c53af4 MDL-40127 Enrolments: Abstracted self_enrolment code so as to be used by webservices 2013-07-02 14:35:33 +08:00
Dan Poltawski
20cea2c57f Merge branch 'MDL-40297' of git://github.com/stronk7/moodle 2013-07-02 13:43:40 +08:00
Dan Poltawski
b25cd1f3d5 Merge branch 'w27_MDL-40399_m26_msarrayshift' of https://github.com/skodak/moodle 2013-07-02 13:34:09 +08:00
Damyon Wiese
a57885a651 Merge branch 'w27_MDL-26943_m26_localsubplugins' of https://github.com/skodak/moodle 2013-07-02 11:00:33 +08:00
Dan Poltawski
ad3ebb8f5f Merge branch 'w27_MDL-40266_m26_arrayshift' of https://github.com/skodak/moodle 2013-07-02 09:55:20 +08:00
Eloy Lafuente (stronk7)
c6638cd6ce Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle 2013-07-02 00:43:31 +02:00
Sam Hemelryk
93b2977d9d Merge branch 'MDL-39733' of git://github.com/stronk7/moodle 2013-07-02 10:31:48 +12:00
Eloy Lafuente (stronk7)
2e746b72be MDL-39733 xhprof: implement import of runs 2013-07-02 00:28:47 +02:00
Ankit Agarwal
bea86e845e MDL-34472 libraries: Remove usage of get_context_instance() from core 2013-07-01 15:40:37 +08:00
Ankit Agarwal
61a0299a94 MDL-34472 libraries: add deprecated warning to get_context_instance() 2013-07-01 15:40:37 +08:00
Rajesh Taneja
ce2b21509e MDL-35009 Libraries: Deprecated get_context_instance_by_id 2013-07-01 14:55:23 +08:00
Petr Škoda
7aed7f46ab MDL-40266 improve emulate_bound_params() for mssql driver
Looping over large numbers of items with array_shift() is expensive.
Reverse the array and fetch items from the top of the pile.

Credit goes to Martin Langhoff for original mysqli fix.
2013-07-01 08:52:03 +02:00
Petr Škoda
b983901d48 MDL-40266 improve emulate_bound_params() for sqlsrv driver
Looping over large numbers of items with array_shift() is expensive.
Reverse the array and fetch items from the top of the pile.

Credit goes to Martin Langhoff for original mysqli fix.
2013-07-01 08:51:35 +02:00
Dan Poltawski
91d445db9a Merge branch 'wip-MDL-39212-m26' of git://github.com/samhemelryk/moodle 2013-07-01 11:55:45 +08:00
Dan Poltawski
536a240891 Merge branch 'wip-MDL-40344-m26' of git://github.com/samhemelryk/moodle 2013-07-01 11:21:47 +08:00
Martin Langhoff
4f3e38e745 MDL-40266 improve emulate_bound_params() for mysqli
Looping over large numbers of items with array_shift() is expensive.
Reverse the array and fetch items from the top of the pile.
2013-06-30 18:25:14 +02:00
Petr Škoda
3601c5f09c MDL-26943 implement subplugin support for local plugins 2013-06-30 09:18:35 +02:00
David Mudrák
a7182af94a MDL-35206 Fix the links list enumeration in the html2text library 2013-06-28 13:10:10 +02:00
Colin Chambers
4704eda0f0 MDL-40282 Collapsible editor loses border in IE8-9 2013-06-28 11:18:28 +01:00
Sam Hemelryk
1eb2b51703 MDL-39212 css: we now chunk and no longer separate 2013-06-28 16:49:02 +12:00
Eloy Lafuente (stronk7)
2e07539699 MDL-39733 profiling: UI for importing runs 2013-06-28 04:46:40 +02:00
Eloy Lafuente (stronk7)
1d3d4d1376 MDL-39733 profiling: UI for exporting runs 2013-06-28 04:46:40 +02:00
Eloy Lafuente (stronk7)
e36a3e3643 MDL-39733 xhprof: implement export of runs 2013-06-28 04:46:39 +02:00
Eloy Lafuente (stronk7)
19263336a0 MDL-40297 whitespace, comments & var names cleanup 2013-06-28 04:46:00 +02:00
Dmytro Vorona
42b40f99c1 MDL-40297 Hide empty categories in my courses
This is a followup of MDL-38631 were was detected that
whith categories being displayed in my courses, some of
them, not having courses for the user, were still shown.

With this patch, any category in the tree, not having courses
is automatically hidden, any depth.
2013-06-28 04:46:00 +02:00
Sam Hemelryk
09da042b36 MDL-40344 navigation: expandable branch id is now properly unique 2013-06-28 09:59:13 +12:00
Petr Škoda
dd24dd37ee MDL-39088 use word "Uninstall" consistently in plugin administration UI 2013-06-27 22:20:36 +02:00
Petr Škoda
d2fba597ef MDL-39088 migrate tinymce plugins uninstallation to plugin_manager 2013-06-27 22:20:36 +02:00
Petr Škoda
958b0af64f MDL-39088 migrate admin tool uninstallation to plugin_manager 2013-06-27 22:20:36 +02:00
Petr Škoda
0a53e5c5ae MDL-39088 migrate report uninstallation to plugin_manager 2013-06-27 22:20:36 +02:00
Petr Škoda
142f9d5087 MDL-39088 migrate plagiarism uninstallation to plugin_manager 2013-06-27 22:20:35 +02:00
Petr Škoda
cd79930e4d MDL-39088 migrate module uninstallation to plugin_manager 2013-06-27 22:20:35 +02:00
Petr Škoda
5643f932e9 MDL-39088 migrate enrol uninstallation to plugin_manager 2013-06-27 22:20:35 +02:00
Petr Škoda
b07526e8de MDL-39088 migrate editor uninstallation to plugin_manager 2013-06-27 22:20:35 +02:00
Petr Škoda
8a953d629f MDL-39088 migrate course format uninstallation to plugin_manager 2013-06-27 22:20:35 +02:00
Petr Škoda
6584d8a861 MDL-39088 migrate block uninstallation to plugin_manager 2013-06-27 22:20:35 +02:00
Petr Škoda
2f87bb0315 MDL-39088 add new general uninstall url support to plugin manager 2013-06-27 22:20:34 +02:00
Petr Škoda
d534708fd3 MDL-40299 textlib conversion to core_text and core_collator 2013-06-27 22:18:57 +02:00
David Monllao
d0a9a29bd0 MDL-40246 mod_forum: Changing scenario to non-JS
Also replacing hardcoded waits for a
wait to be redirected.
2013-06-27 14:24:00 +08:00
Eloy Lafuente (stronk7)
26568ba865 Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle 2013-06-26 12:30:41 +02:00
Petr Škoda
f18c764a7c MDL-39701 prevent string filtering before finishing 2.5 upgrade 2013-06-26 09:50:33 +02:00
Eloy Lafuente (stronk7)
09579cd198 Merge branch 'MDL-40033_master' of git://github.com/dmonllao/moodle 2013-06-25 12:08:15 +02:00