Commit graph

14173 commits

Author SHA1 Message Date
Fred Woolard
ce6ab1b96b MDL-34211 Use the $table_name argument to check against $metatables key values 2012-07-16 11:16:55 +08:00
Dan Poltawski
3c309ba6a4 Merge branch 'w29_MDL-34271_m24_mysqlcollation' of git://github.com/skodak/moodle 2012-07-16 11:00:48 +08:00
Dan Poltawski
3f728cdbbe Merge branch 'wip-MDL-33720-m24' of git://github.com/samhemelryk/moodle 2012-07-16 10:01:15 +08:00
Sam Hemelryk
2ec3484dbe Merge branch 'MDL-32310' of git://github.com/danpoltawski/moodle 2012-07-16 11:01:09 +12:00
Sam Hemelryk
11f8318ccc Merge branch 'MDL-33874-master-1' of git://git.luns.net.uk/moodle 2012-07-16 09:25:21 +12:00
Sam Hemelryk
8fcf6d22bd Merge branch 'MDL-33788b' of git://github.com/srynot4sale/moodle 2012-07-16 09:18:56 +12:00
Tim Hunt
ab0c7007c5 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:16:57 +01:00
Frederic Massart
a0658f00ca MDL-31622 Forms: Date selector supports i18n 2012-07-13 08:57:13 +08:00
Sam Hemelryk
22ba3f0809 MDL-33720 navigation: Added debug noticed to old (deprecated) local plugin callback 2012-07-13 09:19:04 +12:00
Petr Škoda
1eece17648 MDL-34271 use the same collation when adding new tables or columns 2012-07-12 14:39:36 +02:00
Petr Škoda
ed047dabc9 MDL-34271 cleanup mysql engine hack before adding similar collation hack 2012-07-12 14:39:36 +02:00
Paul Nicholls
42648dd405 MDL-32582 - filter/multimedia: MP3 Flow Player doesn't work in Chrome if empty stylesheets are present 2012-07-12 13:39:58 +08:00
Aparup Banerjee
60829d8094 MDL-34225 course completion : moved criteria classes into criteria subdir 2012-07-12 12:04:36 +08:00
Aaron Barnes
eb8f89a976 MDL-22259 completion: Rename "Course Prerequisites" to "Completion Dependencies" 2012-07-12 15:55:34 +12:00
Andrew Robert Nicols
52dc017114 MDL-33874 Allow form fields to be ignored by the formchangechecker 2012-07-12 01:09:43 +01:00
Dan Poltawski
7e1afba2ae Merge branch 'w28_MDL-33753_m24_utfunzip' of git://github.com/skodak/moodle 2012-07-11 17:12:57 +08:00
Petr Škoda
00f744d2b1 MDL-33753 fix sloppy refactoring regression in zip tweaking 2012-07-11 11:10:19 +02:00
Dan Poltawski
94a9c8cae1 Merge branch 'w28_MDL-33454_m24_tinymce3541' of git://github.com/skodak/moodle 2012-07-11 14:45:41 +08:00
Petr Škoda
9177036440 MDL-33454 add forgotten TinyMCE min_height setting name change 2012-07-11 08:41:06 +02:00
Sam Hemelryk
37038fa8e1 Merge branch 'w28_MDL-33753_m24_utfunzip' of git://github.com/skodak/moodle 2012-07-11 11:33:02 +12:00
Sam Hemelryk
ee2b82d8cb Merge branch 'w28_MDL-33710_m24_utfzip' of git://github.com/skodak/moodle 2012-07-11 11:27:48 +12:00
Aaron Barnes
9710fe73d1 MDL-34243 completion: get_criteria() incorrectly passing object 2012-07-10 21:07:30 +12:00
Dan Poltawski
06dd4335aa Merge branch 'w28_MDL-33712_m24_extratags' of git://github.com/skodak/moodle 2012-07-10 15:55:58 +08:00
Dan Poltawski
2c0c3379fc Merge branch 'MDL-30844-master' of https://github.com/FMCorz/moodle 2012-07-10 14:47:35 +08:00
Dan Poltawski
f5d7fe4c9e MDL-34159 - add comment lost from previous commit 2012-07-10 12:59:06 +08:00
Dan Poltawski
4afbd0c834 Merge branch 'w28_MDL-34159_m24_wherelist' of git://github.com/skodak/moodle 2012-07-10 12:52:14 +08:00
Sam Hemelryk
f0d6e53c11 Merge branch 'w28_MDL-33617_m24_roleenrolindex' of git://github.com/skodak/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-10 15:47:33 +12:00
Sam Hemelryk
e9c614276b Merge branch 'MDL-34237' of git://github.com/danpoltawski/moodle 2012-07-10 15:26:58 +12:00
Dan Poltawski
00142ce553 MDL-34237 - fix version number mistake 2012-07-10 11:20:33 +08:00
Sam Hemelryk
af0c360f48 Merge branch 'w28_MDL-33887_m24_jsstrings' of git://github.com/skodak/moodle 2012-07-10 15:07:47 +12:00
Aparup Banerjee
7534234322 MDL-34225 course completion : move /lib/completion/* up to /completion 2012-07-10 11:06:41 +08:00
Sam Hemelryk
e977b391b7 Merge branch 'w28_MDL-34057_m24_styledebug' of git://github.com/skodak/moodle 2012-07-10 14:50:40 +12:00
Sam Hemelryk
8f19a94304 Merge branch 'w28_MDL-34101_m24_newaccountprev' of git://github.com/skodak/moodle 2012-07-10 14:42:28 +12:00
Dan Poltawski
4b9e493b0a Merge branch 'w28_MDL-34147_m24_cygwin' of git://github.com/skodak/moodle 2012-07-10 10:31:16 +08:00
Dan Poltawski
315e968209 MDL-8249 - tests: fix breaking unit tests 2012-07-10 10:17:47 +08:00
Dan Poltawski
029be094ab MDL-8249 - tests: fix trailing whitespace 2012-07-10 10:17:33 +08:00
Dan Poltawski
e1980f8bb9 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-10 09:43:23 +08:00
Dan Poltawski
b40eca11d9 Merge branch 'w28_MDL-33018_m24_pgindex2' of git://github.com/skodak/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-10 09:17:23 +08:00
Dan Poltawski
db296214d9 Merge branch 'w28_MDL-34010_m24_mysqldiag' of git://github.com/skodak/moodle 2012-07-10 08:49:22 +08:00
Sam Hemelryk
1ef3f066ee Merge branch 'w28_MDL-34175_m24_admin' of git://github.com/skodak/moodle 2012-07-10 12:43:48 +12:00
Dan Poltawski
a87425aba8 Merge branch 'w28_MDL-33568_m24_recordcounts' of git://github.com/skodak/moodle 2012-07-10 08:38:41 +08:00
Sam Hemelryk
77c3ccccd2 Merge branch 'wip-MDL-34139-master' of git://github.com/marinaglancy/moodle 2012-07-10 12:22:19 +12:00
Sam Hemelryk
3ea910c83f Merge branch 'w28_MDL-33454_m24_tinymce3541' of git://github.com/skodak/moodle 2012-07-10 12:16:26 +12:00
Sam Hemelryk
5958b17eb0 Merge branch 'MDL-29470-master' of git://github.com/FMCorz/moodle 2012-07-10 12:13:03 +12:00
Sam Hemelryk
3aed38eb7d Merge branch 'MDL-32297-master' of git://github.com/FMCorz/moodle 2012-07-10 12:03:00 +12:00
Dan Poltawski
4e85084148 Merge branch 'MDL-18301-master' of git://github.com/FMCorz/moodle 2012-07-09 14:27:10 +08:00
Dan Poltawski
2579ac464f Merge branch 'wip-mdl-29969' of git://github.com/rajeshtaneja/moodle 2012-07-09 13:39:08 +08:00
Dan Poltawski
898a2310a5 Merge branch 'wip-MDL-34143-master' of git://github.com/marinaglancy/moodle 2012-07-09 13:05:25 +08:00
Sam Hemelryk
66dd3e5d2f MDL-32119 Fixed messy merge in upgrade code 2012-07-09 17:00:52 +12:00
Sam Hemelryk
a2a2e7fb4a Merge branch 'MDL-32119' of git://github.com/srynot4sale/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-09 16:02:49 +12:00