Commit graph

799 commits

Author SHA1 Message Date
Dan Poltawski
98e01bb70e Merge branch 'MDL-45740_master' of git://github.com/markn86/moodle 2016-02-01 11:02:22 +00:00
Mark Nelson
da82688689 MDL-45740 mod_choice: fixed remaining issues 2016-02-01 18:49:22 +08:00
Stephen Bourget
e62f6a01e4 MDL-45740 choice: add new events 2016-01-29 13:23:15 +08:00
Stephen Bourget
551c6b1cb4 MDL-48953 choice: Improve chart labels 2016-01-14 14:01:34 -05:00
Dan Poltawski
50901a53bc Merge branch 'MDL-51664-master' of git://github.com/FMCorz/moodle 2015-12-03 11:16:30 +01:00
Eloy Lafuente (stronk7)
6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
Eloy Lafuente (stronk7)
2e144835bb MDL-52059 versions: bump all versions and requires near release
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
2015-11-10 12:33:52 +01:00
Dan Poltawski
265ddbf30c MDL-51569 mod_choice: Fix use of hardcoded ids
(Previous approach of making up ids longer works now we are validating
them..)
2015-11-06 08:09:47 +00:00
John Okely
531bcb13f6 MDL-51569 mod_choice: Prevent users from updating choices with curl
And fix unit tests.
2015-11-06 14:52:26 +08:00
Damyon Wiese
0bca129775 MDL-51569 mod_choice: Validate the submitted optionid
Make sure any submitted choice options actually belong to the current choice
module.
2015-11-05 10:48:40 +00:00
Juan Leyva
3dd0ac559f MDL-51569 mod_choice: Check choice availability prior to do any action 2015-11-04 11:08:32 +00:00
Andrew Nicols
a308dc15c9 Merge branch 'MDL-51594-master' of git://github.com/jleyva/moodle 2015-10-15 14:19:10 +08:00
Juan Leyva
bb3500c6d4 MDL-51594 webservice: Fix typos in choice and SCORM documentation 2015-10-14 14:29:12 +02:00
Frederic Massart
583b02e405 MDL-51664 external: Update usage of external_util::validate_courses 2015-10-12 12:01:15 +08:00
Mark Nelson
607021c14b MDL-46455 events: added more mapping
Also fixed a few bugs.
2015-10-11 18:52:36 -07:00
Mark Nelson
0bfafc5ba0 MDL-46455 mod_*: added restore mapping to events 2015-10-11 18:14:57 -07:00
Eloy Lafuente (stronk7)
11e2efe941 Merge branch 'MDL-51566-master' of git://github.com/jleyva/moodle 2015-10-08 00:24:06 +02:00
Juan Leyva
4b93c3e342 MDL-51566 mod_choice: New WS mod_choice_delete_choice_responses 2015-10-07 13:58:51 +02:00
Eloy Lafuente (stronk7)
cb171682ff Merge branch 'MDL-49823-master' of git://github.com/jleyva/moodle 2015-10-07 01:08:52 +02:00
Dan Poltawski
f5e68c2892 Merge branch 'MDL-51564-master' of git://github.com/jleyva/moodle 2015-10-06 16:32:55 +01:00
David Monllao
889a9fbba1 MDL-49811 mod_choice: Removing skipresultgraph link
The target of the link is not available after MDL-30816.
2015-10-06 16:26:54 +01:00
Juan Leyva
9748791ba8 MDL-51564 webservice: Review the use of external format_string 2015-10-06 14:00:45 +02:00
jinhofer
0b7856efbe MDL-49811 lib: Added js to skiplinks
I have added a JS module to handle skiplinks to send
the focus to the end of the block. This improves the function
and allows the user to better tab through the page.
2015-10-05 06:17:58 -05:00
Juan Leyva
d85bedf796 MDL-49823 webservice: Support gravatar profile images 2015-10-01 09:36:31 +02:00
Juan Leyva
f07a2bb09b MDL-50132 mod_choice: New WS mod_choice_get_choices_by_courses 2015-09-21 09:27:42 +02:00
David Monllao
742548e251 Merge branch 'wip-mdl-51101' of git://github.com/rajeshtaneja/moodle 2015-09-14 16:18:01 +08:00
Rajesh Taneja
1a5a476b03 MDL-51101 behat: Fixed wrong hover step usage
Hover step was being mis-used for checking activity completion
This is replaced with proper step which check for img element
2015-09-10 14:46:12 +08:00
Juan Leyva
dffb87edf6 MDL-50944 mod_choice: Unit tests for external functions 2015-09-02 11:29:38 +02:00
Juan Leyva
4c4d3b7303 MDL-50944 mod_choice: New Web Service mod_choice_view_choice 2015-09-02 10:35:37 +02:00
Juan Leyva
1006459415 MDL-50944 mod_choice: New Web Service mod_choice_submit_choice_response 2015-09-02 10:35:36 +02:00
Juan Leyva
565528cebc MDL-50944 mod_choice: New Web Service mod_choice_get_choice_options 2015-09-02 10:35:36 +02:00
Juan Leyva
b87f31db53 MDL-50944 mod_choice: New Web Service mod_choice_get_choice_results 2015-09-02 10:35:35 +02:00
Helen Foster
ce2c0f3a74 MDL-51148 lang: Merge English strings from the en_fix language pack 2015-08-26 16:46:43 +02:00
Simey Lameze
dcee0b9447 MDL-49360 core_lib: add new method get_local_referer()
This commit also replace all usages of $_SERVER['HTTP_REFERER'] and get_referer().
2015-07-27 11:11:24 +08:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Dan Poltawski
57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01: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 6601690202.

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
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
Dan Poltawski
75e20c1845 Merge branch 'wip-MDL-18309-master' of git://github.com/marinaglancy/moodle 2015-04-15 09:54:36 +01: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
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
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
Tony Butler
74cc07bedf MDL-43770 mod_choice: Add behat scenarios for 'include inactive' option 2015-03-20 09:55:16 +00:00
Tony Butler
799770cbd7 MDL-43770 mod_choice: Add option to include inactive users' responses 2015-03-20 09:55:16 +00:00
Tony Butler
6de3eee04c MDL-43770 mod_choice: Exclude responses from inactive users 2015-03-20 09:55:16 +00:00
Rajesh Taneja
d7fec593f3 MDL-49402 behat: Fixed feature file with same scenario name
1. We should not have same scanrio name in 1 feature file
   As it doesn't explain what is being tested. So modified.
2. Removed empty line, to keep it consistnet with other features
2015-03-06 11:47:17 +08:00