mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-28 11:32:42 +01:00
Code Issues Projects Releases Wiki Activity
71,677 Commits 36 Branches 527 Tags
Commit Graph

16283 Commits

Author SHA1 Message Date
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
David Monllao
57a69e7151 MDL-46500 mod_data: Removing duplicate filemanager initialisations 2014-10-30 16:10:15 +08:00
Marina Glancy
2f28c71186 Merge branch 'MDL-29873' of git://github.com/jmvedrine/moodle 2014-10-30 14:17:32 +08:00
Ben Kelada
848e04183f MDL-46500 filepicker: prevent error when element does not exist 2014-10-30 14:14:15 +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
Andrew Nicols
4e3af3cf42 MDL-47390 mod_forum: Add discussion unsub to email footer 2014-10-30 09:07:36 +08: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
Michael Aherne
48242bf33f MDL-47793 assign: Reset reveal identities 2014-10-29 11:18:06 +00:00
David Balch
f4de846143 MDL-36874 mod_book: Add text navigation. 
Based on a patch by Matthew Cannings, this replaces Book's previous/next arrow
image links with a choice of: no links, image links, or chapter title text links.
 2014-10-29 09:43:10 +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
Damyon Wiese
3c459b6300 Merge branch 'wip-MDL-47796-master' of git://github.com/abgreeve/moodle 2014-10-29 15:15:14 +08:00
Adrian Greeve
7e7715fb6b MDL-47796 mod_data: Fix display of group records. 
When viewing entries as a teacher in separate group
mode, changing the group would result in random
entries being shown.
 2014-10-29 13:52:29 +08:00
Jetha Chan
8744529ff6 MDL-47945 mod_forum: neighbour links at bottom of discussion 2014-10-29 13:46:46 +08:00
Damyon Wiese
cf13ece570 Merge branch 'MDL-47898-master' of git://github.com/andrewnicols/moodle 2014-10-29 13:36:17 +08:00
Damyon Wiese
d7c1945472 Merge branch 'wip-MDL-40343-master' of git://github.com/ds125v/moodle 
Conflicts:
	mod/forum/styles.css
 2014-10-29 12:53:21 +08:00
Andrew Nicols
8271c89a94 MDL-47946 mod_forum: Correct strings in behat features 
These are a regression from MDL-46215.
 2014-10-29 12:01:41 +08:00
Andrew Nicols
0d7cb0f805 MDL-47930 mod_forum: Display all forum statuses correctly 
It is possible for users with the mod/forum:managesubscriptions to
subscribe to forums with subscription disabled. This is handled by
forum_get_subscribe_link() already and should have been handled here all
along.
 2014-10-29 11:52:54 +08:00
Tim Hunt
e3d3e1e652 MDL-47368 quiz editing: fix icon url generation. 2014-10-28 18:45:17 +00:00
Dan Poltawski
ac3d43b6ec Merge branch 'MDL-47877-master' of git://github.com/andrewnicols/moodle 2014-10-28 12:25:27 +00:00
Colin Chambers
a69f81f0d3 MDL-47368 Edit quiz: page should not reload so often 
The approach is that we have a new JavaScript function
M.mod_quiz.resource_toolbox.reorganise_edit_page which, after a ajax
action, fixes up everything like page breaks, page and question numbers,
that might now be wrong.

We call that function instead of reloading the page.

Also, there are a lot more Behat tests to verify this works correctly.

AMOS BEGIN
 MOV [joinpages,mod_quiz],[removepagebreak,mod_quiz]
 MOV [splitpages,mod_quiz],[addpagebreak,mod_quiz]
AMOS END
 2014-10-28 11:32:42 +00:00
Andrew Nicols
7545e84661 MDL-47877 mod_forum: Correct subscription options for forums 
Test was the wrong way around when checking subscription state.
 2014-10-28 15:57:12 +08:00
Marina Glancy
45b7a397bb Merge branch 'MDL-46215-master-fixes' of git://github.com/andrewnicols/moodle 2014-10-28 15:37:05 +08:00
Andrew Nicols
79b4fb1282 MDL-46215 mod_forum: Only add text on discussion view 
Do not show the status text in the thread list.
 2014-10-28 14:27:05 +08:00
Andrew Nicols
1d8e8494bf MDL-47918 mod_forum: Unsubscribe all - remove discussion subscriptions 2014-10-28 13:29:51 +08:00
Marina Glancy
f173ae2014 Merge branch 'MDL-814-master' of git://github.com/danpoltawski/moodle 2014-10-28 12:23:23 +08:00
Sam Hemelryk
77b31ba2ce Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle 2014-10-28 14:02:19 +13:00
Juan Leyva
f47eeafdfd MDL-47916 web services: Fixed invalid returned value type 2014-10-27 23:14:13 +01:00
Ray Morris
9f56cc3794 MDL-47902 mod_scorm: Inappropriate default values for SCORM 1.3 variables 2014-10-27 15:06:42 -05:00
Dan Poltawski
f3206dfc36 MDL-814 forum: provide cancel button when posting 
This is the way to clear atto drafts
 2014-10-27 16:44:47 +00:00
Dan Poltawski
b5780fbd18 Merge branch 'MDL-46215-master' of git://github.com/andrewnicols/moodle 2014-10-27 14:51:04 +00:00
Andrew Nicols
d5653c6968 MDL-47898 mod_quiz: Correct path when checking content_editable 
Addresses a number of issues when using the text editor in a quiz using
secure mode.
 2014-10-27 19:23:56 +08:00