mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity
74,454 Commits 36 Branches 531 Tags
Commit Graph

74454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
08a4dbfe10 Merge branch 'MDL-50994-master' of git://github.com/jleyva/moodle 2015-09-14 15:40:05 +08:00
Andrew Nicols
2cf588d4dc Merge branch 'MDL-50980-master' of git://github.com/junpataleta/moodle 2015-09-14 15:07:31 +08:00
David Monllao
09fe55f4de Merge branch 'MDL-51170-master' of git://github.com/andrewnicols/moodle 2015-09-14 14:14:09 +08:00
Andrew Nicols
9608bed133 Merge branch 'MDL-50782-master' of git://github.com/damyon/moodle 2015-09-14 14:00:52 +08:00
David Monllao
10fea1efb1 Merge branch 'MDL-51191-master' of git://github.com/StudiUM/moodle 2015-09-14 13:58:55 +08:00
David Monllao
1cb33c66ef Merge branch 'MDL-51205_pix_style' of git://github.com/andyjdavis/moodle 2015-09-14 13:31:06 +08:00
David Monllao
8de4e68e0e Merge branch 'MDL-51296-master' of git://github.com/junpataleta/moodle 2015-09-14 13:16:52 +08:00
David Monllao
14face570f Merge branch 'MDL-51253_forum_urls' of git://github.com/BenKelada/moodle 2015-09-14 13:06:38 +08:00
Ben Kelada
3d8d8a8ca6 MDL-51253 forum: fix urls for exceptions and redirects 2015-09-14 14:18:50 +10:00
Jun Pataleta
0b3ed7f777 MDL-51296 blog: Added title that reflects the blog's editing mode 2015-09-14 10:52:09 +08:00
David Monllao
7426ea3dac Merge branch 'MDL-51217-master' of git://github.com/lucisgit/moodle 2015-09-14 10:04:08 +08:00
David Monllao
3f1bc32d22 Merge branch 'MDL-51232' of git://github.com/jinuabraham/moodle 2015-09-14 09:38:56 +08:00
Mark Nelson
53914e4465 MDL-51051 core_grades: 'Categories and items' => 'Gradebook setup' 2015-09-14 08:23:32 +08:00
Jean-Philippe Gaudreau
286d6c81bf MDL-51191 assign: Optimizing slow SQL query for MySQL 2015-09-11 11:10:03 -04:00
Juan Leyva
7ab43ac84a MDL-50994 mod_forum: New Web Service mod_forum_add_discussion 2015-09-11 13:31:36 +02: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
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
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
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
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