moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60509 commits 37 branches 544 tags 1.3 GiB
Commit graph

60509 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
0d377c8d56 Merge branch 'w13_MDL-38671_m25_adodb' of git://github.com/skodak/moodle 2013-03-26 16:07:12 +01:00
Eloy Lafuente (stronk7)
cf20e809aa Merge branch 'MDL-38582' of git://github.com/timhunt/moodle 2013-03-26 16:03:37 +01:00
Eloy Lafuente (stronk7)
6341d977a3 MDL-38659 environment: fix incorrect feedback messages 2013-03-26 15:34:50 +01:00
Eloy Lafuente (stronk7)
d9b9ef5d4e MDL-38659 environment: verify feedback matches levels 2013-03-26 15:34:06 +01:00
Eloy Lafuente (stronk7)
38495379a8 Merge branch 'MDL-38719' 2013-03-26 13:37:13 +01:00
Eloy Lafuente (stronk7)
caa30cd625 MDL-38719 forms: detectMissingSetType() handle of repetitions. 
It seems that formslib, for repetition, relies in the type
especified by the main (non existent at the end) element, instead
of assingning a type to each repetition.

Surely a result of storing types apart from elements. :-(

With the patch, detectMissingSetType() will detect
repeated elements (name containing '[') and will
perform the verification against that main element type.
 2013-03-26 13:28:47 +01:00
Eloy Lafuente (stronk7)
f35f07e9f7 MDL-38719 forms: add some missing types. 
This just adds some missing types to different places
causing phpunit tests to fail.
 2013-03-26 12:13:40 +01:00
Aparup Banerjee
3a7e4a80ad MDL-38564 fixed whitespace 2013-03-26 17:22:22 +08:00
Frederic Massart
c55cd6ac64 MDL-38691 form: Styling for show more/less toggle 2013-03-26 17:20:58 +08:00
Aparup Banerjee
be0eacf883 Merge branch 'MDL-38564-master' of git://github.com/ankitagarwal/moodle 2013-03-26 17:20:01 +08:00
Aparup Banerjee
d54bc60b33 Merge branch 'w13_MDL-38672_m25_purifier' of git://github.com/skodak/moodle 2013-03-26 17:12:18 +08:00
Barbara Ramiro
83284dc962 MDL-38691 usability: More/less icons 2013-03-26 17:08:15 +08:00
Dan Poltawski
1f0cd6ee98 MDL-38712 mod_glossary: fix missing PARAM type 2013-03-26 17:05:10 +08:00
Dan Poltawski
e380d57fb6 MDL-38711 qtype_multianswer: missing setType param 2013-03-26 16:57:01 +08:00
Dan Poltawski
7c69ab5dc7 MDL-38713 course: correctly set visibleold on mod creation 
Remove uncessary set of visibleold in the form
 2013-03-26 16:27:38 +08:00
Ankit Agarwal
bf6b3c7a8a MDL-38564 Adding unit tests for the functions compare_activities_by_time_asc() and compare_activities_by_time_desc() 2013-03-26 16:12:01 +08:00
Damyon Wiese
0231f91d86 Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle 2013-03-26 16:11:47 +08:00
Frederic Massart
a59bbb6e12 MDL-38611 page: Reformat settings form 2013-03-26 15:40:24 +08:00
Damyon Wiese
3dbfd15872 Merge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle 2013-03-26 15:40:04 +08:00
Damyon Wiese
41fdbc0d77 MDL-38468 Filelib: Fix ordering of new mimetypes 2013-03-26 15:16:15 +08:00
Damyon Wiese
2013daeb47 Merge branch 'm25_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-03-26 15:13:35 +08:00
Charles Fulton
bb1592c860 MDL-38700 course: only change visibility if a module moves to a different section 2013-03-26 15:03:33 +08:00
Dan Poltawski
1fff1b8cba MDL-38700 course: add tests for moveto_module() 
* Test visibility when moving around hidden sections
* Test for visiblity changes when moving around in the same sections.
 2013-03-26 15:03:32 +08:00
Damyon Wiese
96a9273343 Merge branch 'MDL-38528' of git://github.com/timhunt/moodle 2013-03-26 14:57:04 +08:00
Damyon Wiese
a847da21d0 MDL-35875: Version bump for CSS changes 2013-03-26 14:50:18 +08:00
Damyon Wiese
95764ab7ef Merge branch 'MDL-35875-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/upgrade.txt
 2013-03-26 14:49:34 +08:00
Damyon Wiese
d0fd9726d1 Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle 2013-03-26 14:29:57 +08:00
Damyon Wiese
c7c472a87a MDL-38147 Course: Added version bump for cache definitions. 2013-03-26 14:22:35 +08:00
Damyon Wiese
0c241b980a Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	lib/upgrade.txt
 2013-03-26 14:22:11 +08:00
Jason Fowler
6671fa735a MDL-35876 - Blocks - Adding verbose move here descriptions to blocks for accessibility 2013-03-26 14:21:38 +08:00
Frederic Massart
2c1065f7a9 MDL-38610 label: Module settings have a general section 2013-03-26 14:02:11 +08:00
Damyon Wiese
8af0dffb50 Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	course/moodleform_mod.php
	lib/upgrade.txt
 2013-03-26 13:46:29 +08:00
Damyon Wiese
59ef4aab75 MDL-38598 Forms: Version bump for js changes. 2013-03-26 13:33:52 +08:00
Damyon Wiese
37e50e9316 Merge branch 'MDL-38598-master-int' of git://github.com/FMCorz/moodle 2013-03-26 13:28:57 +08:00
Damyon Wiese
935ff91d5f Merge branch 'MDL-38380' of git://github.com/lazydaisy/moodle 2013-03-26 13:23:53 +08:00
Marina Glancy
4e53188a4b MDL-38147 bug fix, changed usage of non-existing function 2013-03-26 16:17:34 +11:00
Damyon Wiese
553b23989a Merge branch 'MDL-38390' of git://github.com/jonof/moodle 2013-03-26 13:12:29 +08:00
Damyon Wiese
1e425d185b Merge branch 'MDL-38429' of git://github.com/rwijaya/moodle 2013-03-26 12:59:53 +08:00
Damyon Wiese
d21a452dcc Merge branch 'MDL-38569-master' of git://github.com/FMCorz/moodle 2013-03-26 12:19:05 +08:00
Marina Glancy
290af25434 MDL-38147 fixed small bug on changed categories cache 2013-03-26 14:09:00 +11:00
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