14269 Commits

Author SHA1 Message Date
Rossiani Wijaya
876c0ac382 MDL-41288 wiki: improve heading levels and styling 2013-09-10 14:08:34 +08:00
Damyon Wiese
b10ce36806 Merge branch 'MDL-40736' of git://github.com/rwijaya/moodle 2013-09-10 13:48:01 +08:00
Dan Poltawski
e025a2fc43 Merge branch 'MDL-40686' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-10 13:39:01 +08:00
Damyon Wiese
bfcc07504e MDL-23335 forum: Fix whitespace 2013-09-10 12:59:49 +08:00
Damyon Wiese
6aca3fc419 Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle 2013-09-10 12:56:40 +08:00
Marina Glancy
44ddd2a115 MDL-41219 course: Make properties of course_modinfo read-only
added phpdocs and unittests
2013-09-10 14:11:37 +10:00
Marina Glancy
88715ba2c0 MDL-41192 course: Can not write to the read-only properties of cm_info 2013-09-10 14:11:30 +10:00
Sam Hemelryk
c0382dd012 Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle 2013-09-10 15:44:49 +12:00
Sam Hemelryk
a63d1e2871 Merge branch 'wip-MDL-41556-master' of git://github.com/abgreeve/moodle 2013-09-10 13:07:37 +12:00
Sam Hemelryk
3eb032d743 NOBUG: fixed whitespace 2013-09-10 13:02:35 +12:00
Sam Hemelryk
a775f2c96d Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-10 11:22:04 +12:00
Sam Hemelryk
8242ca0c34 MDL-32862 backup: fixed missing global 2013-09-10 10:57:20 +12:00
Sam Hemelryk
12d50d8216 Merge branch 'wip-MDL-32862-master' of git://github.com/abgreeve/moodle 2013-09-10 09:38:46 +12:00
Sam Hemelryk
9b6415dd38 Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle 2013-09-10 09:36:24 +12:00
Dan Poltawski
cdf6fc243e Merge branch 'MDL-29069' of https://github.com/bostelm/moodle 2013-09-09 17:37:49 +08:00
Andrew Davis
e5d932cce2 MDL-40734 mod_glossary: cleaned up some headings 2013-09-09 17:30:12 +08:00
David Mudrák
badfeed04c MDL-29378 Fix the recent string modification
But accident, I have modified the string 'collesaintro' in the previous patch.
The correct string to be amended is 'collesapintro'.
2013-09-09 11:19:48 +02:00
Dan Poltawski
8eb80a2c42 Merge branch 'MDL-37804' of github.com:recreate/moodle 2013-09-09 17:13:22 +08:00
Damyon Wiese
7bb89ae042 Merge branch 'master_MDL-41290' of git://github.com/danmarsden/moodle 2013-09-09 10:46:59 +08:00
Rossiani Wijaya
5def24cf32 MDL-40736 Survey: improve heading levels and styling 2013-09-09 09:50:42 +08:00
Rossiani Wijaya
d8a6d49c5f MDL-40686 book: fix heading level and styling 2013-09-09 09:46:27 +08:00
Sam Hemelryk
33909ed001 Merge branch 'MDL-38794' of https://github.com/prateeksachan/moodle 2013-09-09 11:12:56 +12:00
Sam Hemelryk
fb76f7492e Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle 2013-09-09 10:48:13 +12:00
Petr Škoda
5e95223e86 MDL-28094 keep subdirs in content upgraded from 1.x 2013-09-07 11:30:19 +02:00
Adrian Greeve
a3b2df62a2 MDL-32862 - Backup: Rewriting resource_old links on backup. 2013-09-06 14:53:39 +08:00
David Mudrák
57c2052c20 MDL-29378 Code cleanup in the Survey module
While working on the issue, I spotted these two places that were worth of
fixing. The first one is a trivial reminiscence of a previous refactoring,
after which both branches of the if() statement became equal.

The second one is actually a typo as in theory it could generate unexpected
input fields with the name like qPP1. Luckily this never happened due to the
way how survey questions are hardcoded (there are no questions with the type 2
that would require two answers to their subquestions).
2013-09-05 00:08:42 +02:00
David Mudrák
7c51792932 MDL-29378 Fix the form display in the Survey/COLLES P+A module
In MDL-7501, we stopped using rowspanning cells in the form table due to
accessibility. That had introduced a regression so in the COLLES P+A survey,
all the rows were displayed with the same background colour. This patch returns
the previous behaviour that each couple of items can be distinguished by the
background colour.

Also, there is no need to display "I prefer that" and "I found that" as a small
text any more. It had made sense in rowspanning layout but not after MDL-7501
was fixed.

And finally, as all items are enumerated now sequentially, there are actually
48 lines, each couple covering one question in two variants. I think it's
correct to reflect this in the description of the form so the text was slightly
amended.
2013-09-05 00:08:42 +02:00
David Mudrák
de9a88cdaf MDL-29378 Fix regression in the Survey/COLLES P+A module
This basically reverts the commit 5196df589b0fbcead4a0943c8e7b227f8a98c897 that
I believe was a result of misunderstanding of how question type field is
(ab)used in the Survey module. As it took significant time to get familiar with
the overall logic of questions and their processing in the module, I left my
findings in added inline comments. The point is that it is $question->type that
matters. Types of questions listed as subquestions in the multi field is
irrelevant in that case (and all have it set to 1 IIRC).

This patch re-enables the "COLLES (Preferred and Actual)" survey type that did
not work at all due to regression.
2013-09-05 00:08:42 +02:00
Henning Bostelmann
d0372ed6f1 MDL-29069 Data / Glossary: allow disapproving entries 2013-09-04 20:37:46 +01:00
David Monllao
93a8bc8283 MDL-41568 lang: Fix behat features after changes 2013-09-04 15:16:59 +08:00
Damyon Wiese
3516b82c9d Merge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle 2013-09-04 11:45:07 +08:00
Damyon Wiese
1f08aa6685 MDL-28579 scorm: Fix broken unit tests 2013-09-04 09:44:05 +08:00
Damyon Wiese
8a4796fbcd Merge branch 'master_MDL-28579' of git://github.com/danmarsden/moodle 2013-09-04 09:00:48 +08:00
Dan Marsden
b565637322 MDL-41290 SCORM: Improve user report
put descriptions in help popups instead of in table.

AMOS BEGIN
MOV [interactionscorrectcount, mod_scorm],[trackcorrectcount_help, mod_scorm]
MOV [interactionslatency, mod_scorm],[tracklatency_help, mod_scorm]
MOV [interactionsresult, mod_scorm],[trackresult_help, mod_scorm]
MOV [interactionsscoremin, mod_scorm],[trackscoremin_help, mod_scorm]
MOV [interactionsscoremax, mod_scorm],[trackscoremax_help, mod_scorm]
MOV [interactionsscoreraw, mod_scorm],[trackscoreraw_help, mod_scorm]
MOV [interactionssuspenddata, mod_scorm],[tracksuspenddata_help, mod_scorm]
MOV [interactionstime, mod_scorm],[tracktime_help, mod_scorm]
MOV [interactionsweight, mod_scorm],[trackweight_help, mod_scorm]
AMOS END

Move userreport into /report and rename parameters to be more useful

fix overcomplicated parameter handling

remove SCORM 2004 specific reporting of objectives and interactions to simplify page - these will appear in full list of tracking data instead
Also remove duplicated data - the general tracks info is repated 3 times on the page so isn't required.

remove link to player as loading scos this way is problematic

split out user tracks table into it's own file

convert tracks table to flexible table and allow export

add new interactions report

add tabs to allow navigation between reports

force wrapping of track data value even when no spaces

fix some coding guideline stuff
2013-09-04 09:56:48 +12:00
Dan Marsden
27b87c10bf MDL-28579 SCORM: use filemanager instead of old file picker 2013-09-04 09:51:41 +12:00
Eloy Lafuente (stronk7)
f82a082ae2 Merge branch 'MDL-41568-en_fix' of git://github.com/mudrd8mz/moodle 2013-09-03 15:12:19 +02:00
Helen Foster
86698a4c72 MDL-41568 Merge English strings from the en_fix language pack 2013-09-03 12:31:35 +02:00
Damyon Wiese
3e248a7dc8 Merge branch 'MDL-32690_restoreMissingAssignment_master' of https://github.com/moodlerooms/moodle 2013-09-03 14:13:00 +08:00
Michael de Raadt
02d10ca0ba MDL-23335 mod_forum: allow multi-lang filtering of shortened messages 2013-09-03 13:42:06 +08:00
Adrian Greeve
146893d62f MDL-41556 - workshop: undefined constant FILE_INTERNAL message fixed. 2013-09-03 11:44:30 +08:00
Dan Poltawski
2b1e887561 Merge branch 'MDL-40214_master' of https://github.com/markn86/moodle 2013-09-03 10:06:38 +08:00
Dan Marsden
cb029f33c6 MDL-28579 SCORM: coding guideline fixes 2013-09-03 09:12:36 +12:00
Dan Poltawski
56b9e0b565 Merge branch 'MDL-41149-master' of git://github.com/damyon/moodle 2013-09-02 17:25:27 +08:00
Rajesh Taneja
bb78e249cd MDL-39961 Events: Replace Legacy events - User
This change includes:
* Added user_updated event, replacing old event
* Added user_created event, replacing old event
* Added user_deleted event, replacing old event
* Added user_loggedout event, replacing old event
* Added user_enrolment_created event, replacing old event
* Added user_enrolment_deleted event, replacing old event
* Added user_enrolment_updated event, replacing old event
2013-09-02 16:10:05 +08:00
Damyon Wiese
80032fea02 Merge branch 'wip-MDL-41231-master' of git://github.com/abgreeve/moodle 2013-09-02 15:26:26 +08:00
Andrew Davis
974beea10a MDL-40735 mod_lesson: fixed up a header and stripped out hardcoded formatting 2013-09-02 12:38:20 +07:00
Andrew Davis
66e2b9f8c2 MDL-38856 reposition activity group control and fixed titles in chat, database and forum 2013-09-02 11:49:39 +07:00
Rajesh Taneja
3b908929c1 MDL-41456 Events: Fixed existing events to respect base event access specifier and return data type 2013-08-30 11:07:48 +08:00
Mark Nielsen
79547e52dd MDL-32690: Restore 1.9 backup into 2.X fails on missing assignment type
Solution is as follows:
* Allow unsupported subplugins to convert from Moodle1 to Moodle2
* On Moodle2 restore hide unsupported subplugins
* Graceful error message in assignment of unsupported subplugins
2013-08-29 08:47:35 -07:00
Damyon Wiese
1149b5d205 MDL-41249 assign: Fix incorrect gradingform restore step
The mapping in the previous patch was wrong - mod assign uses
the area "submissions" but the itemid is the grade->id not the submission->id.
2013-08-28 16:29:19 +08:00