David Mudrak
25ab1d50e2
MDL-29920 The link from gradebook back to the activity contains itemnumber
...
The activity module must have a chance to display appropriate grades
report per itemnumber. Most activity modules have just one grade items
si they can ignore the param. Complex modules like the Workshop need this.
2011-11-01 18:18:45 +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
David Mudrak
3f3ee7114e
MDL-29794 Do not offer re-sharing of unmodified forms
...
The patch introduces a new field 'timecopied' that holds the timestamp
of when the given form was cloned last time. Using this field, we can
decide whether the form can be actually re-shared or not.
Note that the logic just hides the icon. It is meant as a usability
feature, not any real protection from sharing.
2011-11-01 16:10:12 +01:00
David Mudrak
86e9ccfd92
MDL-29794 Shared grading form templates can be deleted now
...
There is a new capability to manage all shared templates. Without this
capability, the user is allowed to delete just templates they previously
shared.
In the future, an option to edit the template directly might be added.
At the moment, the workaround is to pick the template into a temporary
assignment, edit it there and re-save it as a new template.
2011-11-01 14:05:11 +01:00
David Mudrak
7622ae95dc
MDL-29108 Improved support for form definition status
...
Every grading form can be basically in either DRAFT state (currently
being edited) or READY state (available for usage). For shared
templates, the status is not relevant at the moment and they are
automatically in the READY state.
2011-11-01 12:32:06 +01: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
David Mudrak
18dd4a69d0
Merge remote branch 'origin/master' into rubric
...
Conflicts:
lib/db/upgrade.php
2011-10-27 21:58:45 +02:00
Eloy Lafuente (stronk7)
38e9a1cc79
weekly release 2.2dev
2011-10-27 18:51:29 +02:00
Eloy Lafuente (stronk7)
d2822153b0
Merge branch 'install_master' of git://github.com/amosbot/moodle
2011-10-27 18:48:55 +02:00
Petr Skoda
8d1da74863
MDL-29474 fix undefined release, phpdocs and one TODO
2011-10-27 15:07:34 +02:00
Petr Skoda
2dfef18842
MDL-29474 tell AMOS we have a new install string
2011-10-27 14:36:20 +02:00
Petr Skoda
c1f55426ee
MDL-29474 fix cli upgrade regression
2011-10-27 14:04:19 +02:00
Petr Skoda
72081a6f75
MDL-29474 add env and plugin test to cli db install
2011-10-27 13:56:22 +02:00
Petr Skoda
f433088d5a
MDL-29474 fix regressions in CLI install
2011-10-27 13:55:41 +02:00
David Mudrak
72e48ad28f
Merge pull request #17 from marinaglancy/wip-rubricrenderer-rubric
...
Better rendering of the rubrics, rubric display options
2011-10-26 23:47:29 -07:00
AMOS bot
4ca17ac303
Automatically generated installer lang files
2011-10-27 00:55:29 +00:00
Sam Hemelryk
7b27861217
Merge branch 'MDL-29912' of git://github.com/stronk7/moodle
2011-10-27 12:57:21 +13:00
Eloy Lafuente (stronk7)
86e00f970b
MDL-29912 course search - oracle inabilities with concats, empties, nulls and type-restrictions
2011-10-26 19:04:31 +02:00
Eloy Lafuente (stronk7)
85819105a6
Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle
2011-10-26 11:40:01 +02:00
Petr Skoda
dcb9a0c1f1
MDL-29688 rewrite complex joins to be compatible with MySQL
...
Unfortunately MySQL does not handle complex EXISTS queries properly…
2011-10-26 11:35:42 +02:00
Eloy Lafuente (stronk7)
75d9479f8b
MDL-29474 plugin dependencies: version minibump
2011-10-26 10:34:28 +02:00
Eloy Lafuente (stronk7)
10dd4995da
Merge branch 'MDL-29474' of git://github.com/timhunt/moodle
2011-10-26 10:33:37 +02:00
Marina Glancy
39c6f4b625
MDL-29482, MDL-29481: better rendering, options for rubric display
2011-10-26 11:36:29 +08:00
Aparup Banerjee
a0b10b271f
Merge branch 'MDL-29854_b' of git://github.com/timhunt/moodle
2011-10-26 11:23:09 +08:00
Eloy Lafuente (stronk7)
036f27a420
Merge branch 'w42_MDL-29670_m22_croncleanup' of git://github.com/skodak/moodle
2011-10-25 23:51:10 +02:00
Sam Hemelryk
e6369d951c
Merge branch 'MDL-29569' of git://github.com/rwijaya/moodle
2011-10-26 10:44:41 +13:00
Dan Poltawski
10aeaf0f74
MDL-26568 block_online_users - reporting incorrect number of users
...
When over 50 users were online the count used in the listing was incorrect
2011-10-25 23:34:46 +02:00
Sam Hemelryk
462a064cf0
Merge branch 'MDL-29716' of git://github.com/mouneyrac/moodle
2011-10-26 10:21:35 +13:00
Petr Skoda
4332cc468c
MDL-29670 add more timeout resets
2011-10-25 22:07:04 +02:00
Stephen Bourget
d31a1ad808
MDL-29368 Assignment: Fixed a fatal error caused by a missing include
2011-10-25 19:19:02 +02:00
Eloy Lafuente (stronk7)
f65cd7f46c
Merge branch 'w42_MDL-29918_m22_accesslibdocs' of git://github.com/skodak/moodle
2011-10-25 17:47:09 +02:00
Eloy Lafuente (stronk7)
35454bd55d
Merge branch 'MDL-29815' of git://github.com/timhunt/moodle
2011-10-25 17:43:51 +02:00
Eloy Lafuente (stronk7)
44a9630623
MDL-29815 dbtest - added one test_get_records_sql_complicated related test
2011-10-25 17:37:34 +02:00
Eloy Lafuente (stronk7)
94da1daf40
Merge branch 'w42_MDL-29866_m22_setupinit' of git://github.com/skodak/moodle
2011-10-25 16:41:11 +02:00
Eloy Lafuente (stronk7)
a7fc769154
Merge branch 'w42_MDL-29914_m22_codesniffer' of git://github.com/skodak/moodle
2011-10-25 16:34:04 +02:00
Eloy Lafuente (stronk7)
bad48c0cbc
MDL-29881 pear/console/getopt - deleting one more occurrence
2011-10-25 16:21:35 +02:00
Eloy Lafuente (stronk7)
980dfc5720
Merge branch 'w42_MDL-29881_m22_profiling' of git://github.com/skodak/moodle
2011-10-25 16:17:40 +02:00
Tim Hunt
bed495578f
MDL-29854 questions: display better message and more useful continue
...
when an error occurs in the middle of processing responeses.
2011-10-25 14:49:57 +01:00
Petr Skoda
99ddfdf4c4
MDL-29918 improve accesslib inline docs
2011-10-25 14:20:22 +02:00
Eloy Lafuente (stronk7)
1bf0076e83
Merge branch 'w42_MDL-29882_m22_overlib' of git://github.com/skodak/moodle
2011-10-25 13:27:09 +02:00
Petr Skoda
9845bd201f
MDL-29914 remove unused CodeSniffer lib
2011-10-25 09:14:29 +02:00
Petr Skoda
41701ffd2d
MDL-29866 fix p tags and more docs
2011-10-25 08:54:30 +02:00
Rossiani Wijaya
b43251b846
MDL-29569: lesson_mod: in matching type questions, fixed and set default value for scoring and fixed jump page setting when response text is set to empty
2011-10-25 12:22:02 +08:00
Sam Hemelryk
1c3bd9b3ff
Merge branch 'MDL-28718' of git://github.com/timhunt/moodle
2011-10-25 16:47:20 +13:00
Jerome Mouneyrac
5b9735b949
MDL-29716 Make token more flexible to support third party client - also fix issue with some code not matching the way the server authenticate/authorize token, missing iprestriction/validuntil for restricted users (there are iprestriction/validiuntil on token and on restricted user). Also add missing check when the user is not listed in the authorised list.
2011-10-25 11:17:18 +08:00
Sam Hemelryk
e6acc5518b
MDL-29106 white space clean up
2011-10-25 15:28:52 +13:00
Sam Hemelryk
d040ea8893
Merge branch 'wip-MDL-29231-master' of git://github.com/phalacee/moodle
2011-10-25 15:19:45 +13:00
Marina Glancy
8722a322db
MDL-29794: fixed bug with description cloning
2011-10-25 09:49:10 +08:00
Sam Hemelryk
6327bf8f2b
Merge branch 'w42_MDL-29444_m22_iframe' of git://github.com/skodak/moodle
2011-10-25 14:28:53 +13:00
