mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 20:50:21 +01:00
Code Issues Projects Releases Wiki Activity
68,594 Commits 36 Branches 523 Tags
Commit Graph

68594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
ed16bf3724 Merge branch 'MDL-45418' of git://github.com/stronk7/moodle 2014-06-10 20:12:58 +02:00
Barbara Ramiro
1e2e5d83e9 MDL-45943: Replacement for publisher icons 2014-06-10 19:20:35 +02:00
Jason Fowler
b5725a9727 MDL-45418 Files: Adding upgrade steps for publisher docs 
Conflicts:
	lib/db/upgrade.php
	version.php
 2014-06-10 19:18:35 +02:00
James McLean
855d8a2c49 MDL-45418 Files: Adding publisher docs to Filetypes 2014-06-10 19:09:27 +02:00
Marina Glancy
5adb8d86bd Merge branch 'MDL-45763-master' of git://github.com/merrill-oakland/moodle 2014-06-10 20:08:06 +08:00
Eric Merrill
516a3ddc76 MDL-45763 question: Correct random question text if set to true or false 2014-06-10 06:05:33 -04:00
Marina Glancy
4422b08068 Merge branch 'MDL-45813-scheduled_task' of git://github.com/mudrd8mz/moodle 2014-06-10 15:42:42 +08:00
Marina Glancy
410bb9a92c Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle 2014-06-10 15:41:53 +08:00
Damyon Wiese
5d44ea3333 Merge branch '45524-28' of git://github.com/samhemelryk/moodle 2014-06-10 15:30:16 +08:00
Marina Glancy
0b74d45c70 Merge branch 'wip-MDL45846' of git://github.com/jennymgray/moodle 2014-06-10 14:19:45 +08:00
Daniel Neis Araujo
db282ba4fe MDL-45245 html_writer::select_time does not respect 5th parameter "attributes" 2014-06-10 14:19:04 +08:00
Damyon Wiese
79b1aa8ac3 Merge branch 'wip-MDL-44309-master' of https://github.com/deraadt/moodle 2014-06-10 14:06:19 +08:00
Damyon Wiese
850833378d Merge branch 'MDL-45761-master' of https://github.com/merrill-oakland/moodle 2014-06-10 14:01:23 +08:00
Damyon Wiese
dc92753a3a Merge branch 'MDL-45767_returnInstanceid' of https://github.com/moodlerooms/moodle 2014-06-10 13:34:01 +08:00
Damyon Wiese
5262686e5f Merge branch 'MDL-45729-master' of http://github.com/damyon/moodle 2014-06-10 13:28:04 +08:00
Damyon Wiese
2d8d99ab5b Merge branch 'MDL-45763-master' of https://github.com/merrill-oakland/moodle 2014-06-10 12:42:09 +08:00
Damyon Wiese
5ba4ca894a MDL-45729 assign: Fix for assign unit tests 
Check the user in the params, not the $USER
 2014-06-10 11:39:20 +08:00
Eloy Lafuente (stronk7)
3150271c22 Merge branch 'MDL-45789_master' of https://github.com/markn86/moodle 2014-06-10 01:16:27 +02:00
Eloy Lafuente (stronk7)
d1b183b94b Merge branch 'MDL-45804_master' of https://github.com/markn86/moodle 2014-06-10 01:14:21 +02:00
Eloy Lafuente (stronk7)
2975f1a0cc Merge branch 'MDL-42782-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-06-10 01:08:45 +02:00
Eloy Lafuente (stronk7)
0a87b6809f Merge branch 'MDL-42835' of git://github.com/nobelium/moodle 2014-06-10 00:36:33 +02:00
Graham Bowman
09fdd221ca MDL-45729 assign: conditional submission summary 
Only show the submission summary if user has assign:submit capability.

Amended to fix some whitespace and the commit message.
 2014-06-09 22:07:15 +02:00
Eloy Lafuente (stronk7)
3566ea16a8 Merge branch 'MDL-45574-master' of https://github.com/sammarshallou/moodle 2014-06-09 20:18:06 +02:00
Eloy Lafuente (stronk7)
61e11664c8 Merge branch 'wip-MDL-44501-master' of git://github.com/abgreeve/moodle 2014-06-09 18:59:16 +02:00
Jenny Gray
d6bc210687 MDL-45846 Libraries custom user agent device detection unit test added 2014-06-09 13:56:42 +01:00
Eloy Lafuente (stronk7)
d663c5abc5 Merge branch 'wip-mdl-45769' of https://github.com/rajeshtaneja/moodle 2014-06-09 13:25:01 +02:00
Marina Glancy
8c46fc33dc Merge branch 'MDL-45560-master' of git://github.com/andrewnicols/moodle 2014-06-09 17:23:54 +08:00
Marina Glancy
3f445e4e23 Merge branch 'MDL-45634-master' of git://github.com/FMCorz/moodle 2014-06-09 17:23:42 +08:00
David Mudrák
dc561732b5 MDL-45813 Fix variable name in scheduled task 2014-06-09 09:46:13 +02:00
Rajesh Taneja
9e4c31accc MDL-45769 behat: use final versions of symfony and behat 2014-06-09 09:56:52 +08:00
Rajesh Taneja
ddfbdf0924 MDL-45769 Behat: Fixed behat, was failing because of xpath chaining 2014-06-09 09:56:39 +08:00
Damyon Wiese
d78fa6c10a Merge branch 'MDL-39726-master' of https://github.com/merrill-oakland/moodle 2014-06-09 09:51:58 +08:00
Damyon Wiese
589291889d Merge branch 'MDL-45714-master' of https://github.com/merrill-oakland/moodle 2014-06-09 08:53:48 +08:00
Sam Hemelryk
36bb73449c MDL-45524 navigation: fixed non-expandable node behat tests 2014-06-09 09:34:05 +12:00
Sam Hemelryk
cbd063f4c3 MDL-44711 navigation: improved expandable course calculation 2014-06-09 09:34:05 +12:00
sam marshall
e974eef932 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:41:40 +01:00
Jenny Gray
ccbb60d188 MDL-45846 Libraries Reinstate custom user agent device detection 2014-06-06 09:10:32 +01:00
Mark Nelson
6e311b5fb3 MDL-45789 mod_wiki: removed undefined "$this->other['itemid']" from the comments_viewed event description 2014-06-05 21:08:27 -07:00
Nobelium
6a761d016c MDL-42835 mod_scorm: Close tree nodes using TreeView API 2014-06-05 22:30:05 +00:00
Eric Merrill
828a4e9f6e 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.
 2014-06-05 11:06:26 -04:00
Eloy Lafuente (stronk7)
e7ea6b9a24 weekly release 2.8dev 2014-06-05 16:58:30 +02:00
Eloy Lafuente (stronk7)
f1a23d593e Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-06-05 16:58:18 +02:00
Eric Merrill
c1d0d73718 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-05 09:56:35 -04:00
Eric Merrill
98f52b7dc0 MDL-45761 assign Set inline comment format properly when plugin is empty 
If a plugin says it is empty, skip it for for building the inline
comment.

If not format was found in any plugins, set to FORMAT_HTML, which is
the default for feedback anyways.
 2014-06-05 08:56:24 -04:00
Michael de Raadt
cae7b8882a MDL-44309 Administration - correcting inproperly assigned column classes in environment table 2014-06-05 10:59:34 +08:00
Eric Merrill
d6441d1e5e 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:14:49 -04:00
Damyon Wiese
c9be25abb3 Merge branch 'MDL-41665_master' of https://github.com/markn86/moodle 2014-06-04 16:15:32 +08:00
Adrian Greeve
f3998ce41e 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:27:50 +08:00
Mark Nelson
e2cd4f5b95 MDL-41665 mod_scorm: fixed broken report URLs 2014-06-04 00:17:41 -07:00
Marina Glancy
b60e8bb8fa Merge branch 'MDL-18162-master-2' of git://github.com/andrewnicols/moodle 2014-06-04 12:58:03 +08:00