63640 Commits

Author SHA1 Message Date
Mark Nelson
df01e4c748 MDL-18375 calendar: PHPDoc tidy up as well as some other minor changes 2013-09-05 18:32:16 +08:00
Mark Nelson
f59ab4adc8 MDL-18375 calendar: renamed the userdate/usergetdate functions and changed them to abstract
Renamed the userdate/usergetdate functions in the calendar type to be more
descriptive and made them abstract to ensure developers implement this
functionality in their calendar type.

Also tidied up PHPDocs for these functions.
2013-09-05 18:32:16 +08:00
Mark Nelson
0ae36d6cfc MDL-18375 calendar: created a test calendar type to use for PHPUnit tests and added tests 2013-09-05 18:32:16 +08:00
Mark Nelson
022745acd2 MDL-18375 calendar: implemented the usage of the recently introduced automatic class loading 2013-09-05 18:32:16 +08:00
Mark Nelson
84423bd9e5 MDL-18375 calendar: refactored the datetime user field so that it now uses the calendar type system 2013-09-05 18:32:15 +08:00
Mark Nelson
62321a7ba0 MDL-18375 calendar: edited the calendartype column in the install.xml file and created an upgrade path 2013-09-05 18:32:15 +08:00
Mark Nelson
7e52491cf9 MDL-18375 calendar: moved the location of the calendar type select box when editing a course 2013-09-05 18:30:05 +08:00
Mark Nelson
29cb1e83b0 MDL-18375 calendar: only display the YUI2 calendar when the Gregorian type is used 2013-09-05 18:30:05 +08:00
Mark Nelson
2f00e1b245 MDL-18375 calendar: huge refactor of the initial patch
1) Moved the calendar types location to a sub-folder in the calendar directory.
2) Removed/moved language strings.
3) Removed calendar types that should be downloaded as plugins.
4) Removed a Non-English language pack for the Gregorian calendar type that
should be downloaded separately.
5) Removed custom files responsible for checking for updates and uninstalling
calendar types, which should be done by core.
6) Removed JS from the calendar_month block as there is no non-JS alternative
provided and the JS written does not make use of the YUI library to ensure
multiple browser support.
7) Removed code from the base class responsible for creating timestamps that
are saved in the DB.
8) Added PHPDocs.

Note: In the original patch we are editing core functions responsible for saving
time in the database in the calendar base class. This is very dangerous, we do
not want to touch these functions as it could cause a complete fubar of the
database. There are places we are forcing the use of the gregorian calendar as
we are passing dates generated by the PHP date function, where as sometimes
we pass dates from usergetdate (which was being overwritten to return the
date specific to the calendar). We can not expect third party modules to
change the calendar type depending on the format they pass to these functions.
2013-09-05 18:30:05 +08:00
Shamim Rezaie
6dd59aabfa MDL-18375 calendar: added multiple calendar support
Conflicts:

	course/edit_form.php
	lib/db/install.xml
	lib/form/dateselector.php
	lib/form/datetimeselector.php
	lib/setup.php
2013-09-05 18:30:05 +08:00
Ankit Agarwal
77037e27a5 MDL-41599 events: Set relateduserid instead of userid in blog events 2013-09-05 17:10:34 +08:00
Frederic Massart
3274c5db89 MDL-41460 core_component: Validate cache against version.php 2013-09-05 14:45:09 +08:00
Dan Poltawski
ba7b843c01 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-09-05 14:42:31 +08:00
Dan Poltawski
b69ec2889e weekly release 2.6dev 2013-09-05 13:34:14 +08:00
Rajesh Taneja
cc6a0dd095 MDL-41605 Enrolments: Updated unassign role url to use roleid as param
Filter on enrolled users page use role param to perform filtering by role,
and unassign role also contain role param to remove user role in course
which used to conflict. Looking at assign role, we use roleid param, so
using roleid for unassigning as well
2013-09-05 11:47:19 +08:00
Dan Poltawski
0de0e38bc4 Merge branch 'wip-MDL-41369-fix2' of git://github.com/marinaglancy/moodle 2013-09-05 10:34:11 +08:00
Marina Glancy
1b40564829 MDL-41369 Behat tests updated because of fixed messaging navigation 2013-09-05 12:29:29 +10:00
David Monllao
19f6703d8b MDL-41587 tool_behat: Adding site name constant 2013-09-05 10:13:25 +08:00
David Monllao
3b7d3fb8d7 MDL-41555 tool_behat: Improving behat & selenium exceptions messages
Also moving the 'selenium not running'
checking to a proper place as it was
not thrown since the homepage start
visit() was introduced.
2013-09-05 10:12:57 +08:00
Mark Nelson
1eee7ee3a0 MDL-40924 badges: added a print_error call to prevent PHP notices when no badges are found 2013-09-05 10:05:37 +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
Tim Gus
179961e8a4 MDL-38570 administration: Temporary file deletion
Added new function "cron_delete_from_temp" to delete old files and
directories under $CFG->tempdir during cron run. Unit test included.
2013-09-04 13:48:01 -04:00
Rajesh Taneja
b7a5eb1ed8 MDL-41590 Enrolments: If course is deleted, then use courseid for reference 2013-09-04 17:32:19 +08:00
Dan Poltawski
bc16c7a0e3 Merge branch 'MDL-41568_master-fix_behat' of git://github.com/dmonllao/moodle 2013-09-04 16:59:20 +08:00
Jason Fowler
2e2d0f75dd MDL-40833 Course - Single topic pages need h3 for section heading 2013-09-04 15:39:27 +08:00
David Monllao
93a8bc8283 MDL-41568 lang: Fix behat features after changes 2013-09-04 15:16:59 +08:00
Marina Glancy
8f0137e192 MDL-41369 Pass viewing argument to more message screens 2013-09-04 17:11:30 +10:00
Rajesh Taneja
2e4b1fc728 MDL-41589 Enrolments: Fixed role unassign confirmation dialog 2013-09-04 14:35:36 +08:00
Damyon Wiese
fedb0325df Merge branch 'MDL-41485-master' of git://github.com/ankitagarwal/moodle 2013-09-04 12:24:54 +08:00
Damyon Wiese
3516b82c9d Merge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle 2013-09-04 11:45:07 +08:00
Dan Poltawski
259dfc2521 Merge branch 'wip-MDL-41369-master' of git://github.com/marinaglancy/moodle 2013-09-04 11:09:30 +08:00
Dan Poltawski
7e2a4e1638 Merge branch 'wip-mdl-41418' of git://github.com/rajeshtaneja/moodle 2013-09-04 10:38:10 +08:00
Dan Poltawski
4f9c5f332b Merge branch 'wip-MDL-41395-master' of git://github.com/marinaglancy/moodle 2013-09-04 10:33:33 +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
Jason Fowler
f477b698ab MDL-41236 atto - Improving visibility of disabled buttons and making atto match the file manager 2013-09-04 07:52:55 +08:00
Eloy Lafuente (stronk7)
4e6f199203 MDL-41267 fix phpunit tests 2013-09-04 01:11:54 +02:00
Eloy Lafuente (stronk7)
f875599462 Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2013-09-04 01:08:37 +02:00
Yuliya Bozhko
a72c2cd681 MDL-40471 badges: Fixes around badge capabilities and navigation 2013-09-04 11:03:35 +12:00
Eloy Lafuente (stronk7)
df7995e3a0 Merge branch 'MDL-41146-master' of git://github.com/sammarshallou/moodle 2013-09-04 01:01:19 +02: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)
58c80b03a8 Merge branch 'MDL-40566_master' of git://github.com/dmonllao/moodle 2013-09-03 20:38:53 +02: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
Frederic Massart
5995717e22 MDL-41305 group: Form improvements for group/grouping creation 2013-09-03 18:31:21 +08:00
Marina Glancy
85708da63b MDL-41395 Improved phpdocs for coursecatlib.php 2013-09-03 19:23:44 +10:00