Commit graph

16731 commits

Author SHA1 Message Date
Andrew Nicols
b10d72f4e9 Merge branch 'MDL-49814' of git://github.com/timhunt/moodle 2015-04-28 10:11:16 +01:00
Dan Poltawski
c5cdc8887a Merge branch 'MDL-49993_master' of git://github.com/grabs/moodle 2015-04-27 14:47:58 +01:00
Rajesh Taneja
ceeab15019 MDL-49948 lesson: Answer and response format should be known for each form 2015-04-27 14:35:20 +01:00
Dan Poltawski
08c8fc50ce Merge branch 'MDL-49913' of git://github.com/jmvedrine/moodle 2015-04-27 14:28:27 +01:00
Tim Hunt
377ce9938b MDL-49814 quiz: make question dependency clear in the nav 2015-04-27 13:55:40 +01:00
Dan Poltawski
2be9a45389 Merge branch 'MDL-49977_master' of git://github.com/markn86/moodle 2015-04-27 10:46:08 +01:00
Andreas Grabs
9f78349f58 MDL-49993 mod_feedback: Question auto numbers have no space between number and question 2015-04-26 19:04:40 +02:00
Jean-Michel Vedrine
c914c92da0 MDL-49913 mod_lesson: studentanswer format should be HTML 2015-04-24 19:19:32 +02:00
Jean-Michel Vedrine
cb9d259dcd MDL-49913 mod_lesson: fix import scores and jumps 2015-04-24 19:19:31 +02:00
Jean-Michel Vedrine
9fb9aa9c91 MDL-49913 mod_lesson: defaultanswer to avoid duplication 2015-04-24 19:19:31 +02:00
Jean-Michel Vedrine
35cec798c2 MDL-49913 mod_lesson: round question grades on import 2015-04-24 19:19:30 +02:00
Andrew Nicols
0264bb1ecb Merge branch 'MDL-49813' of https://github.com/mkassaei/moodle 2015-04-24 10:19:20 +01:00
Dan Poltawski
5975d9521a Merge branch 'MDL-49946' of https://github.com/jmvedrine/moodle 2015-04-24 10:19:19 +01:00
David Monllao
9dbcdd8b1f Merge branch 'MDL-49937-master' of git://github.com/jleyva/moodle 2015-04-24 10:19:18 +01:00
Mark Nelson
ccc1bc7e2e MDL-49977 mod_assign: added missing page titles 2015-04-23 16:24:18 -07:00
M Kassaei
32498c28ea MDL-49813 quiz: add sections in the right place after page changes 2015-04-23 16:54:50 +01:00
Juan Leyva
8352aa50f3 MDL-49937 data: Handle admins/managers in get_databases_by_courses 2015-04-23 09:37:06 +02:00
Jean-Michel Vedrine
6197497393 MDL-49946 mod_lesson: improve qformat_default::defaultquestion 2015-04-22 19:40:19 +02:00
Dan Poltawski
a8d8783988 Merge branch 'MDL-49921-master' of git://github.com/jleyva/moodle 2015-04-22 16:40:15 +01:00
David Monllao
e5c5ced912 Merge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle 2015-04-22 17:02:19 +08:00
Juan Leyva
c8f1d8a026 MDL-49921 forum: Handle exceptions correctly in get_forums_by_courses 2015-04-22 09:47:18 +02:00
Tony Butler
2224f2c598 MDL-49933 mod_assign: Sort marker select lists alphabetically by name 2015-04-21 16:58:38 +01:00
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