Dan Poltawski
df44776afd
Merge branch 'MDL-50536-master' of git://github.com/jleyva/moodle
2015-09-22 12:55:46 +01:00
Dan Poltawski
79eb3afa9b
Merge branch 'MDL-50132-master' of git://github.com/jleyva/moodle
2015-09-22 12:46:39 +01:00
Dan Poltawski
abd3fdc977
Merge branch 'wip-MDL-51108-master' of git://github.com/abgreeve/moodle
2015-09-22 11:48:49 +01:00
Dan Poltawski
0730ddc2ad
Merge branch 'MDL-50664-master' of git://github.com/ryanwyllie/moodle
2015-09-22 10:39:33 +01:00
Andrew Nicols
a32cd742c3
Merge branch 'MDL-51413-master' of git://github.com/jleyva/moodle
2015-09-22 12:22:55 +08:00
Dan Poltawski
c331e8f9c0
Merge branch 'MDL-48165-master-dimgrades' of git://github.com/mudrd8mz/moodle
2015-09-21 10:14:47 +01:00
Juan Leyva
580a14c265
MDL-50536 mod_book: New WS mod_book_get_books_by_courses
2015-09-21 09:30:06 +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
Juan Leyva
ea5b910b3a
MDL-51413 forum: Return additional field in get_forums_by_courses WS
2015-09-18 17:27:14 +02:00
Adrian Greeve
453adb1adf
MDL-51108 mod_data: Addition to behat test for Lat. and Long.
2015-09-18 07:33:12 +08:00
Adrian Greeve
d25043270c
MDL-51108 mod_data: Add validation for Lat. and Long.
...
Added a check to see that both the Lat. and Long. values
are entered when filling in database module entries.
2015-09-18 07:33:12 +08:00
Ryan Wyllie
ec9e1bec57
MDL-50664 mod_data: tests for 'manageapproved' setting.
...
Adding test coverage for the 'manageapproved' setting that
was added by Johannes Burk.
2015-09-17 06:18:26 +00:00
Juan Leyva
35219d8bb9
MDL-50557 scorm: Add attempt field in mod_scorm_get_scorm_sco_tracks
2015-09-16 23:18:40 +02:00
Juan Leyva
6b5e69ebe6
MDL-50557 mod_scorm: New WS mod_scorm_get_scorm_sco_tracks
2015-09-16 23:18:39 +02:00
Juan Leyva
f26274a45c
MDL-50353 mod_scorm: Fix problem with ids ordering in tests
2015-09-16 23:14:11 +02:00
Juan Leyva
6b4ceb24cf
MDL-50353 scorm: New Web Service mod_scorm_insert_scorm_tracks
2015-09-16 22:07:34 +02:00
Juan Leyva
822e9df70d
MDL-50352 scorm: New Web Service mod_scorm_get_scorm_user_data
2015-09-16 19:25:19 +02:00
Juan Leyva
dfe927c8d6
MDL-50351 scorm: New Web Service mod_scorm_get_scorm_scoes
2015-09-16 19:25:17 +02:00
David Monllao
974053b93f
MDL-48881 mod_lesson: A couple of performance improvements
...
- Improve memory usage on db drivers not able to use recordsets
properly
- !array_key_exists replaced by empty calls
2015-09-16 13:32:49 +08:00
David Monllao
48cec36dfb
Merge branch 'MDL-48881_m30v5' of git://github.com/sbourget/moodle
2015-09-16 13:20:52 +08:00
Johannes Burk
97fe80ad68
MDL-50664 mod_data: add 'manageapproved' setting.
...
New function data_user_can_manage_entry checks whether a user is allowed to manage an entry.
Considering manageentries capability, data_in_readonly_period() result,
ownership (determined by data_isowner()), approval and manageapproved setting.
2015-09-15 07:16:40 +00:00
David Monllao
9ff2a265d0
Merge branch 'm30_MDL-51363_Fix_Default_Settings_1x_Restore' of git://github.com/scara/moodle
...
Conflicts:
mod/scorm/version.php
2015-09-15 09:58:08 +08:00
Andrew Nicols
5a191b2f44
Merge branch 'MDL-51017-master' of git://github.com/jleyva/moodle
2015-09-15 08:23:10 +08:00
Matteo Scaramuccia
32c114ca04
MDL-51363 SCORM: fixed default settings on restoring 1.x backups
2015-09-14 23:48:25 +02:00
Juan Leyva
22de67f4af
MDL-51017 mod_scorm: New WS mod_scorm_get_scorm_attempt_count
2015-09-14 10:55:52 +02:00
David Monllao
742548e251
Merge branch 'wip-mdl-51101' of git://github.com/rajeshtaneja/moodle
2015-09-14 16:18:01 +08:00
Andrew Nicols
7267daa8d0
MDL-50994 mod_forum: Correct docs for discussion WS
2015-09-14 15:43:26 +08:00
Andrew Nicols
08a4dbfe10
Merge branch 'MDL-50994-master' of git://github.com/jleyva/moodle
2015-09-14 15:40:05 +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
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
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
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
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
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
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
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
