Andrew Nicols
9d745218e8
Merge branch 'MDL-49902-master' of git://github.com/jleyva/moodle
2015-04-21 11:40:39 +08:00
Andrew Nicols
793645a03f
Merge branch 'm29_MDL-49782' of https://github.com/totara/moodle
2015-04-21 10:43:48 +08:00
Rajesh Taneja
0fe86bbdbb
MDL-49799 behat: replaced asd.com with example.com
...
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
David Monllao
b312e7f13a
Merge branch 'MDL-48723_master_forum-plagiarism_errors' of git://github.com/colin-umn/moodle
2015-04-17 10:41:20 +08:00
Juan Leyva
ea2fa324d7
MDL-49902 forum: Add missing capability check in mod_forum_view_forum
2015-04-16 22:07:11 +02:00
Dan Poltawski
8da277ea96
Merge branch 'MDL-49894-master' of git://github.com/jleyva/moodle
2015-04-16 16:10:23 +01:00
Juan Leyva
6d28e2cfa6
MDL-49894 webservices: Add missing API changes in upgrade.txt
2015-04-16 15:19:42 +02:00
Juan Leyva
b235aef094
MDL-49894 forum: Add deprecated information for get_forum_discussions
2015-04-16 14:53:11 +02:00
Dan Poltawski
aa96a20027
Merge branch 'MDL-49837-master' of git://github.com/jleyva/moodle
2015-04-16 10:32:14 +01:00
Dan Poltawski
8c1444e4a4
Merge branch 'MDL-49763-master' of git://github.com/jleyva/moodle
2015-04-15 15:53:17 +01:00
Dan Poltawski
7068541fff
Merge branch 'MDL-49803_master' of git://github.com/dmonllao/moodle
2015-04-15 15:06:17 +01:00
Juan Leyva
7f45111e36
MDL-49837 assign: Use correct assertions and fix return params cleaning
2015-04-15 12:21:38 +02:00
Dan Poltawski
75e20c1845
Merge branch 'wip-MDL-18309-master' of git://github.com/marinaglancy/moodle
2015-04-15 09:54:36 +01:00
David Monllao
2b51626f2a
MDL-49803 mod_quiz: Fixing overrides restore
2015-04-15 15:29:38 +08:00
Dan Poltawski
9ac0001bf0
MDL-45774 fix trailing whitespace
2015-04-14 15:32:15 +08:00
Dan Poltawski
0627d5802c
Merge branch 'wip-MDL-45774-master' of git://github.com/abgreeve/moodle
2015-04-14 15:32:13 +08:00
Juan Leyva
13e814bcb1
MDL-49837 assign: Fix external functions return declaration
...
Incorrect use of external_warnings function
2015-04-13 17:34:35 +02:00
Adrian Greeve
6e918b6437
MDL-45774 navigation: General fixes for the user navigation.
2015-04-13 15:54:24 +08:00
Adrian Greeve
e29866b57f
MDL-49819 navigation: User profile string improvement.
...
Part of MDL-45774.
2015-04-13 14:41:55 +08:00
Juan Leyva
81f810dca8
MDL-49763 webservices: Handle correctly deleted users for forums
2015-04-10 22:21:42 +02:00
Damyon Wiese
46a2fbc4b7
MDL-49412 Navigation: Remaining behat fixed for nav branch
...
Behat is passing after this change.
Part of MDL-45774.
2015-04-10 17:19:28 +08:00
Damyon Wiese
221210e9b2
MDL-49412 Behat: Fix behat tests for all of @mod
...
This is after the navigation changes for 2.9.
Part of MDL-45774.
2015-04-10 17:18:23 +08:00
Adrian Greeve
45367bdf0c
MDL-49688 navigation: First review fixes and version bump.
...
Part of MDL-45774.
2015-04-10 17:18:03 +08:00
Ankit Agarwal
b19cc4ef25
MDL-45898 myprofile: Redesign my profile page
...
Part of MDL-45774.
Contributions by John Okely, Jetha Chan and Damyon Wiese (squashed branch).
AMOS BEGIN
CPY [coursebadges,core_badges], [badges,core_badges]
AMOS END
2015-04-10 17:17:32 +08:00
Adrian Greeve
f495187da7
MDL-48935 navigation: Update the user nav breadcrumbs.
...
Part of MDL-45774.
2015-04-10 17:17:07 +08:00
Adrian Greeve
283ea788bf
MDL-48931 navigation: Implement the user subheader.
...
Part of MDL-45774
2015-04-10 17:17:07 +08:00
Adrian Greeve
e026cc9253
MDL-48930 navigation: Update to forum page headers.
...
The forum posts and discussion headers have been updated
to use the course full name instead of the short name to
match other pages.
Part of MDL-45774.
2015-04-10 17:17:07 +08:00
Adrian Greeve
880c50731f
MDL-48930 navigation: Using user headers in user pages.
...
Pages that are percieved to be in a user context are now
using a user context for the header.
Part of MDL-45774
2015-04-10 17:17:07 +08:00
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
Brian Barnes
32bd11cb39
MDL-49628 general: improved accessibility of single selects
2015-04-09 11:12:16 +12: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