Marina Glancy
4fa30a8947
Merge branch 'MDL-41929' of git://github.com/timhunt/moodle
2013-09-24 21:31:46 +10:00
Marina Glancy
c3a994aeef
MDL-41937 tests: reset time limit after test
2013-09-24 20:53:49 +10:00
Dan Marsden
b64bc10cb7
MDL-41848 SCORM: Drag drop SCORM upload fix
2013-09-24 22:50:30 +12:00
Marina Glancy
ec7f3d40f1
MDL-39962 - Events: added missing required file
2013-09-24 20:02:57 +10:00
Marina Glancy
72f6cb3cd3
Merge branch 'wip-MDL-39962-master' of git://github.com/abgreeve/moodle
2013-09-24 20:00:24 +10:00
Sam Hemelryk
40643dcaad
Merge branch 'int_behat' of https://github.com/skodak/moodle
2013-09-24 21:16:29 +12:00
Frederic Massart
d733a8ccc3
MDL-40050 webservice: Replace add_to_log() with new events
2013-09-24 15:20:18 +08:00
Petr Škoda
de230fd359
MDL-37324 fix phpunit and behat SESSION and USER setup
2013-09-24 08:59:29 +02:00
Marina Glancy
bdc7ff589d
Merge branch 'MDL-41725-master-onecommit' of git://github.com/jamiepratt/moodle
2013-09-24 16:49:50 +10:00
Ankit Agarwal
cbacf2e5e0
MDL-41894 feedback: Remove unused code, which is generating warnings
2013-09-24 14:45:54 +08:00
Marina Glancy
c484e97f45
Merge branch 'MDL-41733_master' of git://github.com/StudiUM/moodle
2013-09-24 16:33:50 +10:00
Marina Glancy
84128f46b2
Merge branch 'MDL-41087-master' of git://github.com/sammarshallou/moodle
2013-09-24 16:29:00 +10:00
Adrian Greeve
b97d94ffbb
MDL-39962 - Events: Replace lefacy event lti_unknown_service_api call.
2013-09-24 10:08:28 +08:00
Adrian Greeve
d76a0eec39
MDL-39962 - Events: Replace the legacy event workshop_viewed
...
This also includes the abstract class course_module_viewed.
2013-09-24 10:08:28 +08:00
Marina Glancy
c925e4fa8e
Merge branch 'MDL-41840-master' of git://github.com/sammarshallou/moodle
2013-09-24 11:49:02 +10:00
Marina Glancy
d9fd72feb5
Merge branch 'MDL-41669-master' of git://github.com/sammarshallou/moodle
2013-09-24 11:48:49 +10:00
AMOS bot
28334d9458
Automatically generated installer lang files
2013-09-24 00:41:59 +00:00
Yuliya
853e506a1b
MDL-40572 badges: Update badge assertion to use new specification
2013-09-24 12:29:54 +12:00
Sam Hemelryk
1f4f0901d0
Merge branch 'w39_MDL-41904_m26_markdown' of https://github.com/skodak/moodle
2013-09-24 12:14:16 +12:00
Sam Hemelryk
fb45f406a1
Merge branch 'w39_MDL-41903_m26_typo3' of https://github.com/skodak/moodle
2013-09-24 12:09:47 +12:00
Dan Marsden
361a47d409
MDL-41580 SCORM: allow imsmanifest.xml to be used in file system repos
2013-09-24 12:08:38 +12:00
Sam Hemelryk
0eee7f9b43
Merge branch 'w39_MDL-40107_m26_tcpdf' of https://github.com/skodak/moodle
2013-09-24 12:01:03 +12:00
Sam Hemelryk
c51fda57a9
MDL-39910 mod_scorm: fixed install.xml not nulls
2013-09-24 10:58:46 +12:00
Sam Hemelryk
eeb08203dc
MDL-39871 output: improved block manipulation inheritance
2013-09-24 10:37:14 +12:00
Sam Hemelryk
0fd451b7ad
Merge branch 'WIP-MDL-39871_master' of git://github.com/nadavkav/moodle
2013-09-24 10:02:58 +12:00
Sam Hemelryk
96218d0edb
Merge branch 'MDL-41716-master' of git://github.com/phalacee/moodle
2013-09-24 09:37:10 +12:00
Eric Merrill
8b73bac647
MDL-41933 Forum: Make a admin level option to set the default value of Read Tracking.
2013-09-23 17:32:47 -04:00
Petr Škoda
136d9a4788
MDL-40107 import tcpdf 6.0.031
...
Includes a few more small asian fonts.
2013-09-23 23:19:53 +02:00
Sam Hemelryk
b3af3bbb96
Merge branch 'MDL-35217_M26' of git://github.com/lazydaisy/moodle
2013-09-24 09:14:37 +12:00
Sam Hemelryk
339feb6420
Merge branch 'master_MDL-39910' of git://github.com/danmarsden/moodle
2013-09-24 09:04:27 +12:00
Sam Hemelryk
c99fcebded
Merge branch 'MDL-40048-master' of git://github.com/FMCorz/moodle
2013-09-24 08:51:41 +12:00
Sam Hemelryk
cc6a0ec48f
Merge branch 'MDL-36465-master' of git://github.com/andrewnicols/moodle
2013-09-24 08:33:10 +12:00
Sam Hemelryk
83c875a9a0
Merge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-09-24 08:28:40 +12:00
Eloy Lafuente (stronk7)
fe64d4f7c8
Merge branch 'int_install' of https://github.com/skodak/moodle
2013-09-23 22:05:26 +02:00
Petr Škoda
1a4621d8e5
MDL-31501 fake requried globals in both installers
2013-09-23 21:46:05 +02:00
Tim Hunt
9413953f08
MDL-41929 quiz statistics, overall stats not displayed.
2013-09-23 18:05:57 +01:00
David Monllao
21b0a62fc4
MDL-41926 tool_generator: Removing unused vars
2013-09-23 17:50:46 +08:00
Marina Glancy
cbbaffc7d3
Merge branch 'MDL-41833-master' of git://github.com/ankitagarwal/moodle
2013-09-23 19:16:43 +10:00
David Monllao
0793389fd6
MDL-41910 user: Allowing LASTACCESS_UPDATE_SECS overwrite
2013-09-23 16:58:56 +08:00
David Monllao
c43ef6c624
MDL-41889 tool_generator: Fixing problem detecting the last used course shortname
2013-09-23 16:33:29 +08:00
Andrew Nicols
0082df9d12
MDL-36465 Course JavaScript: Ensure that the zero section is not draggable
2013-09-23 09:21:44 +01:00
David Monllao
53e6d79c39
MDL-41827 tool_generator: Adding a file size limit
2013-09-23 16:20:11 +08:00
David Monllao
09373a5a62
MDL-41827 tool_generator: New unit test checking the generated files size
2013-09-23 16:16:47 +08:00
Marina Glancy
009e0d28ae
Merge branch 'w39_MDL-37324_m26_phpmailer' of https://github.com/skodak/moodle
2013-09-23 18:15:35 +10:00
Petr Škoda
6226cc30fb
MDL-37324 fix phpmailer method case names and standardise phpmailer init
2013-09-23 10:11:27 +02:00
David Monllao
9ac3925477
MDL-41889 tool_generator: Fixing problem detecting the last used course shortname
2013-09-23 15:14:55 +08:00
Marina Glancy
3e36c789d7
Merge branch 'MDL-41311-master' of git://github.com/danpoltawski/moodle
2013-09-23 14:48:10 +10:00
Andrew Davis
f44b891630
MDL-41591 removed unnecessary zindexes from Clean
2013-09-23 11:40:34 +07:00
Marina Glancy
b443071378
Merge branch 'wip-MDL-41772-master' of git://github.com/abgreeve/moodle
2013-09-23 14:39:45 +10:00
Frederic Massart
f49d814abc
MDL-40048 mod_chat: Replacing add_to_log with new events
...
For this to be done properly, a new function to send the message
and trigger the event has been created. Following that a
data generator for chat, and some unit tests.
2013-09-23 11:41:33 +08:00