Petr Skoda
13516b7c1f
Merge branch 'master_MDL-24734_gradefix' of git://github.com/danmarsden/moodle
2011-04-17 17:09:05 +02:00
Petr Skoda
6b7fb33661
Merge branch 'master_MDL-18392_slash_cleanup' of git://github.com/danmarsden/moodle
2011-04-17 17:02:15 +02:00
Petr Skoda
e87ca54256
Merge branch 'MDL-27198-master' of git://github.com/sammarshallou/moodle
2011-04-17 16:37:54 +02:00
Petr Skoda
c001225250
Merge branch 'MDL-22308_20' of git://git.catalyst.net.nz/moodle-r2
2011-04-17 16:30:41 +02:00
Petr Skoda
c6423ea2de
Merge branch 'wip-MDL-26013-master' of git://github.com/samhemelryk/moodle
2011-04-17 16:21:51 +02:00
Petr Skoda
bdc782470b
Merge branch 'wip-MDL-27145-master' of git://github.com/samhemelryk/moodle
2011-04-17 16:11:49 +02:00
Petr Skoda
3867494381
MDL-27123 fix coding style and add missing parameters in phpdocs
2011-04-17 16:06:19 +02:00
Dan Marsden
4f4a8acf3b
SCORM MDL-24734 - fix display of grade information on view.php page - also fixes some XHTML in the same function.
2011-04-16 19:34:04 +12:00
sam marshall
611684a8ec
MDL-27198 Accessibility: For labels, completion/editing icons must appear after content
2011-04-14 17:31:14 +01:00
John Beedell
7351b54e86
MDL-27123 adds a new admin_setting_configmultiselect_modules class
...
and uses it on the module security page. This saves one DB query per
page for users who can see the admin tree in the settings nav.
2011-04-14 12:25:41 +01:00
Nadav Kavalerchik
b41fc49c26
CSS MDL-26013 Fixed several display bugs when using right to left languages
2011-04-14 15:56:10 +08:00
Dan Marsden
4f6e39db5e
Merge remote branch 'moodle/master' into master_MDL-18392_slash_cleanup
2011-04-14 09:15:48 +12:00
Petr Skoda
91787c37e1
weekly release 2.1dev
2011-04-13 22:09:33 +02:00
Petr Skoda
2c55034844
Merge branch 'MDL-24355_emergency_21' of git://github.com/stronk7/moodle
2011-04-13 16:48:38 +02:00
Eloy Lafuente (stronk7)
1c2cfff051
MDL-24355 tags - fix correlation sql to be cross-db
2011-04-13 16:31:09 +02:00
Petr Skoda
fe0ccf0c79
Merge branch 'MDL-27053-dev-code-warning' of git://github.com/mudrd8mz/moodle
2011-04-13 15:23:33 +02:00
Petr Skoda
9015609696
Revert "MDL-25840 fixed image files link not rendered correctly when attached as file (instead of inline)."
...
The reason is failed testing. This reverts commit c9b0e31ff29adef113a4adc746bc9169cdddd259.
2011-04-13 15:06:39 +02:00
David Mudrak
a95682b2b3
MDL-27053 Code maturity info added to admin notifications page
...
The patch introduces a new string to be displayed at admin notifications
page. The maturity level message for upgrade/install reworded as
requested in the tracker.
The patch also adds a new core call to purge all caches at the beginning
of the upgrade. This must be done before the upgrade starts so that the
strings are re-fetched from the updated source and not from the on-disk
cache.
2011-04-13 15:03:25 +02:00
David Mudrak
1c5ab635b6
MDL-27053 Revert "MDL-26985 make sure admins do not upgrade to 2.1dev accidentally"
...
This reverts commit 9778dae374b10a825b8e500e36958b92a6b4e9ad.
2011-04-13 14:08:32 +02:00
Dan Marsden
3825bed0e8
SCORM MDL-18392 - remove old call to stripslashes
2011-04-13 20:05:30 +12:00
Matteo Scaramuccia
454f5aeef6
SCORM MDL-18392 MDL-26282 - Fixed calls to add/strip slashes
2011-04-13 20:05:19 +12:00
Petr Skoda
2293a504eb
MDL-25718 fix incorrect 'no grade' test and improve coding style
2011-04-12 10:06:13 +02:00
Petr Skoda
d2e360a95b
Merge branch 'MDL-25718_recover_grades_master' of git://github.com/andyjdavis/moodle
2011-04-12 09:50:20 +02:00
Sam Hemelryk
fec617dee5
form-dateselector MDL-27145 Fixed up error resulting from incorrectly required 'optional' argument on create event
2011-04-12 14:14:34 +08:00
Eloy Lafuente (stronk7)
9ff913b716
Merge branch 'MDL-26778-master' of git://github.com/sammarshallou/moodle
2011-04-11 17:48:29 +02:00
Eloy Lafuente (stronk7)
72e97b5880
Merge branch 'w15_MDL-26577_m21_groupscleanup' of git://github.com/skodak/moodle
2011-04-11 15:55:33 +02:00
Eloy Lafuente (stronk7)
af58cf7d40
Merge branch 'w15_MDL-26805_m21_userpol' of git://github.com/skodak/moodle
2011-04-11 15:15:40 +02:00
Petr Skoda
39de30aac2
Merge branch 'wip-MDL-27024' of git://github.com/samhemelryk/moodle
2011-04-11 14:14:02 +02:00
Petr Skoda
337d8b1489
Merge branch 'wip-MDL-26599' of git://github.com/samhemelryk/moodle
2011-04-11 14:09:15 +02:00
sam marshall
6553cda7c9
MDL-26778 Change to completion should immediately affect nav block
...
Includes change so that updating completion resets the cache, and a debugging
warning if any module calls the completion viewed thing after it's already
printed navigation (which will mean navigation obviously doesn't update right
away). All existing modules that currently update after printing navigation
were updated.
2011-04-11 12:40:13 +01:00
Petr Skoda
de57ec3926
Merge branch 'MDL-25840' of git://github.com/nebgor/moodle
2011-04-11 13:31:45 +02:00
Petr Skoda
82053cb192
MDL-26805 cleanup default role selections
...
Frontpage role selection now allows only guest and frontpage roles. Default forntpage role is selected duuring install. Unused nodefaultuserrolelists option was removed completely. Coding style improvements.
2011-04-11 13:10:50 +02:00
Eloy Lafuente (stronk7)
920234498e
Merge branch 's9_MDL-27098_filemanager_strings_master' of git://github.com/dongsheng/moodle
2011-04-11 11:18:23 +02:00
Dongsheng Cai
6d30723e41
MDL-27098
...
1. Fixed add file language string
2. Fixed hard-coded 'moving' string
3. Fixed hard-coded 'Files' string
2011-04-11 17:09:15 +08:00
Eloy Lafuente (stronk7)
43f8192a65
Merge branch 'w15_MDL-25826_m21_htmlpurifier' of git://github.com/skodak/moodle
2011-04-11 11:06:30 +02:00
Sam Hemelryk
2e79cd117a
Merge branch 'MDL-25746' of git://github.com/nebgor/moodle
2011-04-11 15:35:03 +08:00
Aparup Banerjee
16265f06d1
MDL-25746 fixed db tempate page layout to prevent hidden content layers
2011-04-11 15:15:58 +08:00
Sam Hemelryk
e1ce7c7e7b
Merge branch 'MDL-26896' of git://github.com/stronk7/moodle
2011-04-11 14:48:01 +08:00
Sam Hemelryk
08c2633f12
Merge branch 'MDL-27034_xhprof_table_sql_master' of git://github.com/stronk7/moodle
2011-04-11 14:28:57 +08:00
Aparup Banerjee
c9b0e31ff2
MDL-25840 fixed image files link not rendered correctly when attached as file (instead of inline).
2011-04-11 14:14:03 +08:00
Sam Hemelryk
cf0050f92a
Merge branch 'MDL-26185_master' of git://github.com/andyjdavis/moodle
2011-04-11 11:48:18 +08:00
Sam Hemelryk
d59d34e9a7
Merge branch 'w15_MDL-27056_m21_maxmind' of git://github.com/skodak/moodle
2011-04-11 11:42:53 +08:00
Mary Evans
c8b728139e
MDL-27063 tt styled incorrectly in canvas theme
2011-04-11 11:39:30 +08:00
Sam Hemelryk
99f2cd5435
comment MDL-27024 Removed last check within comment.js for block_comment env
2011-04-11 10:31:13 +08:00
Sam Hemelryk
1c64a9cd58
comment MDL-27024 Fixed bug that arose when a comment section didnt require pagination but the JS still looked for pageination HTML in the page
2011-04-11 10:31:13 +08:00
Sam Hemelryk
93b86f6239
comment MDL-27024 Removed last reference to the comment block within the comment API and used the options properly
2011-04-11 10:31:13 +08:00
Sam Hemelryk
d664d673a7
comment MDL-27024 Fixed up whitespace issues
2011-04-11 10:31:13 +08:00
Sam Hemelryk
116a48b133
comment MDL-27024 made notoggle and autoload into proper options to remove comment block conditions from comment API
2011-04-11 10:31:13 +08:00
Sam Hemelryk
8aab32297d
comment MDL-27024 Cleaned up HTML output in comment class
2011-04-11 10:31:13 +08:00
Sam Hemelryk
2f181b8c83
comment MDL-27024 Cleaned up use of undefined property $this->link
2011-04-11 10:31:13 +08:00