48600 Commits

Author SHA1 Message Date
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
Petr Skoda
43c5c08cf7 MDL-28313 fix incorrect enrol database settings upgrade 2011-07-14 22:31:40 +02:00
Petr Skoda
5c754932e7 MDL-28344 new option to prevent clickjacking via frame embedding 2011-07-14 22:01:23 +02:00
Petr Skoda
b9b639b30e MDL-28344 remove unused CFG->framename 2011-07-14 22:00:41 +02:00
Petr Skoda
595646d15b MDL-28344 remove the unused $CFG->framename 2011-07-14 21:40:50 +02:00
Petr Skoda
2d16dad0e1 MDL-23344 new option to autofocus username or password on the login form
Nearly everybody else does this login page autofocus. Once we switch to HMTL 5 we should use the new autofocus input option. I believe the admin setting should be enabled by default but it would not be possible to get it through the reviews.
2011-07-14 15:58:01 +02:00
Petr Skoda
dfe42f0a15 MDL-28253 use unique name for new manager role 2011-07-14 13:38:36 +02:00
Marina Glancy
77bf97e300 MDL-27756 Improving move_course() performance 2011-07-14 11:00:09 +08:00
Rajesh Taneja
3a70ccb8ac MDL-27837 enrol - Fixed checkboxes for multiple self enrolment 2011-07-14 09:55:13 +08:00
Marina Glancy
4173ef4a04 MDL-25125 fix YUI bug with overriding styles 2011-07-14 09:40:00 +08:00
Dan Marsden
99da7a9523 MDL-26482 SCORM add option to disable TOC completely - thanks to Clark Burns for some help! 2011-07-14 11:06:49 +12:00
Dan Marsden
7b6f5c8d1e MDL-28300 SCORM Fix check for SCORM 2004 thanks to Silvia Bastos for report/patch 2011-07-14 11:01:16 +12:00
Sam Hemelryk
ecb8829273 weekly release 2.2dev 2011-07-13 20:21:48 +08:00
Sam Hemelryk
59c8535226 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-07-13 20:06:16 +08:00
Sam Hemelryk
4d4e6d6bfc Revert "MDL-23344 fix login form focus"
This reverts commit 70b02b12d39fec290439ee38daabc26de4cf450f.
2011-07-13 20:02:58 +08:00
David Mudrak
c8ea2c4572 MDL-28298 workshop: do not use a constant without explicit inclusion of the library
Instead of including whole formslib just to get the constant defined, I
decided to hard-code the value and put the reference to the comment so
that eventual grep would spot it. Of course that is is not nice at all
but it's lesser of two evils imho.
2011-07-13 10:28:28 +02:00
Sam Hemelryk
962360fa21 MDL-27771 filter-text: Fixed typo contninue 2011-07-13 14:52:44 +08:00
Chris Follin
84b2b9aa77 MDL-27305 forum: Added missing item to forum_get_view_actions 2011-07-13 14:22:18 +08:00
Sam Hemelryk
b874637025 MDL-25870 enrol-manual: Fixed pagination of AJAX search results for users when changing search 2011-07-13 14:02:30 +08:00
Sam Hemelryk
c103eba85f MDL-27696 datalib Fixed up misused params in get_logs_usercourse 2011-07-13 10:30:35 +08:00
Eloy Lafuente (stronk7)
e62a947eec Merge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle 2011-07-12 16:57:54 +02:00
Eloy Lafuente (stronk7)
dd8f2538b6 Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/version.php
2011-07-12 16:28:36 +02:00