Commit graph

75230 commits

Author SHA1 Message Date
David Monllao
8f76bfb628 MDL-50766 grunt: Check that there are yui modules before running shifter 2015-09-11 15:11:48 +08:00
Jetha Chan
ec887caa4a MDL-50685 core_form: disable hidden options, don't just hide 2015-09-11 15:08:37 +08:00
Marina Glancy
278b8d18a2 MDL-50892 mod: allow activity to have name '0' 2015-09-11 10:51:52 +08:00
Jun Pataleta
e950bca42d MDL-50983 templates: Create core template "columns-autoflow-1to1to1" 2015-09-11 10:32:02 +08:00
Jun Pataleta
2947d0397a MDL-50982 templates: Create core template "columns-1to1to1" 2015-09-11 10:19:00 +08:00
Jun Pataleta
631cc14020 MDL-50981 templates: Create core template "columns-1to2" 2015-09-11 10:08:41 +08:00
Jun Pataleta
a317a83b5c MDL-50980 templates: Create core template "columns-2to1" 2015-09-11 10:03:38 +08:00
Eloy Lafuente (stronk7)
f495510548 weekly release 3.0dev 2015-09-10 11:09:52 +02:00
Eloy Lafuente (stronk7)
501d9ae74b Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-09-10 11:09:46 +02: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
Rajesh Taneja
d8ada0f19b MDL-51101 behat: Removed old behat steps checking feature
This was introduced when there were no features
testing all the steps. Now we have all use-cases
so removing this feature file
2015-09-10 14:43:59 +08:00
rajesh Taneja
cd3a6a78b6 MDL-50516 behat: Back/next button reloads page
When next/back button is pressed in phantomjs/browserkit
it reload page, so adding a bug_phantomjs, so that we can
test the lesson re-attempt scenario
2015-09-10 14:30:28 +08:00
Damyon Wiese
08bda175de MDL-51213 weblib: Allow filter=false option for format_string
And pass this from external_format_string correctly.
2015-09-10 12:55:52 +08:00
Damyon Wiese
3676873566 MDL-51213 webservice: Fix wrong use of external_format_text
Was passing cm->id instead of context->id.
2015-09-10 12:13:02 +08:00
Eloy Lafuente (stronk7)
e36d7d57ae Merge branch 'MDL-50015-master' of git://github.com/jleyva/moodle 2015-09-10 01:42:06 +02:00
Eloy Lafuente (stronk7)
7650a4c54d Merge branch 'MDL-50537-master' of git://github.com/jleyva/moodle 2015-09-10 01:01:32 +02:00
Tim Hunt
53eee12a7a MDL-51147 qtype_match: stats should cope even if Q edited badly
The numbers become pretty meaningless, but we need to avoid fatal
errors.
2015-09-09 16:48:27 +01:00
Dan Poltawski
5760a1b083 Merge branch 'MDL-50944-master' of git://github.com/jleyva/moodle 2015-09-09 14:29:53 +01:00
Juan Leyva
1df5d7191c MDL-50537 mod_chat: Use the utility class and several fixes 2015-09-09 14:08:02 +02:00
Costantino Cito
9f7de6317d MDL-50537 mod_chat: New WS mod_chat_get_chats_by_courses 2015-09-09 14:08:01 +02:00
Juan Leyva
82f0f5e32c MDL-50537 core_webservice: New external functions utility class 2015-09-09 14:08:01 +02:00
Juan Leyva
43ff833def MDL-50995 mod_forum: Fix WS to not rely in the DB ordering defaults 2015-09-09 12:59:53 +02:00
Andrew Nicols
d3d8f81caa MDL-50995 mod_forum: Coding style fixes 2015-09-09 16:16:43 +08:00
Andrew Nicols
edf84ada39 Merge branch 'MDL-50995-master' of git://github.com/jleyva/moodle 2015-09-09 16:03:05 +08:00
Andrew Nicols
f6c3a22946 Merge branch 'MDL-50852-master' of git://github.com/junpataleta/moodle 2015-09-09 15:38:00 +08:00
Jun Pataleta
36e0030ffe MDL-50852 formslib: Fixed client-side form validation problem.
This patch fixes the problem of client validation being broken when
shortforms is not enabled. This issue is caused by moodle-core-event
module not being loaded and the broadcast parameter in the
Y.Global.publish set to 2 instead of true.
2015-09-09 15:35:01 +08:00
Mark Nelson
ab2d8946cd MDL-50516 mod_lesson: changes to existing behat tests 2015-09-09 15:27:24 +08:00
Mark Nelson
ecaff8f042 MDL-50516 mod_lesson: added behat tests 2015-09-09 15:27:23 +08:00
Mark Nelson
051b45f864 MDL-50516 core_behat: added ability to go back, forward and reload the browser 2015-09-09 15:27:23 +08:00
Mark Nelson
139645d4a7 MDL-50516 mod_lesson: fixed issue with grade not using minquestions
It's possible to reach the end of the lesson, get your result,
click back until you get to the last question, answer it correctly
and then be awarded a result of 100%. This was because the grade
calculation would only include the questions answered, rather than
all of them in the lesson. However, you can not fix this by always
grading by the amount of questions in the lesson as some lessons
bypass certain questions depending on the answer to previous ones.
The minquestion setting can now successfully be used to prevent this
behaviour by rewording the misleading string and adding logic.
2015-09-09 15:27:23 +08:00
Mark Nelson
d60350ddac MDL-50516 mod_lesson: prevented deletion of previous attempts
The 'startlastseen' flag was removing any previous attempts
the user had from the DB. This meant that the user could
simply re-answer the question, regardless of the number
of attempts allowed.
2015-09-09 15:27:23 +08:00
Mark Nelson
0dea8ed76a MDL-50516 mod_lesson: prevented user from repeating question
It was possible in the lesson module for a user to
answer a question, get the result, then click back
in the browser and re-answer it, even if they exceeded
the number of attempts allowed per question.
2015-09-09 15:27:23 +08:00
Eloy Lafuente (stronk7)
b8b323d6a9 Merge branch 'wip-mdl-51322' of https://github.com/rajeshtaneja/moodle 2015-09-09 08:21:45 +02:00
Eloy Lafuente (stronk7)
5c6c4a986a Merge branch 'wip-MDL-51357-master' of git://github.com/marinaglancy/moodle 2015-09-09 08:00:46 +02:00
Marina Glancy
2ff1f05183 MDL-51357 roles: fix table layout after MDL-38763 2015-09-09 13:07:11 +08:00
Ankit Agarwal
731c2712e7 MDL-50173 ratings: Use proper checks to ensure ratings are viewable.
Mainly to verify groups visibility this new callback has been created.

Note this was originally 3 commits but for amending purposes they have
been squashed.
2015-09-09 04:07:21 +02:00
Stephen Bourget
0a3c1f79ca MDL-48881 Lesson: Show all attempts on reports. 2015-09-08 21:09:09 -04:00
Andrew Nicols
050bfb3302 Merge branch 'wip-MDL-34938-master' of git://github.com/marinaglancy/moodle 2015-09-09 09:00:27 +08:00
Dan Poltawski
760e38d0f4 Merge branch 'MDL-50013-master' of git://github.com/jleyva/moodle 2015-09-08 15:21:27 +01:00
Dan Poltawski
e90783958c Merge branch 'MDL-50853-master' of git://github.com/jleyva/moodle 2015-09-08 13:37:35 +01:00
Dan Poltawski
7e0488ea54 Merge branch 'MDL-51194' of git://github.com/lazydaisy/moodle 2015-09-08 13:27:37 +01:00
Dan Poltawski
33001202d6 MDL-51132 course: add tag require 2015-09-08 13:22:54 +01:00
John Okely
fa5a3cdedc MDL-50709 groups: Prevent XSS in grouping description 2015-09-08 12:47:54 +02:00
Dan Poltawski
9e66dff06c Merge branch 'wip-MDL-51132-master' of https://github.com/marinaglancy/moodle 2015-09-08 10:46:38 +01:00
Dan Poltawski
0c05ec3b96 Merge branch 'wip-MDL-50323-master' of git://github.com/abgreeve/moodle 2015-09-08 09:14:14 +01:00
Dan Poltawski
07cc2db61b Merge branch 'MDL-51307-master' of git://github.com/cameron1729/moodle 2015-09-08 09:11:57 +01:00
Andrew Nicols
e5728db829 Merge branch 'MDL-51281-master' of git://github.com/jleyva/moodle 2015-09-08 14:07:27 +08:00
Andrew Nicols
1147c5a3d4 Merge branch 'MDL-51325-master' of git://github.com/jleyva/moodle 2015-09-08 12:51:30 +08:00
Cameron Ball
e683771623 MDL-51307 navigation: hide message button 2015-09-08 12:10:07 +08:00
Marina Glancy
5723dcdd85 MDL-34938 enrol_meta: sync enrolment start/end dates 2015-09-08 10:28:54 +08:00