Commit graph

2858 commits

Author SHA1 Message Date
Andrew Robert Nicols
4a645a6821 MDL-30274 Correct typo of loginpage variable 2011-11-15 15:16:47 +00:00
Sam Hemelryk
1ae9aa2b8f Merged MDL-29108 Advanced grading 2011-11-14 22:01:05 +13:00
Sam Hemelryk
6335838604 Merge branch 'wip-MDL-30010' of git://github.com/lazydaisy/moodle 2011-11-14 12:10:17 +13:00
Eloy Lafuente (stronk7)
cf2de1cf10 MDL-27622 theme_mymobile: whitespace fixes 2011-11-11 20:22:41 +01:00
Sam Hemelryk
e2b38d06cf MDL-27622 theme_mymobile: quick regression fix of var 2011-11-11 18:36:10 +13:00
Sam Hemelryk
025d304ad3 Merge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle 2011-11-11 18:35:13 +13:00
Aparup Banerjee
d48dae7507 Merge branch 'wip-MDL-26712-master' of git://github.com/phalacee/moodle 2011-11-11 11:26:22 +08:00
Eloy Lafuente (stronk7)
8ac9d33f49 Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle
Conflicts:
	lib/db/upgrade.php
	report/completion/index.php
	report/progress/index.php
	version.php
2011-11-11 03:37:55 +01:00
Eloy Lafuente (stronk7)
509361cfde Merge branch 'MDL-22351' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/anomaly/style/general.css

Merged with some changes done with the introduction of
the new report plugins (MDL-29030)
2011-11-11 02:31:21 +01:00
Eloy Lafuente (stronk7)
06b3d9c8c0 Merge branch 'wip-MDL-25511' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/canvas/style/course.css
2011-11-11 00:20:13 +01:00
Eloy Lafuente (stronk7)
47c6991a8e Merge branch 'MDL-29945' of git://github.com/timhunt/moodle 2011-11-10 21:47:22 +01:00
Tim Hunt
828788f03b MDL-29945 plugin management: don't show Uninstall links for required plugins. 2011-11-10 19:11:24 +00:00
Sam Hemelryk
e3dfd1a1d9 Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution 2011-11-10 10:15:50 +13:00
Sam Hemelryk
3c0c2bf080 MDL-27622 theme_mymobile: Pre-integration clean up 2011-11-09 18:18:41 +13:00
Mary Evans
4db41cbdcf MDL-25511-theme_canvas tidy up CORE css files 2011-11-09 02:22:36 +00:00
David Mudrak
9faf837fc0 Moved CSS into the base theme to make the UI friendly in all themes by default 2011-11-08 23:58:10 +01:00
Mary Evans
afc7026a57 MDL-30010FIX for pagelayout problems when moving blocks 2011-11-06 19:48:10 +00:00
Petr Skoda
fad8e0248c MDL-29030 move user log reporting to report_log plugin 2011-11-06 12:22:52 +01:00
Petr Skoda
4d00fded9d MDL-29030 migrate outline user reporting to plugin 2011-11-06 12:22:51 +01:00
Petr Skoda
f0897f4426 MDL-29030 more css cleanup 2011-11-06 12:22:51 +01:00
Petr Skoda
635284c42f MDL-29030 update themes to use new report selectors 2011-11-06 12:22:50 +01:00
Petr Skoda
cf24e82ed3 MDL-29030 move base CSS to report plugins 2011-11-06 12:22:50 +01:00
Petr Skoda
3afce1a574 MDL-29030 convert participation report to new report type
AMOS BEGIN
 MOV [participation:view,coursereport_participation],[participation:view,report_participation]
 MOV [pluginpagetype,coursereport_participation],[pluginpagetype,report_participation]
 MOV [pluginname,coursereport_participation],[pluginname,report_participation]
AMOS END
2011-11-06 12:22:48 +01:00
sam marshall
24e14bc7a6 MDL-26647 (5) Support showuseridentity on course and activity completion reports 2011-11-04 13:57:15 +00:00
Mary Evans
0a52611c5a wip-MDL-22351 convert Anomaly CSS to readable format 2011-11-04 02:37:11 +00:00
stabijoh
2fd7abbbd7 MDL-27622 integrate mymobile thme into core RC2 2011-11-03 10:59:45 -04:00
Petr Skoda
ee362526f8 MDL-29897 Update upgrade.txt files 2011-11-03 08:11:55 +01:00
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
Jason Fowler
1d559a1eb0 MDL-26712 Themes - Correcting text dimming for hidden labels 2011-10-18 13:54:51 +08: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