Commit Graph

366 Commits

Author SHA1 Message Date
Adrian Greeve 0a498686c0 MDL-32126 replaced _order with sortorder to make sorting work in oracle 2012-05-18 11:37:21 +02:00
Dan Poltawski 7e89cbe0ac Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle 2012-05-18 10:30:22 +08:00
Sam Hemelryk ba94f1d503 Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle 2012-05-16 13:09:32 +12:00
Adrian Greeve 0ba303e85f MDL-32126 - data - Fix of an error when sorting by other criteria. 2012-05-14 07:27:01 +08:00
Sam Hemelryk 5ba2e3150f Merge branch 'wip-MDL-31763-master' of git://github.com/abgreeve/moodle 2012-05-10 14:11:24 +12:00
Adrian Greeve 541685ec20 MDL-31763 - data - users can only override their own presets unless they have manage presets permission. 2012-05-10 10:04:30 +08:00
Charles Fulton 66969d5004 MDL-32889 lib: escape filename in Content-Disposition header 2012-05-09 16:03:33 -04:00
David Mudrak 386b67d100 MDL-31675 File browsing support for the Database module
AMOS BEGIN
 CPY [fields,mod_data],[areacontent,mod_data]
AMOS END
2012-05-09 04:03:34 +02:00
Ankit Agarwal d5f7468eca MDL-31940 data: Removing deprecated function data_get_participants 2012-05-08 15:04:53 +08:00
Sam Hemelryk bc0be2fb80 Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle 2012-04-30 12:16:35 +12:00
Aparup Banerjee aed560a197 MDL-19391 Database : fixed icon size 2012-04-24 16:00:38 +01:00
David Mudrak 261cbbacc1 MDL-32471 preview thumbnails support for activity modules
Activity module's xxx_pluginfile() now accepts the $options parameter
that is to be passed to the send_stored_file() function.
2012-04-24 12:09:45 +02:00
Petr Skoda 6b04fdc0b6 MDL-32400 improve module generators
Module generators are using standard *_add_instance() methods which helps with testing, it also updates grades and calendar events if used.
2012-04-15 14:16:59 +02:00
Aparup Banerjee c197d5f028 MDL-17327 database : fixed comparisions in sql to be cross db compatible in data_get_advanced_search_sql()
This was failing under the MSSQL database drivers.
2012-04-03 15:06:09 +08:00
adrian@moodle.com db546510a1 MDL-17327 - data - improved the sql query for very large advanced searches 2012-03-30 13:18:23 +08:00
Aparup Banerjee a72996fe71 Revert "MDL-17327 - data - improved the sql query for very large advanced searches"
This reverts commit 72d4340a0e.

Testing cross db compatibility failed.
2012-03-22 09:21:25 +08:00
adrian@moodle.com 72d4340a0e MDL-17327 - data - improved the sql query for very large advanced searches 2012-03-21 09:41:48 +08:00
Sam Hemelryk d9fc82157b Merge branch 'MDL-31811-master-2' of git://git.luns.net.uk/moodle 2012-03-12 15:15:23 +13:00
Andrew Robert Nicols e8027a40cd MDL-31811 Add/Correct checks on activity read-only periods 2012-03-06 09:30:32 +00:00
Adrian Greeve 901d58dfd3 MDL-29086 - data - Fix for allowing the deletion of database activity presets.
Thank you to Matthias Hunstock for providing the patch for this.
2012-03-02 14:18:32 +08:00
Eloy Lafuente (stronk7) d8c9ff403b Merge branch 's17_MDL-30973_file_docblock_master' of git://github.com/dongsheng/moodle 2012-03-01 00:25:18 +01:00
Marina Glancy 00ecac7295 MDL-31738: added functions mod_xxx_get_file_info() to glossary and data modules 2012-02-27 14:20:00 +08:00
Eloy Lafuente (stronk7) 2a5fa9e64a Merge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle 2012-02-20 12:02:18 +01:00
Eloy Lafuente (stronk7) ec93cd94e8 Merge branch 's17_MDL-30984_comment_docblock_master' of git://github.com/dongsheng/moodle 2012-02-16 02:07:48 +01:00
Dongsheng Cai d2b7803e5a MDL-30973 Files API, check and update DocBlock 2012-02-15 12:48:57 +08:00
Dongsheng Cai 35453657a2 MDL-30984 comment API, check and update DocBlock 2012-02-15 11:21:35 +08:00
Andrew Davis a153c9f2fe MDL-30999 grade: updated Grade API phpdocs 2012-02-14 14:04:19 +07:00
Sam Hemelryk ac87f25829 Merge branch 'wip-MDL-25185-master' of git://github.com/abgreeve/moodle 2012-02-13 17:34:50 +13:00
Adrian Greeve 834686037c MDL-25185 - data - Allowing data from the database to be exported according to group roles. 2012-02-09 09:26:08 +08:00
Adrian Greeve c6c15daf81 wip-MDL-31396 - data - Exporting a preset as a zip code changed to remove errors. 2012-02-06 09:46:20 +08:00
Tom Lanyon af9b14446d MDL-28701 Change uses of make_upload_directory(temp) to make_temp_directory(). 2011-09-10 10:43:49 +02:00
Tom Lanyon 7aa06e6ded MDL-28701 Change all uses of $CFG->dataroot/temp to $CFG->tempdir 2011-09-10 10:35:39 +02:00
sam marshall 3e4c243500 MDL-27001 'Show description' feature part 3: Implementation for all modules
For modules that still used the 'old' generic object return from _get_coursemodule_info instead of returning a cached_cm_info object, I changed them to use the new format as part of this. This made a few areas of code regarding onclick links slightly nicer.
2011-09-06 11:03:06 +01:00
Rajesh Taneja ea2052ab8e MDL-27954 mod_database - fixed search navigation link 2011-07-11 10:09:44 +08:00
Sam Hemelryk f86e19b1ee Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-06-29 17:04:13 +08:00
Andrew Davis (andyjdavis) b38e2e28a1 MDL-27829 blocks: altered the algorithm used to find plugin page types 2011-06-27 12:27:41 +08:00
Sam Hemelryk 6708a1f525 MDL-27810 portfolio: Added ->portfolioenabled checks before creating portfolio buttons to avoid initialising portfolio requirements 2011-06-21 10:35:53 +08:00
Dongsheng Cai 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
Eloy Lafuente (stronk7) 5b52ce19c5 Merge branch 'MDL-27625_master' of git://github.com/stronk7/moodle
Conflicts:
	mod/forum/lib.php
2011-05-25 16:37:43 +02:00
Eloy Lafuente (stronk7) 5693d56cd8 MDL-27625 rating - consider RATING_UNSET_RATING a valid rating value 2011-05-25 12:00:16 +02:00
Sam Hemelryk 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
Sam Hemelryk 74cf2d0015 MDL-26704 Fixed up variable typo 2011-05-18 15:32:40 +08:00
Eloy Lafuente (stronk7) 94a74f549a MDL-26704 gradebook: adding TODO comment to avoid forgetting 2011-05-17 11:58:22 +02:00
Eloy Lafuente (stronk7) dcc26efb70 Merge branch 'MDL-26704_user_outline_report_master' of git://github.com/andyjdavis/moodle 2011-05-17 11:55:04 +02:00
Andrew Davis (andyjdavis) 6ac149dce3 MDL-27387 rating: prevent the submission of ratings outside of the range allowed by the current scale 2011-05-11 11:29:31 +08:00
Andrew Davis (andyjdavis) 4433f871f2 MDL-26704 gradebook: added some intelligence to the dates displayed on the user outline activity report 2011-05-10 11:14:16 +08:00
Sam Hemelryk d045b479f4 Merge branch 's9_MDL-26854_spam_comments_master_2' of git://github.com/dongsheng/moodle 2011-05-05 10:41:53 +08:00
Dongsheng Cai c1951ea953 MDL-26854 COMMENT
1. added pluginname_comment_validate callback to comments api
2. change permission callback defaults to false
3. Tidied up serveal areas of comments and implemented callback to
ignore system permissions for view (credits to Sam Hemelryk)

AMOS BEGIN
    MOV [modulerejectcomment,error],[callbackrejectcomment,error]
AMOS END
2011-05-04 17:23:46 +08:00
Andrew Davis (andyjdavis) 778361c330 MDL-26838 rating: multiple fixes after a review of rating validation code 2011-05-04 15:43:30 +08:00
Andrew Davis (andyjdavis) 2c2ff8d5fc MDL-26838 rating: remove logged in users ability to sidestep rating validity checks 2011-05-01 18:50:13 +08:00