moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 11:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71074 commits 37 branches 544 tags 1.3 GiB
Commit graph

71074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
a3b93be8f8 Merge branch 'MDL-46696-master' of git://github.com/FMCorz/moodle 2014-09-08 16:23:59 +01:00
Dan Poltawski
0072e5d559 Merge branch 'MDL-46586-master' of git://github.com/jleyva/moodle 2014-09-08 15:31:13 +01:00
Dan Poltawski
7b41ee2752 Merge branch 'wip-MDL-43739-master' of git://github.com/marinaglancy/moodle 2014-09-08 15:16:38 +01:00
Dan Poltawski
735c7ee41a Merge branch 'MDL-47122' of git://github.com/timhunt/moodle 2014-09-08 14:28:30 +01:00
Tim Hunt
16e246ac52 MDL-47122 question_engine_data_mapper: which methods are public. 
That is, which may be used from outside the question engine.
 2014-09-08 13:24:17 +01:00
Dan Poltawski
7f2c821420 Merge branch 'MDL-46982' of https://github.com/shashirepo/moodle 2014-09-08 12:22:27 +01:00
Dan Poltawski
45121f9b25 Merge branch 'MDL-47014' of git://github.com/jleyva/moodle 2014-09-08 12:19:24 +01:00
Dan Poltawski
b93cd58dd3 Merge branch 'wip-MDL-46254-master' of git://github.com/marinaglancy/moodle 2014-09-08 12:14:51 +01:00
Juan Leyva
7cfe4419c2 MDL-47014 airnotifier: Missing require of filelib.php 2014-09-08 11:42:05 +02:00
Marina Glancy
aea49eb5f9 Merge branch 'MDL-46818_master' of git://github.com/markn86/moodle 2014-09-08 14:04:33 +08:00
Marina Glancy
1302bb08f6 MDL-43739 block_course_overview: allow resorting of big number of courses 
previously an exception was thrown if the user preference exceeds 1333 chars
 2014-09-08 14:01:06 +08:00
Marina Glancy
d619776bd5 MDL-46254 theme: apply filters to theme footnote 2014-09-08 13:55:55 +08:00
Marina Glancy
cb1be3a7ae Merge branch 'MDL-46587-master' of git://github.com/jleyva/moodle 2014-09-08 13:48:37 +08:00
Marina Glancy
2eacde6be0 Merge branch 'MDL-46761' of git://github.com/timhunt/moodle 2014-09-08 13:48:26 +08:00
Marina Glancy
68044ce347 Merge branch 'MDL-46821-master' of git://github.com/ankitagarwal/moodle 2014-09-08 13:48:15 +08:00
Marina Glancy
d281dffa8d Merge branch 'MDL-46564_master' of https://github.com/totara/openbadges 2014-09-08 13:48:06 +08:00
Marina Glancy
70fb279f56 Merge branch 'MDL-47060-master' of git://github.com/damyon/moodle 2014-09-08 12:57:41 +08:00
Marina Glancy
7fde166775 Merge branch 'MDL-44304-master' of git://github.com/damyon/moodle 2014-09-08 12:57:34 +08:00
Ankit Agarwal
d3cd2a5043 MDL-47127 gradereport_user: Update 'datetill' string to make it more clear 2014-09-08 06:56:09 +05:30
Tim Hunt
0b62cc2ea5 MDL-46810 question CBM behaviours: improve the display of marks. 
Thanks to Tony Gardner-Medwin for the suggestion.
 2014-09-07 13:30:57 +01:00
Tim Hunt
96bdbe699d MDL-47143 questions: fix default for question_preview/marks setting. 2014-09-07 12:57:45 +01:00
Tim Hunt
a7b4c96440 MDL-46761 fix PHPdocs on question_usage_by_activity::get_total_mark 
Thanks to Tony Gardner-Medwin for spotting this.
 2014-09-07 11:37:43 +01:00
Tim Hunt
38cde336ca MDL-46195 Fix fractionsaddwrong string component in lesson & qformat_webct. 
I know. You should not refer to strings from other plugins, but

* qformat_webct is importing multichoice questions in that bit of code.
  I suppose a pedant would say that qformat_webct should declare dependencies
  on all the qtypes it relies on, but that would be silly.

* Lesson should be using the question engine, rather than doing its own thing.
 2014-09-06 20:20:58 +01:00
Juan Leyva
ff831a44ed MDL-46587 files: Invalid $itemid conversion in core_files_get_files Web Service 2014-09-05 13:46:18 +02:00
Juan Leyva
b893dc2252 MDL-46586 files: Invalid return parameters definition in core_files_get_files external function 2014-09-05 13:31:14 +02:00
Marina Glancy
9cc66e866c MDL-45602 behat: add members to cohorts 2014-09-05 16:40:00 +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
shashirepo
04e57ab0c7 MDL-46982 core: fixes wrong opening div tag 2014-09-05 10:19:24 +05:30
Tim Hunt
4040e2dd11 MDL-47122 use insert_records to improve question engine performance. 2014-09-04 23:15:27 +01:00
Yuliya Bozhko
369484bf87 MDL-47033 general: Fix incorrect use of 'course' layout 
It should use 'incourse' layout in most cases

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-09-05 09:25:43 +12:00
Syxton
60df67878b MDL-46428 course: Remove confirm when duplicating 
A confirm dialog is given when Javascript is off but not when it is on.
This aligns the two so that they neither have a confirm when duplicating
an activity.
 2014-09-04 15:19:17 -04:00
Eloy Lafuente (stronk7)
457f818026 weekly release 2.8dev 2014-09-04 19:54:47 +02:00
Eloy Lafuente (stronk7)
2728bb0919 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-09-04 19:54:36 +02:00
sam marshall
28f31f7d2d MDL-44725 Availability: Unit test for tree::get_user_list_sql 2014-09-04 10:25:01 +08:00
Brian Barnes
ff1f2dc58c MDL-47097 theme: Fixed issue with dd's sliding up 2014-09-04 14:20:25 +12:00
Brian Barnes
595858537d MDL-47054 theme: fixed issue with the user rtl table 2014-09-04 09:32:12 +12:00
Eloy Lafuente (stronk7)
4191191735 Merge branch 'MDL-47031-master-enfix' of git://github.com/mudrd8mz/moodle 2014-09-03 19:25:38 +02:00
Amanda Doughty
48a3a4d621 MDL-40451 block/glossary_random Fixed missing header when adding new block 2014-09-03 14:01:54 +01: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
Helen Foster
9447cdc206 MDL-47031 Merge English strings from the en_fix language pack 2014-09-03 10:02:56 +02:00
Damyon Wiese
3a7887baa4 MDL-47060 Atto: Autosave - play nicely with HTML source view. 
There are 2 fixes here:
1. do not overwrite the changes to the HTML source when we do an autosave.
2. Move the Atto notifications alert to the containing div so it aligns properly for either view.
 2014-09-03 15:00:02 +08:00
Yuliya Bozhko
2ffbf20715 MDL-46564 badges: Fix 'All' option in badges block 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-09-03 18:43:31 +12:00
Ankit Agarwal
201a8d41b2 MDL-46821 gradereport_user: Fix background color of user report 2014-09-03 12:09:55 +05:30
Marina Glancy
3b4db5bdf5 MDL-44725 dml: added sql_intersect() 2014-09-03 13:33:58 +08:00
Eloy Lafuente (stronk7)
5a249b20c4 Merge branch 'wip-MDL-30414-master' of https://github.com/mackensen/moodle 2014-09-03 01:08:17 +02: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
002ccdcf49 MDL-44725 Add Behat support for setting grouping condition (14) 
Makes it possible to add a grouping condition when creating an
activity, using the Behat field type API. You can set the field
using a syntax 'Grouping: NAME' (at present, only groupings are
supported, obviously we could potentially extend this to add
support for other conditions if needed).

Tested in Firefox and Chrome in JS mode, and in non-JS mode.
 2014-09-02 13:03:35 +01:00