Commit graph

14020 commits

Author SHA1 Message Date
Dan Poltawski
8d9dd85d97 Merge branch 'MDL-13629_droplow_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2012-07-25 12:29:47 +08:00
Dan Poltawski
55bf451676 Merge branch 'w30_MDL-34441_m23_dbtransfer' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-25 10:51:15 +08:00
Sam Hemelryk
5986099daa Merge branch 'w30_MDL-34475_m23_saveondefault' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-25 11:13:16 +12:00
Sam Hemelryk
ea268875fb Merge branch 'MDL-27083-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-25 09:18:19 +12:00
Dan Poltawski
51609ef88a Merge branch 'MDL-34484_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-07-24 15:40:26 +08:00
Petr Škoda
e2ecc7c6cc MDL-34475 add default value to xmldb_field hash calculation 2012-07-23 21:36:39 +02:00
Tim Hunt
53e2f1aad8 MDL-34484 unit tests: stop phpunit using testcase names as class names 2012-07-23 11:10:38 +01:00
Aparup Banerjee
bb9b19a7fd MDL-34449 phpdoc typo correction 2012-07-23 16:40:30 +08:00
Aparup Banerjee
8e711c3af0 Merge branch 'w30_MDL-34449_m23_layoutmaddness' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-23 16:40:11 +08:00
Dan Poltawski
96647229fc Merge branch 'wip-MDL-34404-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE 2012-07-23 13:26:12 +08:00
Dan Poltawski
7ccdba8821 Merge branch 'w30_MDL-34396_m23_loginhttpsspell' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-23 12:20:05 +08:00
Frederic Massart
82a0137aa5 MDL-27083 Questions: Orphaned questions are adopted on upgrade
Conflicts:

	version.php
2012-07-23 11:58:56 +08:00
Marina Glancy
9ff506d165 MDL-34221 disabledIf support for filemanager and filepicker elements 2012-07-23 12:08:49 +12:00
Davo Smith
252bd1871b MDL-34221 Filepicker - disableIf now prevents drag and drop upload 2012-07-23 12:08:49 +12:00
Davo Smith
548f536a00 MDL-33927 Filemanager - enforce the maxfiles limit on form submission 2012-07-23 12:01:24 +12:00
Aaron Barnes
a6fa8a7265 MDL-34243 completion: get_criteria() incorrectly passing object 2012-07-23 09:38:57 +12:00
Petr Škoda
9134f9aa9c MDL-34441 prevent mysqli::close() notice after failed mysql driver connect 2012-07-22 20:57:04 +02:00
Petr Škoda
6b986b7b6a MDL-34441 always use proper charset in htmlspecialchars() calls 2012-07-22 20:57:03 +02:00
Petr Škoda
4b195fe9e9 MDL-34441 cleanup dtl related phpdocs and minor style improvements 2012-07-22 20:57:02 +02:00
Petr Škoda
1c005cbf12 MDL-34449 lazy load theme layout otpions
This should allow us to switch page layout on admin pages and elsewhere before $OUTPUT->header() call.
2012-07-22 15:34:23 +02:00
Luke Tucker
ab706cc971 MDL-34396 Ensure TinyMCE editor spell checking works on pages with $PAGE->https_required() 2012-07-21 20:29:50 +02:00
Sam Hemelryk
62145412bb MDL-33448 javascript: Added caching for the YUI instance used for debug in get_string 2012-07-19 20:22:37 +12:00
Andrew Davis
cfe170e430 MDL-13629 grade: added some unit tests to clarify the handling of droplow and improved apply_limit_rules() 2012-07-18 09:14:59 +08:00
Andrew Robert Nicols
8a172fa7cf MDL-33874 Don't warn about focussed form fields with the ignoredirty class 2012-07-18 09:35:12 +12:00
David Monllaó
e52f82253e MDL-30876 filter_mediaplugin Wrapping the style sheets access with try & catch
Conflicts:

	lib/javascript-static.js
2012-07-17 12:21:07 +12:00
Dan Poltawski
4923e18d75 Merge branch 'MDL-23219_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-07-16 14:32:54 +08:00
Dan Poltawski
24527f63bb Merge branch 'MDL-31622-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-16 11:34:21 +08:00
Dan Poltawski
d835681e35 Merge branch 'MDL-34211' of git://github.com/appalachianstate/moodle into MOODLE_23_STABLE 2012-07-16 11:15:55 +08:00
Dan Poltawski
4da22142bc Merge branch 'w29_MDL-34271_m23_mysqlcollation' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-16 11:00:56 +08:00
Sam Hemelryk
828a42c37d Merge branch 'MDL-32310-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE 2012-07-16 11:00:57 +12:00
Andrew Robert Nicols
e7bf0155f7 MDL-33874 Allow form fields to be ignored by the formchangechecker 2012-07-16 09:26:11 +12:00
Sam Hemelryk
bac9070359 Merge branch 'MDL-33788b-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE 2012-07-16 09:18:46 +12:00
Tim Hunt
7bef3664b8 MDL-23219 check permissions: show relevant role-assignments.
Adding this list of role assignments should make it much easier for
admins to work out why, when the permissions shown in the check
permisisons page are now what they expect.

I thought about making the links go more directly to, for example, the
assign roles pages for each context, but because of things like
enrolments in courses that is hard. It is only two clicks to go to the
context, then click the right link in the settings block there.

I also re-orderd some of the code in check.php to try to get all the DB
code before all the output code.
2012-07-13 15:21:17 +01:00
Frederic Massart
7397acb145 MDL-31622 Forms: Date selector supports i18n 2012-07-13 08:57:29 +08:00
Fred Woolard
eab8660e8f MDL-34211 Use the $table_name argument to check against $metatables key values 2012-07-12 10:54:10 -04:00
Petr Škoda
41e8883ea8 MDL-34271 use the same collation when adding new tables or columns 2012-07-12 14:41:28 +02:00
Petr Škoda
7ec63b27d0 MDL-34271 cleanup mysql engine hack before adding similar collation hack 2012-07-12 14:41:27 +02:00
Paul Nicholls
074236eee7 MDL-32582 - filter/multimedia: MP3 Flow Player doesn't work in Chrome if empty stylesheets are present 2012-07-12 13:40:43 +08:00
Petr Skoda
229aabf7c6 MDL-33712 add support for unique moodle tags in tinymce 2012-07-10 15:56:11 +08:00
Dan Poltawski
b2e5a60773 MDL-34159 - add comment lost from previous commit 2012-07-10 12:58:46 +08:00
Dan Poltawski
57c7815213 Merge branch 'w28_MDL-34159_m23_wherelist' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-10 12:56:07 +08:00
Petr Škoda
95896749a5 MDL-33617 add new index to improve perf of enrol related role_assignments
Conflicts:

	version.php
2012-07-10 15:49:38 +12:00
Petr Škoda
c8b7088463 MDL-33887 delay string fetching in PAGE->requires->string_for_js() till page footer
This should resolve problems with language switching such as when forcing course language.
2012-07-10 15:08:26 +12:00
Dan Poltawski
1f34fa79c2 Merge branch 'w28_MDL-34147_m23_cygwin' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-10 10:31:24 +08:00
Sam Hemelryk
3ca82ed605 Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-10 12:43:42 +12:00
Marina Glancy
2eb66f3500 MDL-34139 filemanager select-file dialogue should update file on Enter 2012-07-10 12:24:08 +12:00
Sam Hemelryk
bd75b67885 Merge branch 'MDL-29470-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-10 12:09:26 +12:00
Sam Hemelryk
3936796042 Merge branch 'MDL-32297-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-10 12:05:33 +12:00
Dan Poltawski
0dd189d59d Merge branch 'MDL-18301-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-09 14:27:15 +08:00
Dan Poltawski
d85083312c Merge branch 'wip-mdl-29969-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2012-07-09 13:39:18 +08:00