mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 09:30:17 +01:00
Code Issues Projects Releases Wiki Activity
71,006 Commits 36 Branches 527 Tags
Commit Graph

16136 Commits

Author SHA1 Message Date
Andrew Nicols
2b0a7419c6 MDL-47390 mod_forum: Provide ID and Discussion ID for discussion unsub 2014-11-06 16:50:36 +08:00
Damyon Wiese
ce1b8779df Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle 2014-11-06 11:30:42 +08:00
Andrew Nicols
4ee412613b MDL-48061 mod_forum: posttext should concat 2014-11-06 11:29:25 +08:00
Damyon Wiese
b0637c57ad Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle 2014-11-06 11:22:42 +08:00
Andrew Nicols
a41cff4e23 MDL-48061 mod_forum: Correct variable name in HTML warning message 2014-11-06 11:05:44 +08:00
Andrew Nicols
ddb4a31d54 MDL-48029 mod_forum: Check for subscription before enrolling 2014-11-06 10:42:09 +08:00
Eloy Lafuente (stronk7)
ec070d2cf7 Merge branch '48026-28' of git://github.com/samhemelryk/moodle 2014-11-06 00:33:46 +01:00
Sam Hemelryk
12a312ac6a Merge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle 2014-11-06 11:55:46 +13:00
Eloy Lafuente (stronk7)
97100bea54 Merge branch 'MDL-48054-master' of git://github.com/andrewnicols/moodle 2014-11-05 21:34:37 +01:00
Dan Poltawski
5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle 
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
 2014-11-05 12:11:16 +00:00
Andrew Nicols
7a311adbba MDL-48019 mod_forum: Add sesskey checks when setting tracking prefs 
This also removes set_url() and changes require_course_login to
require_login as guests cannot set tracking.
 2014-11-05 10:35:12 +00:00
Damyon Wiese
a75cc21442 Merge branch 'MDL-48061-master' of git://github.com/andrewnicols/moodle 2014-11-05 16:54:32 +08:00
Damyon Wiese
ec57e8b3f4 Merge branch 'MDL-46500_master' of https://github.com/dmonllao/moodle 2014-11-05 16:52:07 +08:00
Marina Glancy
93a4f8b5fc Merge branch 'MDL-47390-master' of git://github.com/andrewnicols/moodle 2014-11-05 16:35:05 +08:00
Andrew Nicols
7122e1543a MDL-48054 mod_forum: Fix unit test failures 
These sporadic unit test failures were happening because the post time and
subscription time sometimes differ depending on the amount of time it takes
to complete the different components of the test.

To reliably address these issues, the post creation, and the discussion
subscription times are manually updated by different factors to ensure a
more realistic state of affairs.
 2014-11-05 14:49:02 +08:00
Damyon Wiese
225fa27fc2 MDL-47793 assign: trivial fix for inconsistent use of get_instance() 2014-11-05 14:27:58 +08:00
Damyon Wiese
43db479d51 Merge branch 'MDL-47793-m' of https://github.com/micaherne/moodle 2014-11-05 14:25:22 +08:00
Damyon Wiese
686150130e Merge branch 'MDL-47930-master' of git://github.com/andrewnicols/moodle 2014-11-05 14:18:07 +08:00
Damyon Wiese
c5d4633fed Merge branch 'MDL-47902_scorm_inappropriate_default_values' of https://github.com/MorrisR2/moodle 2014-11-05 14:05:32 +08:00
Damyon Wiese
8a9fd2d4cf MDL-27930 lesson: Remove custom styling from timer 2014-11-05 13:58:38 +08:00
Damyon Wiese
c86477aa88 Merge branch 'MDL-27930' of git://github.com/jmvedrine/moodle 2014-11-05 13:34:07 +08:00
Andrew Nicols
6a5b087163 MDL-48061 mod_forum: Tidy up reply-by-email information in emails 
* Add a reminder to remove the original message; and
* Remove the reply-to address from the text.
 2014-11-05 11:20:59 +08:00
Eloy Lafuente (stronk7)
8d3c518bd5 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-05 01:16:05 +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)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
Jean-Michel Vedrine
50d70c5caf MDL-27930 Lesson: the count-down timer does not work 2014-11-04 15:12:42 +01:00
Andrew Nicols
1008dd8ef0 MDL-47390 mod_forum: Correct check for groups when subscribing 2014-11-04 16:35:47 +08:00
Andrew Nicols
da30d04408 MDL-47390 mod_forum: Add discussion unsub to email footer 2014-11-04 16:35:47 +08:00
Andrew Nicols
548453ecde MDL-48044 mod_forum: Preload icons for discussion subscription toggles 2014-11-04 16:09:19 +08:00
Andrew Nicols
a35ce611cf MDL-47944 mod_forum: Improve discussion subscription icon/link 
* make the link text clickable
* changes the link text when unsubscribed to the action text "Subscribe"
 2014-11-04 15:46:05 +08: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
8a375d27f2 MDL-48026 mod_quiz: convert menu nowrap from CSS to method 2014-11-03 13:35:29 +13: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