1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-01 22:42:37 +01:00

2380 Commits

Author SHA1 Message Date
David Mudrak
d6d341d09b Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
	version.php
2011-11-02 23:17:08 +01:00
David Mudrak
967d346f72 MDL-29794 It is now possible to re-use a form without sharing it as a template
The patch also improves displaying tags-like status information next to
the grading form titles.
2011-11-02 21:57:24 +01:00
David Mudrak
49a537b356 MDL-29482 The rubric editor is now able to save the status of the form definition 2011-11-01 18:04:31 +01:00
David Mudrak
4d064218fb MDL-29794 Rename templates.php back to pick.php
We will need the general management page implemented in a separate
script. This one will be used for picking an existing form only.
2011-11-01 16:30:17 +01:00
Aparup Banerjee
b68c077632 Merge branch 'MDL-29787' of git://github.com/lazydaisy/moodle 2011-11-01 12:00:57 +08:00
Sam Hemelryk
bc454be746 Merge branch 'MDL-29197' of git://github.com/lazydaisy/moodle 2011-11-01 16:11:58 +13:00
David Mudrak
20836db999 MDL-29794 Initial support for re-using a shared grading form
The patch introduces a new script templates.php that allows to search
for a previously shared form (template) and re-use it.

The patch also modifies the preview rendering of grading forms. Now
plugins are responsible for rendering the form itselft, without any
headers, descriptions etc (we need to embed the form preview into
various places so the caller looks after the frame).
2011-11-01 03:16:54 +01:00
Mary Evans
ab9d5899b8 MDL-29197 FIX for content displacment when clicking anchor elements in course page 2011-10-31 01:43:17 +00:00
Mary Evans
1bc21356fc MDL-25760 FIX for highlighted current topic section 2011-10-28 01:30:26 +01:00
Mary Evans
aa1639680f MDL-29787 FIX to remove sprite hover image from single menu item 2011-10-28 00:21:23 +01:00
David Mudrak
18dd4a69d0 Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
2011-10-27 21:58:45 +02:00
David Mudrak
01609c9ad9 Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
	version.php
2011-10-24 22:13:01 +02:00
Tim Hunt
36ca62cab7 MDL-29474 display the dependancy information on the upgrade screen. 2011-10-20 11:13:33 +01:00
Sam Hemelryk
9a23f94bd9 MDL-26953 theme_nonzero: Quick fix to incorrect left position 2011-10-19 16:26:31 +13:00
David Mudrak
fde3380443 Saving a form as a public template
There is a new API method get_definition_copy() that is expected to
return the definition structure as if the form was written from scratch
via the editor. Such a prepared structure is passed to
a controller's update_definition() method in the new target area.

The same mechanism will be used for copying definitions from a shared
area to a normal gradable area.
2011-10-19 01:17:43 +02:00
Eloy Lafuente (stronk7)
c6015af280 Merge branch 'MDL-28613' of git://github.com/timhunt/moodle 2011-10-18 01:35:34 +02:00
David Mudrak
6832a10264 Initial support for the grading management screen
The user is sent to the new grade/grading/manage.php screen when an
advanced grading method is set in the activity mod form or via the
settings block.

The screen is supposed to (1) let the user change the currently active
grading method, (2) open the editor for the selected method, (3) create
new form from a template (4) display a preview of the form.
2011-10-18 01:05:07 +02:00
Tim Hunt
891df4a949 MDL-28613 question CSS. Some text in the grey info box is the wrong size.
Note that according to http://www.quirksmode.org/css/contents.html, the > CSS selector works in IE 7+, so is probably now safe to use.
2011-10-17 11:28:49 +01:00
Sam Hemelryk
22ca670f88 Merge branch 'MDL-26953' of git://github.com/lazydaisy/moodle 2011-10-17 17:37:49 +13:00
Sam Hemelryk
f7e8e43f2d Merge branch 'MDL-29781' of git://github.com/lazydaisy/moodle 2011-10-17 15:21:45 +13:00
Mary Evans
7846a85bc1 MDL-29781 FIX for side-post-only layout 2011-10-14 20:39:36 +01:00
Mary Evans
d4bb762643 MDL-26953 FIX for side-post-only layout 2011-10-14 02:28:03 +01:00
Mary Evans
4146e4352b MDL-26983 FIX for side-post-only layout 2011-10-13 02:43:04 +01:00
Sam Hemelryk
811cbdcfbf Merge branch 'MDL-29640_master' of git://github.com/kordan/moodle 2011-10-11 10:15:46 +13:00
Kordan
2106024854 MDL-29640 fix for master 2011-10-10 13:19:15 +02:00
Petr Skoda
14b1579aa0 MDL-29686 obey caching setting for moodle yui modules 2011-10-07 08:41:15 +02:00
Eloy Lafuente (stronk7)
7eaca44932 Merge branch 'wip-MDL-25697-master' of git://github.com/samhemelryk/moodle 2011-10-05 01:10:03 +02:00
Sam Hemelryk
324e620474 Merge branch 'MDL-29605' of git://github.com/lazydaisy/moodle 2011-10-03 16:41:12 +13:00
Sam Hemelryk
36e966b005 MDL-28566 theme_base: removed MDL comment 2011-10-03 15:02:33 +13:00
Sam Hemelryk
2c66ceeaef Merge branch 'MDL-28566' of git://github.com/lazydaisy/moodle 2011-10-03 14:37:35 +13:00
Sam Hemelryk
3a2abe2e6e Merge branch 'MDL-29323' of git://github.com/lazydaisy/moodle 2011-10-03 14:29:49 +13:00
Sam Hemelryk
ef6380f042 Merge commit 'FETCH_HEAd' 2011-10-03 13:29:26 +13:00
Mary Evans
39d59f934f MDL-29605-modify Afterburner menu to allow auto format 2011-10-01 23:13:12 +01:00
Kordan
bbf28a466c MDL-29403 fix for master 2011-09-30 11:10:11 +02:00
Mary Evans
db25d9b768 MDL-29323-FIX invalid border style 2011-09-30 03:04:17 +01:00
Sam Hemelryk
6598f57e90 MDL-25697 theme_base: Improved the alignment of the activity editing icons on the course frontpage 2011-09-29 14:15:38 +13:00
Mary Evans
16c0dd2b1a MDL-28566 - Fix for participants user details 2011-09-28 15:26:22 +01:00
Eloy Lafuente (stronk7)
43c741b9b4 MDL-29552 themes - show the name of the picked theme when working with device detection enabled 2011-09-28 13:39:18 +02:00
Eloy Lafuente (stronk7)
e135797586 Merge branch 'w38_MDL-29401_m22_frankenstyle' of git://github.com/skodak/moodle 2011-09-27 00:00:20 +02:00
Petr Skoda
aff24313be MDL-29401 introduce new frankenstyle PARAM types
New PARAM_COMPONENT, PARAM_AREA and PARAM_PLUGIN + fixing of hopefully all current incorrect parameter types. This should help with diagnosing of incorrectly named 3rd party plugins too.
2011-09-25 09:59:55 +02:00
Tim Hunt
b84dca8cb8 MDL-29492 restore unit test prettiness. 2011-09-23 12:15:13 +01:00
Eloy Lafuente (stronk7)
8974d17a8f Merge branch 'wip-mdl-29079' of git://github.com/rajeshtaneja/moodle 2011-09-20 09:50:46 +02:00
Rajesh Taneja
94b38ab1c1 MDL-29079 Administration: Added space on both sides of locked checkbox and for rtl language space will be applied accordingly 2011-09-20 11:49:24 +08:00
Eloy Lafuente (stronk7)
3eabe0ccd5 Merge branch 'wip-mdl-29079' of git://github.com/rajeshtaneja/moodle 2011-09-20 00:17:20 +02:00
Eloy Lafuente (stronk7)
9d8d55a00e Merge branch 'w37_MDL-29029_m22_admintools' of git://github.com/skodak/moodle 2011-09-19 18:26:55 +02:00
Rajesh Taneja
48a614d97e MDL-29079 Administration: Added space between checkboxes on general backup setting page 2011-09-19 13:32:38 +08:00
Petr Skoda
bd41bdd922 MDL-29029 move lang pack import to admin tools
Includes lang related language pack cleanup.

AMOS BEGIN
 MOV [langpacks,core_admin],[pluginname,tool_langimport]
 MOV [install,core_admin],[install,tool_langimport]
 MOV [installedlangs,core_admin],[installedlangs,tool_langimport]
 MOV [langimport,core_admin],[langimport,tool_langimport]
 MOV [langimportdisabled,core_admin],[langimportdisabled,tool_langimport]
 MOV [langpackinstalled,core_admin],[langpackinstalled,tool_langimport]
 MOV [langpackremoved,core_admin],[langpackremoved,tool_langimport]
 MOV [langpackupdateskipped,core_admin],[langpackupdateskipped,tool_langimport]
 MOV [langpackuptodate,core_admin],[langpackuptodate,tool_langimport]
 MOV [langupdatecomplete,core_admin],[langupdatecomplete,tool_langimport]
 MOV [missinglangparent,core_admin],[missinglangparent,tool_langimport]
 MOV [nolangupdateneeded,core_admin],[nolangupdateneeded,tool_langimport]
 MOV [remotelangnotavailable,core_admin],[remotelangnotavailable,tool_langimport]
 MOV [uninstall,core_admin],[uninstall,tool_langimport]
 MOV [uninstallconfirm,core_admin],[uninstallconfirm,tool_langimport]
 MOV [updatelangs,core_admin],[updatelangs,tool_langimport]
AMOS END
2011-09-17 20:58:26 +02:00
Sam Hemelryk
89eda3eeaf MDL-29185 backup: Removed backup_log table and fixed the backup admin report 2011-09-16 15:51:23 +12:00
Sam Hemelryk
9f768d6e5f Merge branch 'MDL-29211_master' of git://github.com/kordan/moodle 2011-09-12 19:48:33 +12:00
kordan
712dee7a59 MDL-29211 fix for master 2011-09-12 09:42:18 +02:00