48630 Commits

Author SHA1 Message Date
Sam Hemelryk
94ffa4a183 Merge branch 'w29_MDL-28392_m22_capnames' of git://github.com/skodak/moodle 2011-07-25 10:02:16 +08:00
Sam Hemelryk
8306a3799e Merge branch 'w29_MDL-28432_m22_cohortconfig' of git://github.com/skodak/moodle 2011-07-25 09:52:33 +08:00
Sam Hemelryk
08ad288d6f Merge branch 'w29_MDL-28440_m22_jssemicol' of git://github.com/skodak/moodle 2011-07-25 09:44:25 +08:00
Sam Hemelryk
310758d655 Merge branch 'MDL-27768' of git://github.com/lazydaisy/moodle 2011-07-25 09:39:31 +08:00
Petr Skoda
1a7cb87e46 MDL-28440 add missing semicolon causing JS issues
Credit goes to Mark Nielsen.
2011-07-23 11:48:53 +02:00
Petr Skoda
b7d7aafada MDL-28392 validate capability names 2011-07-23 00:09:08 +02:00
Petr Skoda
6df9761774 MDL-28432 use enrol/cohort and enrol/manual capabilities correctly in cohort enrol UI and fix input validation in ajax 2011-07-22 09:52:12 +02:00
Petr Skoda
6884b598f3 weekly release 2.2dev 2011-07-19 15:25:11 +02:00
Petr Skoda
8057e4d85e Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-07-19 15:15:32 +02:00
Petr Skoda
8aa74f821d MDL-27696 initialise arrays
Credit goes to David Mudrak.
2011-07-19 15:03:58 +02:00
Petr Skoda
51c3e855d0 MDL-27696 do not use placeholders in GROUP BY because pg does no like that 2011-07-19 10:53:20 +02:00
Petr Skoda
0881cb5135 MDL-27889 use new recaptcha google urls in lang packs 2011-07-19 10:27:20 +02:00
Mary Evans
080fbe680d fix for MDL-27768 removed reference to gradient-sb image 2011-07-18 23:37:33 +01:00
Petr Skoda
5e85f7b50b MDL-27523 fix phpdocs packages 2011-07-18 16:03:15 +02:00
Petr Skoda
d6a1c91bee Merge branch 'master_MDL-27523' of git://github.com/danmarsden/moodle 2011-07-18 15:58:59 +02:00
Petr Skoda
696ddfe671 Merge branch 'wip-MDL-28040-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:33:42 +02:00
Petr Skoda
fa9264b55b Merge branch 'wip-MDL-28184-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:28:16 +02:00
Petr Skoda
215f2c36d5 Merge branch 'wip-MDL-28205-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:25:02 +02:00
Petr Skoda
6857b0db47 Merge branch 'wip-MDL-28137-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:22:29 +02:00
Petr Skoda
c051470207 Merge branch 'wip-MDL-27771-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:19:35 +02:00
Petr Skoda
a1d27703fe Merge branch 'wip-MDL-27696-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:17:05 +02:00
Petr Skoda
7856cd8b8c Merge branch 'wip-MDL-27305-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:13:44 +02:00
Petr Skoda
b0d6fa17a4 Merge branch 'wip-MDL-25870-master' of git://github.com/samhemelryk/moodle 2011-07-18 14:57:02 +02:00
Sam Hemelryk
c1d251e890 Merge branch 'wip-MDL-27756-master' of github.com:marinaglancy/moodle 2011-07-18 22:15:55 +10:00
Sam Hemelryk
a4c3145984 Merge branch 'MDL-27555' of git://github.com/rwijaya/moodle 2011-07-18 21:50:50 +10:00
Sam Hemelryk
0704038e41 Merge branch 'w28_MDL-28345_m22_utf8' of git://github.com/skodak/moodle 2011-07-18 21:16:43 +10:00
Sam Hemelryk
cc4db9d3c1 Merge branch 'wip-mdl-27837' of git://github.com/rajeshtaneja/moodle 2011-07-18 21:03:22 +10:00
Sam Hemelryk
c5fe313c06 Merge branch 'w28_MDL-23344_m22_loginfocus2' of git://github.com/skodak/moodle 2011-07-18 20:25:43 +10:00
Sam Hemelryk
ce4a587308 Merge branch 'w28_MDL-27804_m22_csvauth' of git://github.com/skodak/moodle 2011-07-18 20:17:51 +10:00
Sam Hemelryk
b96fa1c265 Merge branch 'w28_MDL-28253_m22_managerupgrade' of git://github.com/skodak/moodle 2011-07-18 20:08:36 +10:00
Sam Hemelryk
50a3053e62 Merge branch 'w28_MDL-28313_m22_enroldb' of git://github.com/skodak/moodle 2011-07-18 20:01:08 +10:00
Sam Hemelryk
47fa86b306 Merge branch 'w28_MDL-28344_m22_clickjacking' of git://github.com/skodak/moodle 2011-07-18 19:47:59 +10:00
Sam Hemelryk
5576c64139 Merge branch 'w28_MDL-28348_m22_meta' of git://github.com/skodak/moodle 2011-07-18 19:37:49 +10:00
Sam Hemelryk
1eff23084e Merge branch 'w28_MDL-28350_m22_wsra' of git://github.com/skodak/moodle 2011-07-18 19:27:57 +10:00
Petr Skoda
83162b2612 Merge branch 'wip-MDL-25125-master' of github.com:marinaglancy/moodle 2011-07-18 09:18:31 +02:00
Sam Hemelryk
610cc5c383 Merge branch 'w28_MDL-28363_m22_dimmed' of git://github.com/skodak/moodle 2011-07-19 00:45:13 +10:00
Sam Hemelryk
761a000f73 Merge branch 'MDL-28298-workshop-constant' of git://github.com/mudrd8mz/moodle 2011-07-19 00:39:02 +10:00
Sam Hemelryk
508a5bd402 Merge branch 'MDL-28325-enrol-help' of git://github.com/mudrd8mz/moodle 2011-07-19 00:34:37 +10:00
Sam Hemelryk
5f65d37cd2 Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git 2011-07-19 00:25:13 +10:00
Petr Skoda
0a0b535e27 MDL-28348 fix spelling and some whitespace issues 2011-07-17 20:39:20 +02:00
Petr Skoda
c2f53f015b MDL-28348 fix fatal error caused by unenrolling of incorrect enrol instance 2011-07-17 20:37:02 +02:00
Petr Skoda
fc7cd35c81 MDL-28348 prevent circular references in meta handler for enrolments 2011-07-17 20:36:12 +02:00
Petr Skoda
5b2904c8f8 MDL-28348 fix meta sync when unassigning roles 2011-07-17 20:35:15 +02:00
Petr Skoda
656749c18a MDL-28363 make dimmed selectors more specific to prevent overriding from other themes 2011-07-16 21:03:06 +02:00
Petr Skoda
78fcdb5fdb MDL-28345 make sure input parameters do not contain invalid utf-8 chars 2011-07-15 15:00:49 +02:00
Petr Skoda
d20f655d59 MDL-28350 prevent bogus role assignment via externallib 2011-07-15 12:23:34 +02:00
Petr Skoda
df83301630 MDL-27804 allow changing of only auth in csv user uploads 2011-07-15 11:07:33 +02:00
David Mudrak
94f630e33f MDL-28325 Enrolment: added help to the duration, start date and end date setting
The patch also fixes one typo in enrol_manual detected while working on
this.
2011-07-15 08:59:55 +02:00
Ankit Kumar Agarwal
4942a84bd6 MDL-27523 Fixing get_string issues 2011-07-15 09:27:02 +12:00
Petr Skoda
43c5c08cf7 MDL-28313 fix incorrect enrol database settings upgrade 2011-07-14 22:31:40 +02:00