4396 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
2426d816fe Merge branch 'MDL-49901_master' of https://github.com/jinhofer/moodle 2015-06-02 19:57:38 +02:00
David Mudrák
01f329babe MDL-50318 course: Fix the URL of embedded images at resources overview
Not only mod_resource instances are listed here. All modules that
declare their FEATURE_MOD_ARCHETYPE as MOD_ARCHETYPE_RESOURCE (well, all
but those without own view page, such as mod_label) are listed. So we
must use the real plugin name when rendering the intro field.
2015-05-21 17:23:25 +02:00
Rajesh Taneja
53cf1a4149 MDL-50259 behat: Use strict activity name checking
contains might select wrong activity
so using strict activity text checking
2015-05-19 14:20:05 +08:00
Dan Poltawski
57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01:00
Marina Glancy
46be1d58ac MDL-49718 externallib: unittest correction 2015-05-06 13:00:56 +08:00
Andrew Nicols
43ef409276 Merge branch 'MDL-49985_master' of git://github.com/markn86/moodle
Conflicts:
	mod/forum/post.php
2015-05-06 11:11:21 +08:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
Frederic Massart
b2687a055d MDL-49179 weblib: Secure the direct usage of $_SERVER['HTTP_REFERER'] 2015-05-05 18:31:13 +08:00
Mark Nelson
b3cb726431 MDL-49985 core_course: revert commit belonging to MDL-18309
This reverts commit 6601690202764d786a5ee4b7bbd9afb5b91dd0ec.

This commit was adding the 'returnurl' param unnecessarily to the
course links in the navigation block, causing a lot of long URLs
to be created.
2015-05-05 01:09:20 -07:00
John Okely
4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Adrian Greeve
12261113a9 MDL-49888 navigation: Added missing reports to user profile.
Added statistics and grade to the reports section in the user
profile.
2015-04-28 14:30:26 +08:00
Andrew Nicols
b3b6588262 Merge branch 'MDL-34921_master_unwanted-sitehome-redirects' of https://github.com/colin-umn/moodle 2015-04-23 11:49:16 +08:00
Simey Lameze
e35bac3e80 MDL-49854 core: User navigation refinements
Fixing some reported issues:
- Removing unnecessary conditional include
- Require login in grade/report/mygrades.php
- Remove unnecessary defined('MOODLE_INTERNAL') call
- Fixing context_header::__construct $imagedata param type
2015-04-21 11:46:32 +08:00
Andrew Nicols
bd305d3dcb Merge branch 'wip-mdl-49799-m' of https://github.com/rajeshtaneja/moodle 2015-04-20 12:22:18 +08:00
Mark Nelson
595b911a98 MDL-48187 core_course: use updated '$grade_item' 2015-04-19 20:30:21 -07: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
jinhofer
253db9dea7 MDL-49901 course/yui: Changed action for course format 2015-04-16 14:22:17 -05:00
David Monllao
89a6290fb9 Merge branch 'MDL-45131-master' of git://github.com/jleyva/moodle 2015-04-16 17:04:34 +08:00
Juan Leyva
bdf9f4d41c MDL-45131 course: Add validation for returned parameters in WS tests 2015-04-16 10:25:24 +02:00
Rajesh Taneja
f53688e289 MDL-18309 behat: Fixed navigating to edit profile 2015-04-16 07:12:47 +08:00
Dan Poltawski
75e20c1845 Merge branch 'wip-MDL-18309-master' of git://github.com/marinaglancy/moodle 2015-04-15 09:54:36 +01:00
Dan Poltawski
0627d5802c Merge branch 'wip-MDL-45774-master' of git://github.com/abgreeve/moodle 2015-04-14 15:32:13 +08:00
Andrew Nicols
b0f08eaa03 Merge branch 'MDL-44611-Automate-MDLQA-5252' of https://github.com/ramdesh/moodle 2015-04-13 10:26:03 +08: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
Adrian Greeve
c699310c40 MDL-49412 behat: Updates to course behat tests.
Part of MDL-45774
2015-04-10 17:18:22 +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
Adrian Greeve
c78dbe03fb MDL-49634 navigation: My grades now relevant to teachers.
My grades was originally only showing grades to a student.
Now the report will also show teachers what courses they are
teachers in.

Part of MDL-45774.
2015-04-10 17:17:08 +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
c9451960e3 MDL-45894 navigation: My grades update to overview report.
Part of MDL-45774
2015-04-10 17:17:05 +08:00
Marina Glancy
314a221066 MDL-18309 course: enrol/index.php returnurl tests 2015-04-10 09:32:35 +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
Ramindu Deshapriya
c1d58952d3 MDL-44611 core_course: Added Behat test to automate MDLQA 5252 2015-04-08 00:43:02 +05:30
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
Colin Campbell
6825560889 MDL-34921 course/format: Fix unwanted redirects from Site home 2015-04-04 21:31:35 -05:00
Andrew Nicols
df15759724 Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle 2015-04-02 11:06:27 +02:00
Juan Leyva
4dfef5e9ef MDL-49453 webservices: Validate section number (exists and visibility) 2015-04-02 11:06:24 +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
Juan Leyva
e81f67ca62 MDL-49453 webservices: Unit tests for WS core_course_view_course 2015-03-26 16:46:38 +01:00
Juan Leyva
7aed00d51f MDL-49453 webservices: New WS core_course_view_course 2015-03-26 16:30:28 +01:00
Juan Leyva
2258883544 MDL-49453 course: Move view trigger event to a new API function 2015-03-26 16:30:15 +01:00
Marina Glancy
a824e60ab6 MDL-13831 course: validate gradepass only if needed 2015-03-25 10:59:33 +08:00
Dan Poltawski
b051a0aff5 Merge branch 'MDL-48918-master' of git://github.com/andrewnicols/moodle 2015-03-24 15:06:34 +00:00
Marina Glancy
c977b35059 MDL-13831 grades: allow to set gradepass in mod_form 2015-03-23 11:11:37 +08:00
Gregory Faller
8164fad49d MDL-13831 course: add gradepass field to mod_form 2015-03-23 10:56:56 +08:00
Eloy Lafuente (stronk7)
338de2ed78 Merge branch 'MDL-49242-master' of git://github.com/jleyva/moodle 2015-03-11 00:11:56 +01:00
David Monllao
59aebbed70 MDL-48595 logstore: Replacing references to deprecated interfaces 2015-03-09 08:25:37 +08:00
Juan Leyva
8a5346a7f1 MDL-49242 webservices: Units tests for core_course_get_contents 2015-03-06 11:32:12 +01:00
Juan Leyva
08b66e8616 MDL-49242 webservices: Add filter options in core_course_get_contents 2015-03-06 11:32:12 +01:00
Andrew Nicols
2fafa90bdd MDL-48918 course: Fix keyboard drag/drop after dropped resource 2015-03-06 12:37:28 +08:00