7a6d43a3ee
Merge branch 'MDL-29810-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE
2011-10-31 17:10:41 +13:00
c440076d2b
Merge branch 'm21_MDL-28559' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE
2011-10-31 13:00:08 +13:00
716267f233
MDL-29810 Assignment grading: don't include teachers in list of students
2011-10-27 22:19:15 +01:00
006106d640
MDL-28559 - hide send for marking button from people that are enrolled but don't have capability to submit files - displays the same way as teachers/admins - keeps ability to display previously submitted files if they exist
2011-10-26 10:55:31 +13:00
3f4186c6dc
MDL-29368 Assignment: Fixed a fatal error caused by a missing include
2011-10-25 19:19:35 +02:00
a6c348362a
MDL-29698 Assignment: Fix broken logentry
2011-10-16 18:14:21 +02:00
63526ae3d5
MDL-29564 Assignment: whitespace fix
2011-10-10 13:10:07 +02:00
b1913094d4
Merge branch 'MDL-16553-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE
2011-10-10 17:56:58 +13:00
430ce6cca3
Merge branch 'mdl-29564-assignment-plagiarism' of git://github.com/sbourget/moodle into MOODLE_21_STABLE
2011-10-10 11:51:08 +13:00
29bdd38e50
MDL-16553 Assignment, student view: show response files when no grade available
2011-10-07 23:23:04 +01:00
b801633a9c
MDL-29564 Assignment: Fixed a fatal error caused by a missing include
2011-10-04 13:44:59 -04:00
59c8be2362
MDL-27857 Export to portfolio support in the assignment module improved
...
Portfolio API code in the assignment module expected that the current
user is the author of the submission. Therefore the "Export to
portfolio" button did not work when the submission was viewed by a
teacher (eg at the page with the list of all submissions in the Advanced
upload assignment).
This patch introduces a new callback argument 'submissionid' that holds
explicit ID of the submission the export deals with. With it available,
we do not need to expect the current user is the author of the
submission.
The patch also cleans some strings used for portfolio callback
exceptions.
2011-10-03 10:13:11 +02:00
daf4471a40
MDL-27857 Assignment does not use form tag to render portfolio export control widget
...
When this code was used as a part of the grading screen, the default
PORTFOLIO_ADD_FULL_FORM widget led to nested form elements. This patch replaces
the form widget with a plain text link that can be embedded safely.
2011-10-03 10:13:10 +02:00
d8f2500f46
Merge branch MDL-29186-m21 of git://github.com/samhemelryk/moodle
...
- resolved conflicts, minor whitespace and fixed quote.
- note: textlib_get_instance() is already deprecated
2011-09-13 16:19:47 +08:00
b3c64930ff
MDL-29189 course Minor fixups after code review
2011-09-13 11:19:17 +12:00
0347dd4d70
MDL-29186 multilang Reviewed the uses of course fullname and ensured things were being formatted consistently
2011-09-08 09:39:00 +12:00
34c46428f1
MDL-29189 mutlilang Reviewed the uses of course shortname and ensured things are being formatted consistently
2011-09-08 09:30:10 +12:00
b1a24c1eb0
MDL-25872 View assignment submissions: show only students, not teachers
...
Fixing incorrect capability reference mod/assignment:view to ...:submit
2011-08-26 17:34:35 +01:00
b51aac313f
MDL-27896 context - Fixed editor context to observe filter status
2011-08-12 16:48:22 +08:00
c04c6e6b8a
MDL-28620 - Removed admin/generator.php include as it causes issues if this script is included from any other script that is running in the command line
2011-08-05 16:11:44 +01:00
9cd9d86640
MDL-27754 fixed typo in language string
2011-08-02 08:52:10 +08:00
35ef97232c
MDL-27555 assignment module: remove 'submitted' option from optional setting for offline assignment type.
2011-07-13 15:32:21 +08:00
2fa78e85e9
MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts.
2011-07-07 10:24:38 +02:00
376d87ca03
MDL-27934 Upload Assignment - Remove useless code
2011-07-06 13:26:21 +08:00
63e8936bb1
MDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc links to "docs.moodle.org/dev/"
2011-07-05 15:16:55 +08:00
ec48e283b0
Merge branch 'MDL-27960' of git://github.com/nebgor/moodle
2011-07-01 16:13:51 +02:00
b74b347aba
MDL-27960 assignment subplugin moodle1 conversion handling and handlers added
2011-07-01 19:11:29 +08:00
282a0a713e
Merge branch 'MDL-28087_friendly_jabber' of git://github.com/andyjdavis/moodle
2011-06-29 20:11:17 +02:00
f86e19b1ee
Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
2011-06-29 17:04:13 +08:00
5daa7279d4
MDL-28087 assignment: made the jabber notification of assignment grading better
2011-06-29 11:29:11 +08:00
cddb428722
Merge branch 'MDL-27990_assignment_notifications' of git://github.com/andyjdavis/moodle
2011-06-28 22:14:54 +02:00
83dfca3fa3
MDL-27990 assignment: removed a redundant retrieval of a user preference
2011-06-28 11:08:59 +08:00
b38e2e28a1
MDL-27829 blocks: altered the algorithm used to find plugin page types
2011-06-27 12:27:41 +08:00
0f1751b01b
MDL-28023_assignment_jabber assignment: added context url to improve the jabber notifications
2011-06-27 11:08:21 +08:00
fa09b5a9a3
MDL-28023 assignment: assignment wasnt supplying all the data necessary to produce a meaningful jabber notification
2011-06-25 13:12:48 +08:00
be34802d23
MDL-27990 assignment: Some small modifications to the assignment notification code
...
AMOS BEGIN
MOV [enableemailnotification,mod_assignment],[enablenotification,mod_assignment]
MOV [enableemailnotification_help,mod_assignment],[enablenotification_help,mod_assignment]
AMOS END
2011-06-24 14:19:40 +08:00
6057bf5b05
MDL-27810 portfolio: Added ->portfolioenabled check to one more place
2011-06-22 02:10:11 +02:00
6708a1f525
MDL-27810 portfolio: Added ->portfolioenabled checks before creating portfolio buttons to avoid initialising portfolio requirements
2011-06-21 10:35:53 +08:00
ee1235e7af
Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle
2011-06-14 22:38:27 +02:00
46d3b9be73
Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes
2011-06-13 16:54:52 +08:00
13b3f4d4af
MDL-26430 fixed appearance of one html form within another
2011-06-10 12:55:12 +08:00
b61cf3ff8a
MDL-22414 Merge branch 'master' into backup-convert
...
Conflicts:
theme/base/style/core.css
2011-06-09 13:04:49 +02:00
b1627a92e5
MDL-26105 Block settings should contains less options, and be more user friendly
...
AMOS BEGIN
MOV [page-blog-index, pagetype], [page-blog-index, blog]
MOV [page-blog-x, pagetype], [page-blog-x, blog]
MOV [page-tag-x, pagetype], [page-tag-x, tag]
MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
c5c315e2a7
MDL-27718 Migrate files embedded in the activity intro fields
...
Contains various fixed spotted through the way, too.
2011-06-05 17:37:58 +02:00
e455bdb3d7
MDL-27638 Removed buggy status line from query as it is being calculated in php anyway
2011-05-31 17:02:17 +08:00
f6f7a7266c
Merge branch 'master' into backup-convert
...
Conflicts:
backup/util/xml/parser/processors/simplified_parser_processor.class.php
backup/util/xml/parser/simpletest/testparser.php
2011-05-26 17:30:27 +02:00
8bcefb3254
Activity module handler get_moduleid() replaced with get_cminfo()
2011-05-24 16:01:00 +02:00
8b866ce4b1
Merge branch 'MDL-27439' of git://github.com/nebgor/moodle into backup-convert
2011-05-24 09:21:38 +02:00
2b04c41c58
MDL-27471 Adding mandatory component & ratingarea to the ratings API + other fixes
...
* Added the component and ratingarea fields and implemented it throughout
the rating API as mandatory fields
* Cleanup rating indexes
* Upgrade forum/data/glossary ratings
* Moved the logic in the render_rating method to methods of the rating object.
* Added new callback for checking ratingareas
* Cleaned comments here and there
* Mark the xxx_get_participants methods as deprecated
* Refactor rate_ajax and ratingsuser_can_view_aggregate methods
* Cleaned up rating/index.php to use html_table object and moved inline styles to CSS.
* Added missing properties of the rating object that were being set throughout the rating
API.
2011-05-23 12:35:39 +02:00
be53cf4e4c
MDL-27439 added moodle1 backup converter for assignment
...
- only recreates assignment module, not user data or submissions yet.
2011-05-20 11:59:20 +08:00
Sam Hemelryk