mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 01:50:55 +01:00
Code Issues Projects Releases Wiki Activity
70,918 Commits 36 Branches 527 Tags
Commit Graph

16101 Commits

Author SHA1 Message Date
David Mudrák
f7dd19f01d MDL-48035 Fix more Behat tests regressions after merging en_fix strings 2014-11-06 16:19:11 +01:00
David Mudrák
6887e2e53e MDL-48035 Fix Behat tests regressions after merging en_fix strings 2014-11-06 10:54:27 +01:00
Helen Foster
ba033b861e MDL-48035 Merge English strings from the en_fix language pack 2014-11-04 21:55:26 +01:00
Eloy Lafuente (stronk7)
ddb5bc5fcd Merge branch '47969-28' of git://github.com/samhemelryk/moodle 2014-11-04 01:56:59 +01:00
Eloy Lafuente (stronk7)
882f915922 Merge branch '47968-28' of git://github.com/samhemelryk/moodle 2014-11-04 01:55:08 +01:00
Eloy Lafuente (stronk7)
bebd3ce8fc Merge branch 'MDL-47207_master' of git://github.com/dmonllao/moodle 2014-11-04 01:20:51 +01:00
Damyon Wiese
edc89dfecb MDL-47927 LTI: Use PARAM_TEXT and p() for returned messages and errors 2014-11-04 11:46:57 +13:00
David Monllao
babaf596e1 MDL-47924 mod_lti: Fixing missing sesskey checkings 
Also fixing a missing capability checking.
 2014-11-04 11:00:51 +13:00
Adrian Greeve
c4a6c65c1b MDL-47697 mod_data: Fix group id change when editing. 
When a teacher edits an entry in the database module
it would change the group ID to the one that the teacher
currently had selected.

Thanks to Steve Bond for providing a patch.
 2014-11-04 09:58:11 +13:00
Juan Leyva
40afeb4044 MDL-45303 Web Services: forum_discussions not checking groups 2014-11-03 21:55:03 +01:00
John Okely
c844af2569 MDL-47921 mod_lti: Add access control to mod/lti/launch.php 2014-11-04 09:09:26 +13:00
Dan Poltawski
1a27142afe Merge branch 'MDL-47903-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	mod/forum/version.php
    mod/forum/db/upgrade.php
 2014-11-03 12:28:33 +00:00
Andrew Nicols
a6d7a81271 MDL-48020 mod_forum: Add missing sesskey check in AJAX subscription 2014-11-03 11:02:41 +00:00
Marina Glancy
8bd6b270b2 Merge branch 'MDL-47987-master' of git://github.com/andrewnicols/moodle 2014-11-03 17:21:55 +08:00
Andreas Grabs
b7f75a9c05 MDL-47865 mod_feedback - XSS through $searchstring in mod/feedback/mapcourse.php 2014-11-03 14:56:10 +08:00
Damyon Wiese
c3a0452a5b MDL-47926 LTI: Fix missing sesskey checks and add content type headers to redirect 2014-11-03 14:43:54 +08:00
Sam Hemelryk
ac4ed127de MDL-47978 mod_quiz: more explicit selector for action menu change 2014-11-03 11:39:30 +13:00
Sam Hemelryk
968cc37437 Merge branch 'MDL-47978' of git://github.com/timhunt/moodle 2014-11-03 11:27:55 +13:00
Sam Hemelryk
70739e6e30 MDL-47969 mod_survey: fixed HTML5 validation of index.php 2014-11-03 08:55:12 +13:00
Sam Hemelryk
e014b6f2c4 MDL-47968 mod_forum: fixed search form HTML5 validation 2014-11-03 08:54:56 +13:00
Tim Hunt
262105faf9 MDL-47978 quiz editing: fix display of last add menu 2014-10-31 18:23:45 +00:00
Tim Hunt
58413f613e MDL-47963 quiz editing: fix failing unit tests 
The unit tests were initialising the structure class in a different way
from real use. That was clearly silly, so I got rid of create_for,
leaving just the real create_for_quiz.
 2014-10-31 17:22:38 +00:00
Dan Poltawski
b4eaafd744 Merge branch 'MDL-47963' of git://github.com/timhunt/moodle 2014-10-31 13:14:59 +00:00
Sam Hemelryk
1a14f8a6de MDL-47959 mod_quiz: fixed 0 questions bug 2014-10-31 13:35:25 +13:00
Andrew Nicols
4c34089889 MDL-47987 mod_forum: Users subscribe to discussions not forums 
Correct language string which describes users subscribing to a discussion,
and use it when subscribing on post.
 2014-10-31 07:51:48 +08:00
Sam Hemelryk
323ed3bbf0 Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle 2014-10-31 11:15:12 +13:00
pau.ferrer-ocana
5ea0d026b0 MDL-47875 choice: chat module strings not required from Choice anymore 
AMOS BEGIN
 CPY [chatintro,mod_chat],[description,mod_choice]
AMOS END
 2014-10-30 22:41:23 +01:00
Dan Poltawski
fca969b9bb Merge branch 'MDL-47972' of git://github.com/timhunt/moodle 2014-10-30 17:31:12 +00:00
Colin Chambers
77dca4d0a8 MDL-47972 mod_quiz: Fix new quiz on themes based on base. 2014-10-30 17:11:23 +00:00
Dan Poltawski
0a92904c47 MDL-47918 forum: Coding style fix 2014-10-30 16:46:46 +00:00
Tim Hunt
6870a6b8d0 MDL-47963 quiz editing: block ajax edits once there are attempts 2014-10-30 16:24:55 +00:00
Dan Poltawski
fb9604d67c Merge branch 'MDL-47918-master' of git://github.com/andrewnicols/moodle 2014-10-30 14:31:38 +00:00
Dan Poltawski
f976c8e468 Merge branch 'MDL-47959' of git://github.com/colchambers/moodle 2014-10-30 14:24:35 +00:00
Marina Glancy
08674d83c1 Merge branch 'MDL-25057-master' of git://github.com/andrewnicols/moodle 2014-10-30 17:14:09 +08:00
Marina Glancy
61138e352d Merge branch '47970-28' of git://github.com/samhemelryk/moodle 2014-10-30 16:15:38 +08:00
Marina Glancy
9e432c22cd Merge branch 'MDL-47909-master' of git://github.com/andrewnicols/moodle 2014-10-30 16:15:10 +08:00
Marina Glancy
2f28c71186 Merge branch 'MDL-29873' of git://github.com/jmvedrine/moodle 2014-10-30 14:17:32 +08:00
Andrew Nicols
02cf3958d2 MDL-47909 mod_forum: Respect user autosubscribe setting on post 
Re-appropriate the forum autosubscribe setting as a discussion
autosubscribe setting.

The setting was no longer used after the per-discussion changes. The
original plan had been to remove this setting, but there is some benefit to
respecting it for discussion subscriptions instead.
 2014-10-30 13:36:06 +08:00
Andrew Nicols
611a5ef714 MDL-25057 mod_forum: Stop duplicating forum_read posts from cron 
This also includes an upgrade script to delete the existing duplicates.
 2014-10-30 13:23:29 +08:00
David Monllao
b2b70eea49 MDL-47207 mod_forum: Unifying criteria 2014-10-30 12:50:17 +08:00
Andrew Nicols
a54702b234 MDL-47903 mod_forum: Correct test fails related to caching and time 
This adds a reset of the discussion and forum cache when running the mail
and maildigest tests.

These test fails were highlighted by the addition of new tests which
add similar post ids.
 2014-10-30 12:02:35 +08:00
Andrew Nicols
eb451c7981 MDL-47903 mod_forum: Add discussion subscription time 
This helps us to only send notifications for messages the user should have
already seen.
 2014-10-30 12:02:34 +08:00
Sam Hemelryk
0025296f19 MDL-47970 mod_scorm: fixed HTML5 validation error 2014-10-30 14:56:15 +13:00
Colin Chambers
6375e98cbb MDL-47959 Number of questions not updated dynamically in new quiz edit page 2014-10-29 16:26:49 +00:00
Dan Poltawski
5d5e545fc7 Merge branch 'MDL-47945-master' of git://github.com/jethac/moodle 2014-10-29 12:56:03 +00:00
Dan Poltawski
290bcd3476 MDL-47368 fix trailing whitespace 2014-10-29 11:20:29 +00:00
Dan Poltawski
0af29b0383 Merge branch 'MDL-47368' of git://github.com/timhunt/moodle 2014-10-29 11:18:15 +00:00
Marina Glancy
72dbe74e7e Merge branch 'MDL-47916-master' of git://github.com/jleyva/moodle 2014-10-29 16:15:07 +08:00
Damyon Wiese
520bcbb9ab Merge branch 'MDL-47946-master' of git://github.com/andrewnicols/moodle 2014-10-29 15:53:17 +08:00
Damyon Wiese
e562a1b25b Merge branch 'MDL-46219' of https://github.com/dkns/moodle 2014-10-29 15:37:47 +08:00