mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 15:10:05 +01:00
Code Issues Projects Releases Wiki Activity
69,726 Commits 36 Branches 527 Tags
Commit Graph

15868 Commits

Author SHA1 Message Date
Dan Poltawski
ffd24d9a61 Merge branch 'wip-MDL-47187-master' of git://github.com/marinaglancy/moodle 2014-09-15 11:08:24 +01:00
Damyon Wiese
db074792b9 Merge branch 'MDL-46944-master-lti-iframe' of git://github.com/schmod/moodle 2014-09-15 15:08:31 +08:00
Andrew Schmadel
a73b1ba23f MDL-46844 Embed LTI External Tools with an IFrame 
Clears up weird browser issues that occur when embedding content with an
`<object>` tag.
 2014-09-10 09:17:07 -04:00
Marina Glancy
5b460d65cc MDL-47187 assign: fixed timing unittest failure 2014-09-10 11:58:00 +08:00
Andrew Nicols
83daad5ac9 MDL-47107 mod_forum: is_subscribed $cm input does not need to be a cm_info 2014-09-10 10:00:00 +08:00
Eloy Lafuente (stronk7)
a02aef0c7c Merge branch 'MDL-47107-master' of git://github.com/andrewnicols/moodle 2014-09-09 02:15:26 +02:00
Marina Glancy
7fde166775 Merge branch 'MDL-44304-master' of git://github.com/damyon/moodle 2014-09-08 12:57:34 +08:00
Andrew Nicols
4238983e2a MDL-47107 mod_forum Optimise forum subscription checks 
Supply a coursemodule where relevant to the forum subscription checks.
 2014-09-05 15:06:15 +08:00
Marina Glancy
1f20801c35 Merge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle 2014-09-03 16:58:25 +08:00
Dan Marsden
46e990a4ef MDL-46639 SCORM: incorrect setting of launch param, it is done in scorm_parse_aicc 2014-09-03 20:18:55 +12:00
Eloy Lafuente (stronk7)
9bdb64681f Merge branch 'MDL-39929' of https://github.com/bostelm/moodle 2014-09-03 00:13:53 +02:00
sam marshall
78f753acea MDL-44725 Availability: Replace groupmembersonly - feedback (16) 
There is one point where it restricted the list of users. I have
fixed this and also altered the (only) script that calls that function
so that it obtains a cm_info $cm rather than the old sort.

There were previously no Behat tests at all in this module. In order
to be confident that I didn't break it, I have implemented a Behat
test (which should also be useful in general as it does go through
other pages on the way to get to the relevant one).
 2014-09-02 20:54:35 +08:00
Marina Glancy
ed2ecd3e35 MDL-44725 workshop: correct module generation in unittests (15) 2014-09-02 13:03:37 +01:00
sam marshall
45ab2d9ab6 MDL-44725 Availability: Replace groupmembersonly - workshop (12) 
The availability restrictions that apply to user lists (group, grouping)
now apply in workshop:

* In user lists.
* When randomly allocating users (also now works as expected if you use
  group mode and a grouping with the activity).
 2014-09-02 13:03:31 +01:00
sam marshall
c13ac85db8 MDL-44725 Availability: Replace groupmembersonly - assign (10) 
Updated code to restrict list of users. Also includes changes to
ensure that a cm_info object is available (required for availability
checks).

There is a tweak to upgradelib to reflect the different fields used.
(Note that upgradelib is not used during upgrade, but only when
converting assignments from the old assignment module.)
 2014-09-02 13:03:27 +01:00
sam marshall
c234c34085 MDL-44725 Availability: Replace groupmembersonly - quiz overrides (9) 
This only affects the quiz overrides form, as groupmembersonly was
not used elsewhere. The change simply restricts the list of users
shown when selecting somebody for overrides.

Some additional code is needed to (efficiently) load the $cm object
as a cm_info so that the availability API can be used on it.
 2014-09-02 13:03:23 +01:00
sam marshall
914027baf8 MDL-44725 Availability: Replace groupmembersonly - glossary (8) 
No change to actual module, only unit tests.
 2014-09-02 13:03:21 +01:00
sam marshall
9c85baa8c5 MDL-44725 Availability: Replace groupmembersonly - FEATURE_xx (6) 
Remove old FEATURE_GROUPMEMBERSONLY as no longer required.
 2014-09-02 13:03:17 +01:00
sam marshall
061e6b2864 MDL-44725 Availability: Replace groupmembersonly - upgrade, core (1) 
* Upgrades existing data so that the groupmembersonly option is
  replaced with equivalent data for the new availability API.
* Removes the database field and admin setting used for
  groupmembersonly.
* Changes core modinfo library to remove/deprecate groupmembersonly
  data and functions.
* Changes other core library files to remove groupmembersonly
  references.

Includes deprecation of several functions, listed in lib/upgrade.txt.
 2014-09-02 13:03:07 +01:00
Henning Bostelmann
7faf78cbae MDL-39929 Assignment: provide file upload area for assignment description 2014-09-02 11:02:16 +01:00
Michael de Raadt
8f2e80600b MDL-46619 Forum: link to the discussion only if users cannot see posts. 2014-09-02 10:06:35 +08:00
Michael de Raadt
b53b69c134 MDL-46619 Forum: only output last poster's name if user can view it. 2014-09-02 10:06:23 +08:00
Marina Glancy
d0143e0061 Merge branch 'MDL-45952_master2' of git://github.com/Syxton/moodle 2014-09-02 09:58:24 +08:00
Eloy Lafuente (stronk7)
f9f715de75 Merge branch 'MDL-46633' of https://github.com/shashirepo/moodle 2014-09-02 02:12:14 +02:00
Damyon Wiese
2dbbc58dad Merge branch 'MDL-46852-master' of git://github.com/FMCorz/moodle 2014-09-01 16:16:08 +08:00
Marina Glancy
7dc74ce75f Merge branch 'MDL-46451_restoreError' of git://github.com/moodlerooms/moodle 2014-09-01 16:05:51 +08:00
Damyon Wiese
c8336b9733 Merge branch 'MDL-46911' of https://github.com/bostelm/moodle 2014-09-01 15:42:01 +08:00
Damyon Wiese
e0e23395dd Merge branch 'master_MDL-46961' of https://github.com/danmarsden/moodle 2014-09-01 15:27:41 +08:00
Marina Glancy
181435d483 Merge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle 2014-09-01 14:36:09 +08:00
Marina Glancy
c1780a3d0b Merge branch 'MDL-46539-fix-28' of https://github.com/jmarthaler/moodle 2014-09-01 14:36:04 +08:00
Frederic Massart
5fbebc3c18 MDL-46852 mod_lesson: More accurate comparison of shortanswer answers 2014-09-01 14:24:23 +08:00
Damyon Wiese
e698e24f1a Merge branch 'wip-MDL-39233-master' of git://github.com/marinaglancy/moodle 2014-09-01 13:35:50 +08:00
Damyon Wiese
37728346fb MDL-46619 Forum: whitespace fixes 2014-09-01 11:34:41 +08:00
Damyon Wiese
89a1fbe5ff Merge branch 'MDL-46619-visisble-authors-qanda' of https://github.com/amandadoughty/moodle 2014-09-01 11:00:07 +08:00
Dan Marsden
7383195cc7 MDL-46737 SCORM: correct dml syntax. 2014-09-01 10:54:59 +08:00
Syxton
829d4e3d41 MDL-45952 feedback: non-respondents in groupings 
Fixes feedback non-respondents list to show only members in groups in
the selected grouping if "Available for group members only" is selected.
 2014-08-28 15:37:38 -04:00
shashirepo
b12c3878a7 MDL-46633 chat: Chat send button gets stuck 2014-08-28 14:45:59 +05:30
Jon Marthaler
abd0f0aec6 MDL-46539 assign calendar: Fix lastcron value for assign cron 2014-08-27 11:17:28 -05:00
Faisal Kaleem
ae72469da9 MDL-46961 SCORM: JavaScript Hoisting issue. 2014-08-27 13:06:36 +12:00
Mark Nielsen
fe465d1d5b MDL-46451 mod_lti: Fix restoring old float grades 
LTI's activity table used to have a float
field for the grade.  Now it is an integer
so we must restore the grade as an integer
so it matches the table schema.
 2014-08-26 09:10:34 -07:00
Henning Bostelmann
f09040d76a MDL-46911 Database activity: jump to correct place in list after (un)approve 2014-08-26 10:15:15 +01:00
Jason
1b126c0835 MDL-39233 mod_url: fix php notice 2014-08-26 13:47:46 +08:00
Damyon Wiese
ab38cb2833 MDL-46842 assign: Fix for unit tests - previous patch was completely ignoring manually reopening attempts. 2014-08-26 10:30:14 +08:00
Eloy Lafuente (stronk7)
7beb1d8ea3 Merge branch 'MDL-46477' of https://github.com/shashirepo/moodle 2014-08-26 02:23:56 +02:00
Eloy Lafuente (stronk7)
863c536219 Merge branch 'master_MDL-46842' of https://github.com/greg-or/moodle-mod_assign 2014-08-26 01:58:08 +02:00
Eloy Lafuente (stronk7)
af0646139c Merge branch 'MDL-46868' of git://github.com/timhunt/moodle 2014-08-26 01:40:00 +02:00
Eloy Lafuente (stronk7)
40f1dff05f Merge branch 'master_MDL-46816' of https://github.com/danmarsden/moodle 2014-08-26 00:09:51 +02:00
Marina Glancy
e55cecf05f Merge branch 'MDL46887_assignment_file_max_size' of git://github.com/Dave-B/moodle 2014-08-25 16:28:49 +08:00
Dan Marsden
d92c406a51 MDL-46639 mod_scorm: Fix load of simple AICC content 
Thanks to Ian Wild for the report and suggested patch.
 2014-08-25 19:59:44 +12:00
Damyon Wiese
b04dbae3fe Merge branch 'wip-MDL-46703-master' of git://github.com/marinaglancy/moodle 2014-08-25 13:49:05 +08:00