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

66868 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
86af5cb87c Merge branch '45524-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-06-10 15:31:25 +08:00
Marina Glancy
fde80766e2 Merge branch '26STABLE-wip-MDL45846' of git://github.com/jennymgray/moodle into MOODLE_26_STABLE 2014-06-10 14:20:34 +08:00
Damyon Wiese
2f3c3abc1f Merge branch 'wip-mdl-44309-m26' of https://github.com/deraadt/moodle into MOODLE_26_STABLE 2014-06-10 14:08:30 +08:00
Damyon Wiese
871a036c74 Merge branch 'MDL-45767_returnInstanceid_26' of https://github.com/moodlerooms/moodle into MOODLE_26_STABLE 2014-06-10 13:52:18 +08:00
Damyon Wiese
eb6e5390c9 Merge branch 'MDL-45763-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE 2014-06-10 13:14:38 +08:00
Andrew Nicols
ac86e96914 MDL-45935 tests: Specify step names during backup/restore tests 2014-06-10 12:18:24 +08:00
Frederic Massart
66f93d133a MDL-45870 mod_assign: Behat test covering some outcome usage 2014-06-10 11:58:19 +08:00
Michael de Raadt
ae527646a1 MDL-45719 mod_lti - Pass language strings to inline JS to allow for escaping 2014-06-10 11:40:28 +08:00
Eloy Lafuente (stronk7)
0034fd8816 Merge branch 'MDL-42782-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 2014-06-10 01:10:40 +02:00
Eloy Lafuente (stronk7)
4c3f6d562f Merge branch 'MDL-42835_26' of git://github.com/nobelium/moodle into MOODLE_26_STABLE 2014-06-10 00:37:34 +02:00
Eloy Lafuente (stronk7)
b2d285491c Merge branch 'MDL-45574-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-06-09 21:49:44 +02:00
Eloy Lafuente (stronk7)
4d7544a3a0 Merge branch 'wip-MDL-44501-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE 2014-06-09 18:59:37 +02:00
Jenny Gray
1d20e997a0 MDL-45846 Libraries custom user agent device detection unit test added 2014-06-09 14:04:36 +01:00
Marina Glancy
a9af7d94e1 Merge branch 'MDL-45560-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-06-09 17:25:22 +08:00
Jetha Chan
3a6f3f906a MDL-38693 themes: amended z-indexes 
Amended #dock z-index level from 11000 to 5000 across all themes; amended z-index style of #page-header in Overlay theme such that elements no longer occlude TinyMCE.
 2014-06-09 14:09:55 +08:00
Damyon Wiese
8beb255c10 Merge branch 'MDL-39726-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE 2014-06-09 12:43:04 +08:00
Damyon Wiese
c800196f03 Merge branch 'MDL-45714-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE 2014-06-09 09:20:09 +08:00
Sam Hemelryk
7a684b732c MDL-45524 navigation: fixed non-expandable node behat tests 2014-06-09 09:33:59 +12:00
Sam Hemelryk
82358535df MDL-44711 navigation: improved expandable course calculation 2014-06-09 09:33:59 +12:00
Matteo Scaramuccia
6637cf27b9 MDL-29708 Fixed file_exception() arguments in rename(). 2014-06-07 09:59:01 +02:00
Matteo Scaramuccia
874db754ce MDL-29708 Fixed extra slashes in $string['storedfilenotcreated']. 2014-06-07 09:58:59 +02:00
sam marshall
7aa0860eca MDL-45574 Backup progress: Can time out with large number of files 
When there are many files inside a single resource, it's possible
for the backup to time out because it does not report progress
while adding entries to the backup_ids table.
 2014-06-06 10:44:19 +01:00
Jenny Gray
807c670765 MDL-45846 Libraries Reinstate custom user agent device detection 2014-06-06 10:04:27 +01:00
Frederic Massart
36cef83e08 MDL-45870 mod_assign: Outcomes are saved for each group member 2014-06-06 12:26:27 +08:00
Daniel Neis Araujo
877ce4a64d MDL-35648 (backport) adding missing distinct selector in sql on participation report 2014-06-05 20:45:12 -03:00
Nobelium
a5a3c48851 MDL-42835 mod_scorm: Close tree nodes using TreeView API 2014-06-05 22:30:29 +00:00
Sam Chaffee
464280a23d MDL-45767: Fixed DB error when returning to course from external tool 
The instance ID is not always returned from the external
tool provider.
 2014-06-05 09:38:46 -07:00
Eloy Lafuente (stronk7)
afce57cbea weekly release 2.6.3+ 2014-06-05 16:58:45 +02:00
Eloy Lafuente (stronk7)
6e3438036a Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-06-05 16:58:39 +02:00
Michael de Raadt
0d7ed311f8 MDL-44309 Administration - correcting inproperly assigned column classes in environment table 2014-06-05 10:44:06 +08:00
Eric Merrill
52878b707a MDL-20154 questions: question_delete_question should not check perms 
By Moodle convention, library functions should not implement permission
checks, they are to be handled by the invoking code.
 2014-06-04 17:45:05 -04:00
Eric Merrill
3616569d45 MDL-20154 quiz: Remove unused random questions 
When a random question is removed from a quiz, and it is not
in use elsewhere, it should be deleted.

Conflicts:
	mod/quiz/editlib.php
	mod/quiz/lib.php
 2014-06-04 17:45:02 -04:00
Eric Merrill
200862ff6e MDL-39726 backup: Move question files by context, not one at a time 
Use question category contexts to send file to the file pool in bulk.
Questions are only restored in whole category chunks, so this is safe
to do.
 2014-06-04 09:20:05 -04:00
Adrian Greeve
7de5920dd8 MDL-44501 mod_data: Only attempt to export files when a file exists. 
The error only occurs when portfolios are enabled and there is only one field which is
a file field.
 2014-06-04 15:31:34 +08:00
Frederic Massart
ed94a2affd MDL-45579 group: Behat tests to cover group enrolment key rules 2014-06-04 15:12:04 +08:00
Frederic Massart
e2f577e074 MDL-45579 group: Prevent duplicate enrolment keys in course groups 2014-06-04 15:12:03 +08:00
Andrew Nicols
0ad0ddd1ea MDL-18162 mod_forum: Correct @param type in phpdoc to use stdClass 2014-06-04 11:26:19 +08:00
Eloy Lafuente (stronk7)
9a5044fa5c Merge branch 'MDL-44620_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-06-03 18:11:56 +02:00
Dan Poltawski
7c3e7cdae9 Merge branch '45333-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-06-03 15:26:03 +01:00
Eloy Lafuente (stronk7)
acfc4c0b4d Merge branch 'MDL-42953-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE 2014-06-03 12:11:52 +02:00
Damyon Wiese
65f3549893 Merge branch 'MDL-45592_26' of git://github.com/grabs/moodle into MOODLE_26_STABLE 2014-06-03 16:22:07 +08:00
Damyon Wiese
50df05ef78 Merge branch 'm26_MDL-44098' of git://github.com/greg-or/moodle-mod_assign into MOODLE_26_STABLE 2014-06-03 13:10:16 +08:00
Damyon Wiese
322a1fa453 Merge branch 'MDL-45781_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-06-03 11:58:52 +08:00
Jetha Chan
15601a33d9 MDL-42782 usability: fix for extreme course page indenting 2014-06-03 11:16:36 +08:00
Sam Hemelryk
42a1546bf8 Merge branch 'MDL-18162-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-06-03 15:00:31 +12:00
Eric Merrill
0babaf208d MDL-45714 backup: Less aggressive removal of old backup dirs 
The old 4 hour standard was too aggressive and can cause backup files
to be removed while they were still in use. Now the same as cron,
1 week.
 2014-06-02 21:50:54 -04:00
Eloy Lafuente (stronk7)
9514d99333 Merge branch 'm26_MDL-45726' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-06-03 02:20:02 +02:00
Sam Hemelryk
b51ee5ac52 Merge branch 'MDL-33763-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE 2014-06-03 08:57:35 +12:00
Eric Merrill
2f4815a05b MDL-45763 question Random qtype should use '0' or '1' question text. 
Some time ago, it when from using '0' for no-subcategories to blank.
Change to properly define '0' or '1', update old questions, and make
sure to fix newly restored questions.

Conflicts:
	mod/quiz/editlib.php
	question/type/random/version.php
 2014-06-02 15:35:40 -04:00
Albert Gasset
1a997d4b11 MDL-35514 mod_forum: Fixed warning message to students in forums with groups 2014-06-02 18:25:40 +02:00