Commit graph

14173 commits

Author SHA1 Message Date
Frederic Massart
c31dc0b695 MDL-33828 Portfolio: prevent notices while exporting to portfolios 2012-07-03 09:33:17 +08:00
Sam Hemelryk
e1d7771b0f Merge branch 'MDL-33814-master' of git://github.com/FMCorz/moodle 2012-07-03 11:36:01 +12:00
Sam Hemelryk
b624ae9a2b Merge branch 'MDL-33990' of git://github.com/danpoltawski/moodle 2012-07-03 10:36:57 +12:00
Sam Hemelryk
4df3e2bedf MDL-34014 cssoptimiser: Fixed some aweful spelling 2012-07-03 10:34:20 +12:00
Eloy Lafuente (stronk7)
43a6a288b4 Merge branch 'mssql-case-sensitive' of git://github.com/danpoltawski/moodle 2012-07-02 21:05:08 +02:00
Eloy Lafuente (stronk7)
44cb29a063 MDL-34121 bump versions to efectively get the upgrade performed. 2012-07-02 18:15:47 +02:00
Eloy Lafuente (stronk7)
d207a888ba Merge branch 'w27_MDL-34121_m24_killbackupmess' of git://github.com/skodak/moodle 2012-07-02 18:12:57 +02:00
Tim Hunt
5415d91e20 MDL-34145 postgres driver: fix get_tables perf on <= 9.0
The query of the information_schema view seems to be painfully slow on
older versions of postgres (2000ms instead of 20ms). Therefore, it is
worth detecting that case, and using a more postgres specific feedback.
This is particularly important for 2.3+ unit tests.

Thanks to Petr Skoda for his help with this.
2012-07-02 16:19:00 +01:00
Dan Poltawski
79121bb8ef Merge branch 'wip-MDL-33948-master' of git://github.com/marinaglancy/moodle 2012-07-02 17:44:01 +08:00
Dan Poltawski
6cad0dddd7 Merge branch 'MDL-33916-master-2' of git://git.luns.net.uk/moodle 2012-07-02 17:35:46 +08:00
Dan Poltawski
2d9c0d1174 MDL-31802 - navigation: add a comment about session reduction 2012-07-02 17:30:26 +08:00
Dan Poltawski
539f2381f6 Merge branch 'MDL-31802' of git://github.com/aolley/moodle 2012-07-02 17:24:48 +08:00
Dan Poltawski
fc7f44a961 Merge branch 'wip-MDL-34117-master' of git://github.com/marinaglancy/moodle 2012-07-02 17:09:44 +08:00
Dan Poltawski
6fa25ccd26 Merge branch 'w27_MDL-34120_m24_delpass' of git://github.com/skodak/moodle 2012-07-02 16:48:22 +08:00
Dan Poltawski
f8425a1d31 Merge branch 'w27_MDL-34125_m24_tablename' of git://github.com/skodak/moodle 2012-07-02 16:46:21 +08:00
Dan Poltawski
1f1de4f6da Merge branch 'MDL-25476_email_from_support' of git://github.com/andyjdavis/moodle 2012-07-02 15:41:16 +08:00
David Mudrák
d5d2e3531f MDL-34019 Fix response item key name 2012-07-02 15:02:58 +08:00
Rajesh Taneja
ba0dde9785 MDL-29969 Administration: Default value for numsections is set to 1 for site frontpage 2012-07-02 14:26:15 +08:00
David Balch
c7aed1e11b MDL-34063 XHTML files should use the HTML icon, not the markup icon 2012-07-02 14:25:56 +08:00
Marina Glancy
b2dbfa90cc MDL-34117 Correctly pass accepted_types to dnduploader 2012-07-02 14:12:31 +08:00
Marina Glancy
3b6629c088 MDL-33948 file_save_draft_area_files() validates if references are allowed and allows unlimited file size 2012-07-02 14:11:55 +08:00
Frederic Massart
c947ea3e3f MDL-33303 Filepicker: resized to match HTML editor and made resizable 2012-07-02 11:34:34 +12:00
Eloy Lafuente (stronk7)
cf16aed6f7 Merge branch 'w27_MDL-34130_m24_recordsettests' of git://github.com/skodak/moodle 2012-07-01 21:58:59 +02:00
Petr Škoda
c56cdae977 MDL-34130 prevent some warning in PHPStorm 2012-07-01 21:50:36 +02:00
Petr Škoda
3b5f6e6c2a MDL-34130 test recordset data is static
We do not want recordset results to be affected by subsequent update or delete queries.
2012-07-01 21:35:37 +02:00
Petr Škoda
4993d5fe00 MDL-34130 add missing rs close
Thanks Eloy!
2012-07-01 21:24:13 +02:00
Petr Škoda
e1defa2ed5 MDL-34130 test interaction of recordsets and transactions 2012-07-01 21:23:54 +02:00
Petr Škoda
541ca062f1 MDL-34130 test nested recordset iteration 2012-07-01 21:23:37 +02:00
Petr Škoda
401793a36d MDL-34130 fix data inserts in recordset tests 2012-07-01 21:23:21 +02:00
Petr Škoda
afe1cf72a0 MDL-34125 fix regression when deleting activity modules
Credit goes to Gordon Bateson.
2012-07-01 10:04:54 +02:00
Eloy Lafuente (stronk7)
ba4e17574f Merge branch 'MDL-32249c' of github.com:srynot4sale/moodle 2012-07-01 02:02:56 +02:00
Petr Škoda
3cbad151af MDL-34123 use user's lang when sending new emails 2012-06-30 20:46:04 +02:00
Petr Škoda
3f4a299936 MDL-34121 drop unused backup tables that were supposed to be dropped long ago
The backup/restore leftovers that referenced these will be dropped in 2.4
2012-06-30 13:58:51 +02:00
Dan Poltawski
609541df30 MDL-34081 dml: mssql driver was using case insensitve sql 2012-06-30 18:56:57 +08:00
Petr Škoda
8205498fa0 MDL-34120 do not try to create new passwords for incorrectly deleted users
There is still some code that ignores delete_user() and instead hacks the user table directly, skip the borked user records for now when sending new passwords.
2012-06-30 08:55:39 +02:00
Petr Škoda
c82d309d07 MDL-34115 fix sorting in blocks admin UI
Comparison of arrays is not locale aware.
2012-06-30 08:33:34 +02:00
Frederic Massart
7b38412d49 MDL-32297 Forms: Date Picker JS popup is not constraint to parent form 2012-06-29 14:17:56 +08:00
Aparup Banerjee
99c3c503e0 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:41:09 +08:00
Adam Olley
51591b2c0e MDL-31802: Remove section summaries from navigation_cache 2012-06-28 11:04:41 +09:30
Tim Hunt
32c842e290 MDL-34035 help links: allow other types of URL for plugins.
For third-parth plugins, in can be helpful if the 'More help' links in
help pop-ups (the ones that come from $string['..._link'] string in the
language file) can go to other places.

This change support two other sorts of URL in addition to the standard
'course/editing' type of link that goes to MoodelDocs.

You can use absolute URLs, starting http:// or https:///

You can use a link starting %%WWWROOT%%, and that token is replaced by
$CFG->wwwroot to make the link.
2012-06-26 18:54:15 +01:00
Tim Hunt
ebbc5e7bfd MDL-34008 formslib: repeat_elements replace {no} for submits & buttons 2012-06-26 09:59:37 +01:00
Mark Nelson
4eafabc2a6 MDL-29538 core_condition: Rebase with integration removed add table function 2012-06-26 15:18:54 +08:00
Mark Nelson
94b94c38e7 MDL-29538 core_condition: Section conditions are now deleted from DB 2012-06-26 15:18:53 +08:00
Mark Nelson
e01fbcf765 MDL-29538 core_condition: Integrated with the latest code, can now place user field conditions on sections as well 2012-06-26 15:18:53 +08:00
Sam Hemelryk
33e657c7e7 MDL-29538 core_condition: Pre-integration merge cleanup
* Fixed up database installation and upgrade code
* Reverted some whitespace optimisations to minimise conflicts
* Optimised commits made by Mark to reduce complexity and add tracker issue numbers
2012-06-26 15:18:53 +08:00
Mark Nelson
d2170cb542 MDL-29538 core_condition: moved the deletion of the course_modules_availability information above the deletion of the course modules 2012-06-26 15:18:53 +08:00
Mark Nelson
33f30decce MDL-29538 core_condition: clear the userid from the user field cache when wiping the session 2012-06-26 15:18:53 +08:00
Mark Nelson
129e4a73ec MDL-29538 core_condition: cached result in usercondition array now stores all attributes 2012-06-26 15:18:53 +08:00
Mark Nelson
a8f84c287c MDL-29538 core_condition: code cleanup 2012-06-26 15:18:52 +08:00
Mark Nelson
e7b4bd3ef5 MDL-29538 core_condition: constants are no longer set using language strings 2012-06-26 15:18:52 +08:00