Commit graph

60519 commits

Author SHA1 Message Date
Damyon Wiese
4e4ef99a15 Merge branch 'wip-mdl-36882' of git://github.com/rajeshtaneja/moodle 2013-03-26 10:41:33 +08:00
Damyon Wiese
688f9a46b3 Merge branch 'wip-mdl-36125' of git://github.com/rajeshtaneja/moodle 2013-03-26 10:04:31 +08:00
Damyon Wiese
febc08786e Merge branch 'wip-MDL-38650_master' of git://github.com/gjb2048/moodle 2013-03-26 09:38:46 +08:00
Mary Evans
89c9dfc417 MDL-38702 theme_mymobile: Replaced missing theme setting to disable CSS Optimiser.
The missing setting was a regression casued by MDL-33357.
2013-03-26 00:10:37 +00:00
David Mudrák
3ac58f227a MDL-37602 Add feedbackauthorattachment field into the workshop_assessments table
This is a flag to quickly see if some files are expected to be attached
to the overall feedback for the submission author.
2013-03-25 22:31:32 +01:00
Petr Škoda
f22f1cafd2 MDL-38627 force byteserving abort on error
It is weird, but Chrome PDF viewer keeps retrying byteserving requests for anything but 407. This commit also normalises response headers on all error pages.
2013-03-25 16:06:02 +01:00
David Mudrák
1c6b484dab MDL-37602 Overall feedback can be configured in the workshop settings form
Three new fields are added into the into the Assessment settings section
of the form. The default value for the overallfeedbackmaxbytes is the
same as the maximum size for submission attachments (which seems to be a
reasonable value). If there is a demand and a strong use case, these
values can became per-site configurable (I can see no big benefit of
doing so right now).

AMOS BEGIN
 CPY [maxbytes,mod_workshop],[overallfeedbackmaxbytes,mod_workshop]
AMOS END
2013-03-25 13:23:02 +01:00
David Mudrák
7426229f12 MDL-37602 Add new fields into the workshop table to hold the feature settings
These three fields hold the per-instance settings for the new Overall
feedback feature. Expected values in the new overallfeedbackmode fields are:
0 - the feature is disabled in this workshop instance
1 - overall feedback is optional (default)
2 - overall feedback is required (i.e. the reviewer must put some text
into the overall feedback field).

Files can be attached to the overall feedback text field, if the field
overallfeedbackfiles > 0 and the feature is enabled (i.e. it is optional
or required). The actual number of attached files is not checked in the
required mode (i.e. attaching files is always optional, if it is
allowed).
2013-03-25 12:58:15 +01:00
Gareth J Barnard
42d79f551d MDL-38650 theme_mymobile: Convert to new jQuery support infrastructure. 2013-03-25 10:26:35 +00:00
Frederic Massart
f3aadb1cd0 MDL-38599 glossary: Reformat settings form 2013-03-25 18:05:43 +08:00
Damyon Wiese
0cdc5fc059 Merge branch 'MDL-38674-m' of git://github.com/andrewnicols/moodle 2013-03-25 16:00:00 +08:00
Damyon Wiese
3b5539af5e Merge branch 'MDL-38668' of git://github.com/stronk7/moodle 2013-03-25 15:51:01 +08:00
Chris Wharton
7605dba31b MDl-38494 user: Fix uploaded datetime profile fields 2013-03-25 15:48:04 +08:00
Damyon Wiese
8b18c1bae5 Merge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/moodle 2013-03-25 15:36:25 +08:00
Rossiani Wijaya
ecea65cace MDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase. 2013-03-25 14:07:18 +08:00
Damyon Wiese
8aae16fb41 MDL-38654 Deprecating gdversion setting: Fix typo for new install 2013-03-25 14:06:00 +08:00
Damyon Wiese
35f155519e Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle
Conflicts:
	lang/en/admin.php
2013-03-25 14:02:31 +08:00
Roman Tsukanov
1b58651681 MDL-38429: lesson report - Improve lesson statistics code. 2013-03-25 13:58:13 +08:00
Damyon Wiese
2e0b17051c Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle 2013-03-25 12:27:32 +08:00
Rossiani Wijaya
3bd18935d7 MDL-30438 Lesson Module: fixed input text editable capability after checking/unchecking unmask option 2013-03-25 11:47:05 +08:00
Damyon Wiese
e909c7c390 Merge branch 'MDL-38044-master' of git://github.com/FMCorz/moodle 2013-03-25 11:30:36 +08:00
Rossiani Wijaya
41e2a9591f MDL-30438 Lesson Module: improve password field to disabled when password protect is set to no. 2013-03-25 11:26:50 +08:00
Damyon Wiese
716f35954e Merge branch 'wip-MDL-34917_master' of git://github.com/gjb2048/moodle 2013-03-25 11:15:03 +08:00
Damyon Wiese
27a1d25f05 MDL-31681: Formatting changes to fix indentation
Also removed/refactored some confusing use of references.
2013-03-25 10:37:14 +08:00
Marina Glancy
93c544bdb0 MDL-38147 Added functions coursecat::search_courses(), get_courses()
Also search_courses_count(), get_courses_count();
Added unittests
2013-03-25 13:23:38 +11:00
Marina Glancy
9c6cfc083f MDL-38147 fixes to phpdocs and avoid using deprecated context functions 2013-03-25 13:23:37 +11:00
Marina Glancy
9178bbbcf3 MDL-38147 changed logic for building list in make_categories_list() 2013-03-25 13:23:37 +11:00
Marina Glancy
eabbfa82d3 MDL-38147 Improvements to caching of course categories, coursecat::get_children() improvements
- Course categories caches are purged by event now
- session cache has additional 10 minutes ttl to clear itself and accomodate for permission changes that do not trigger event purging
- additional request-level cache for coursecat::get()
- We store only children of one category in one cache key
- Function coursecat::get_children() can return results sorted and/or paginated. Added tests
2013-03-25 13:23:15 +11:00
Marina Glancy
15d50fffd8 MDL-38147 Performance improvements to coursecat class:
- Retrieve and cache only often-used fields of course category
- Removed function coursecat::get_all_visible() as potentially causing performance issues
- removed function coursecat::get_all_parents() as ineffective and unnecessary, replaced with get_parents()
- retrieve all fields from course_categories when unretrieved field is accessed

Also some code improvements:
- rename functions starting with _ , rename arguments, etc.
2013-03-25 13:23:14 +11:00
Marina Glancy
e1d54562ce MDL-38147 deprecated get_categories(), change usage to coursecat 2013-03-25 13:23:06 +11:00
Marina Glancy
8db5dcb7cd MDL-38147 deprecated get_child_categories(), change usage to coursecat 2013-03-25 13:22:56 +11:00
Marina Glancy
bc81b0065c MDL-38147 deprecated get_all_subcategories() 2013-03-25 13:22:38 +11:00
Marina Glancy
9bad61dbfe MDL-38147 deprecated create_course_category(), change usage to coursecat. Also avoid direct DB update of table course_categories
changed to usage of
- coursecat::create()
- coursecat::update()
2013-03-25 13:22:26 +11:00
Marina Glancy
2d8a275bab MDL-38147 deprecated get_course_category(), change usage to coursecat 2013-03-25 13:21:20 +11:00
Marina Glancy
6e1d1ee0e7 MDL-38147 deprecated move_category(), course_category_hide(), course_category_show(), change usage to coursecat
All usages in core replaced with:
- coursecat::change_parent()
- coursecat::hide()
- coursecat::show()
2013-03-25 13:21:09 +11:00
Marina Glancy
deb65cedc4 MDL-38147 deprecated category_delete_move(), category_delete_full(), change usage to coursecat 2013-03-25 13:21:04 +11:00
Marina Glancy
4e0b6025ad MDL-38147 deprecated make_categories_list(), change usage to coursecat 2013-03-25 13:20:46 +11:00
Marina Glancy
b28bb7e8c7 MDL-38147 Added coursecatlib_test.php, changed other tests to use coursecat::create() for creating category 2013-03-25 13:20:39 +11:00
Marina Glancy
b33389d228 MDL-38147 Created class coursecat, added cache definition and lang strings 2013-03-25 13:20:33 +11:00
Damyon Wiese
adfcc976f6 Merge branch 'MDL-31681' of https://github.com/Lightwork-Marking/moodle 2013-03-25 10:15:38 +08:00
Dan Poltawski
b716cd2b70 MDL-34311 mod_url: Missing setType on the external url 2013-03-25 09:39:30 +08:00
Dan Poltawski
9f9dde40ee MDL-34311 course: add missing type on cm idnumber
We must use PARAM_RAW for idnumbers because external systems could use
any characters and this is a linking field for external systems.
2013-03-25 09:30:52 +08:00
Dan Poltawski
e994754d31 MDL-34311 course: prevent course edit form warnings
There is a placeholder element.
2013-03-25 09:30:51 +08:00
Dan Poltawski
b45ba7f6fa MDL-34311 formslib: warn when no param type set
Params without a type set will not be getting cleaned, so if developers
really do not want cleaning, they should set it explicitly.
2013-03-25 09:30:51 +08:00
Damyon Wiese
81409525b9 MDL-37033 Environment - Fix indenting in XML 2013-03-25 09:20:53 +08:00
David Monllao
970c5f3849 MDL-38483 behat: New test
According to MDLQA-89
2013-03-25 09:19:40 +08:00
David Monllao
b4e94458c7 MDL-38484 behat: New test
According to MDLQA-4597
2013-03-25 09:19:14 +08:00
Damyon Wiese
3bdb3e1605 Merge branch 'MDL-37033' of git://github.com/stronk7/moodle 2013-03-25 09:13:50 +08:00
Frederic Massart
41d020b35e MDL-38645 form: Added margin between checkbox/radio and label 2013-03-25 08:30:31 +08:00
Frederic Massart
207c737dc0 MDL-38569 form: No advanced settings in Common module settings 2013-03-25 08:29:05 +08:00