Commit graph

16731 commits

Author SHA1 Message Date
Dave Cooper
81d7de1aa1 MDL-48936 lang: Changed "My Home" to "Dashboard".
Part of MDL-45774
2015-04-10 17:16:27 +08:00
John Okely
9b5e702a11 MDL-49748 mod_data: Fix undefined offset error and add behat coverage 2015-04-10 09:42:34 +08:00
Alex Mitin
23464633c8 MDL-49748 mod_data: update fields even when empty 2015-04-10 09:42:34 +08:00
Gregory Zbitnev
6601690202 MDL-18309 Course: enrol/index.php returnurl improvement
This patch improves usability of enrolment page in case of course is not
enrollable. 'Continue' button now returns student to referring page instead of
main moodle page (as it used to be). To make this improvement, passing correct
returnurl parameter to enrol/index.php page was implemented for links that may
be accessible for not-enrolled students.
2015-04-10 09:32:31 +08:00
Jean-Michel Vedrine
716dfb630d MDL-49642 mod_lesson: fix restore of overrides 2015-04-09 15:26:40 +08:00
Rajesh Taneja
bed022decb MDL-48159 mod_assign: Use proper step to navigate to homepage 2015-04-09 11:13:33 +08:00
Rajesh Taneja
3072d006be MDL-48159 mod_assign: Fixed behat to pass on chrome
Chrome driver doesn't support clicking on
link which wrap on multiple lines. In this
case link is wrapped in navigation block
and was failing on chrome.
2015-04-09 11:07:34 +08:00
Colin Campbell
334bee5f60 MDL-48723 mod/forum: Fix cron task error on digest attachments. 2015-04-08 13:22:02 -05:00
M Kassaei
9f9d2caa33 MDL-40988 quiz: fix bug when editing default heading on blank quiz 2015-04-08 12:42:34 +01:00
Dan Poltawski
f5d9f19013 Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle 2015-04-08 08:57:15 +01:00
Jean-Michel Vedrine
31cb1b0eca MDL-49642 mod_lesson: fix backup of user overrides 2015-04-08 09:21:44 +02:00
Brian Barnes
8b3a10438f MDL-49782 general: removed uses of window.status 2015-04-08 11:49:06 +12:00
Dan Poltawski
5483bd6239 Merge branch 'MDL-49730-master-workshop-width' of git://github.com/mudrd8mz/moodle 2015-04-07 20:26:15 +01:00
Eloy Lafuente (stronk7)
a7d5af2d82 Merge branch 'MDL-48159' of https://github.com/andrewhancox/moodle 2015-04-07 19:13:56 +02:00
Dan Poltawski
fee0ba1f4e MDL-40988 quiz: behat fix from Raj 2015-04-07 15:39:14 +01:00
Andrew Hancox
e528997a4a MDL-48159 mod_assign: Added setting preventsubmissionnotingroup
If enabled a user will be unable to make a submission unless they are a
member of a group.
2015-04-07 14:30:40 +01:00
Damyon Wiese
82d341cfd5 Merge branch 'MDL-49503-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
	version.php
2015-04-07 20:28:23 +08:00
Eloy Lafuente (stronk7)
615812040a Merge branch 'MDL-49065_m29v6' of https://github.com/sbourget/moodle 2015-04-07 14:15:33 +02:00
Damyon Wiese
75ece778c5 Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2015-04-07 17:27:17 +08:00
Andrew Hancox
6398ff5387 MDL-49101 core: Add a global admin setting config->requiremodintro
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
2015-04-07 10:11:53 +01:00
David Monllao
6661d5de14 Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle 2015-04-07 12:06:22 +08:00
Dan Poltawski
759c4f0c55 MDL-40988 quiz: correct install.xml inconsistency
quizid should not have a default set
2015-04-06 14:38:42 +01:00
Dan Poltawski
774906fc6d Merge branch 'mdl38210-master' of https://github.com/tlock/moodle 2015-04-06 12:35:01 +01:00
Dan Poltawski
097979568a Merge branch 'MDL-40988' of git://github.com/mkassaei/moodle 2015-04-06 12:07:34 +01:00
Petr Skoda
d6e7a63d9a MDL-49684 timezones: rewrite timezone support
This patch replaces all homegrown timezone
stuff with standard PHP date/time code.

The main change is the introduction of core_date
class that returns normalised user and server
timezones. From now on nobody should be using
$CFG->timezone or $user->timezone directly!

Other new features and fixes:
* admins are prompted for timezone during install
* editing of other users is finally fixed
* timezones are displayed in user profile
* new $this->setTimezone() in phpunit
* time locale is now automatically reset in phpunit
* timezone is now automatically reset in phpunit
* phpunit has Australia/Perth as default timezone
2015-04-06 13:53:51 +12:00
M Kassaei
5d949702f8 MDL-40988 quiz: ability to break quizzes into sections
The sections are created on the edit quiz page, and then appear in the
navigation panel when the quiz is being attempted to help students find
their way around.

The 'Shuffle questions' setting has been moved from being per-quiz
to being a per-section.

This commit is actually the joint work of Mahmoud Kassaei and Tim Hunt
from The Open University. We could only use one persons name for the
commit and this time Mahmoud gets the credit/blame.
2015-04-05 14:30:53 +01:00
Jean-Michel Vedrine
247980b0e8 MDL-49642 mod_lesson: Fix issues found during integration review 2015-04-05 15:05:31 +02:00
Stephen Bourget
446db9fe33 MDL-49065 Lesson: Add Behat tests for my home 2015-04-02 13:18:17 -04:00
Stephen Bourget
673e0d5a14 MDL-49065 Lesson: Fix attempt info displayed by course overview block 2015-04-02 13:17:33 -04:00
Juan Leyva
d508dfe79a MDL-49503 forum: Add view_forum_discussion to the mobile service 2015-04-02 17:11:27 +02:00
Juan Leyva
a3c315dda2 MDL-49503 forum: New external function mod_forum_view_forum_discussion 2015-04-02 17:08:42 +02:00
Juan Leyva
6e5df52c80 MDL-49503 forum: Unit tests for forum_discussion_view 2015-04-02 17:08:42 +02:00
Juan Leyva
1546987b86 MDL-49503 forum: Move discussion viewed triggering to API function 2015-04-02 17:08:42 +02:00
Stephen Bourget
4ce40083e2 MDL-49642 mod_lesson: Behat tests for overrides 2015-04-02 13:56:53 +02:00
Jean-Michel Vedrine
e0e1a83e2c MDL-49642 mod_lesson: Group/user overrides 2015-04-02 13:56:52 +02:00
David Monllao
0adf7044ff MDL-46805 mod_scorm: Re-fix as previous object was removed in 2.8 2015-04-02 11:09:30 +02:00
Rajesh Taneja
e43bf473fa MDL-46805 scorm: Set user_id if scorm|aiccuserid config is set 2015-04-02 11:09:29 +02:00
Rajesh Taneja
345c6a1ac0 MDL-49513 behat: Updated step name to match new step 2015-04-02 11:08:21 +02:00
Andrew Nicols
df15759724 Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle 2015-04-02 11:06:27 +02:00
Rajesh Taneja
bed97c39eb MDL-49513 behat: Set admin config using php api
Added a new set to set config using set_config() api
to make steps faster and more efficient
2015-04-01 14:25:23 +08:00
David Monllao
a647e1f053 Merge branch 'MDL-49502-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
2015-04-01 11:49:31 +08:00
Andrew Nicols
2b53b13ff7 MDL-49627 core: Update uses of generate_image_thumbnail
This removes the need to write tempfiles in these locations.
2015-04-01 11:05:19 +08:00
David Monllao
4d9dda2389 Merge branch 'MDL-40992' of git://github.com/timhunt/moodle 2015-04-01 08:00:43 +08:00
Tim Lock
1241b871cf MDL-38210 report_participation: implement get view/post actions 2015-04-01 10:26:44 +10:30
Dan Poltawski
f31c4f27f3 Merge branch 'MDL-49617-master' of git://github.com/jleyva/moodle 2015-03-31 20:10:27 +01:00
Tim Hunt
5e63b335fe MDL-40992 quiz: option to let students redo questions within an attempt
This feature is designed for use on pracice or formative quizzes.
It is available for quizzes that use Interactive or Immediate feedback
behaviour.

If the teacher turns this on in the quiz settings, then once a student
has finished a question, they get a 'Redo question' button beside the
question. If they click it, then the question they finished is replaced
by a new one so they can try again to practise that particul skill or
bit of knowledge a bit more.

When randomisation is involved, the studnets will be given a question or
variant that they have not seen before if possible.
2015-03-31 14:12:48 +01:00
David Mudrák
0eb1b5fd51 MDL-49730 workshop: Do not waste valuable screen space
Stop using elements with width less than 100% in the workshop UI.
2015-03-31 13:46:32 +02:00
Dan Poltawski
deadda2f86 Merge branch 'MDL-48880' of git://github.com/jmvedrine/moodle
Conflicts:
	mod/lesson/db/upgrade.php
	mod/lesson/version.php
2015-03-31 11:21:11 +01:00
Dan Poltawski
4e664d1689 Merge branch 'MDL-26689' of git://github.com/jmvedrine/moodle 2015-03-31 10:46:30 +01:00
Dan Poltawski
7e5c5b83c1 Merge branch 'm29_MDL-43818_Unable_Download_Package_Via_URL' of https://github.com/scara/moodle 2015-03-31 09:27:46 +01:00