moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63837 commits 37 branches 540 tags 1.3 GiB
Commit graph

63837 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Hemelryk
a78e39e3d3 Merge branch 'master_MDL-41580' of git://github.com/danmarsden/moodle 2013-09-25 09:27:44 +12:00
Eloy Lafuente (stronk7)
81eba750d4 Merge branch 'MDL-40811-m' of git://github.com/andrewnicols/moodle 2013-09-24 23:23:15 +02:00
Eloy Lafuente (stronk7)
bbfa86fe48 Merge branch 'wip-MDL-41594-master' of git://github.com/marinaglancy/moodle 2013-09-24 23:20:53 +02:00
Eloy Lafuente (stronk7)
18ccaca2e2 Merge branch 'MDL-41726-master-2nd' of git://github.com/FMCorz/moodle 
Conflicts:
	lang/en/moodle.php
 2013-09-24 23:13:50 +02:00
Petr Škoda
394372b7da MDL-41437 fix plugin install issues 
This patch prevents inclusion of settings from plugin that or not yet installed or upgraded,
this matches the original logic where we were using the modules table.
 2013-09-24 22:43:46 +02:00
Eloy Lafuente (stronk7)
161f995849 Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle 
Conflicts:
	admin/auth.php
	lib/db/upgrade.php
	version.php
 2013-09-24 20:18:03 +02:00
Eloy Lafuente (stronk7)
dd0fa1adb1 Merge branch 'wip-MDL-41937-master' of git://github.com/marinaglancy/moodle 2013-09-24 14:05:10 +02:00
Marina Glancy
0aab5cbc59 Merge branch 'MDL-40550_master' of https://github.com/totara/openbadges 2013-09-24 21:42:20 +10:00
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
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
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
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
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
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
Marina Glancy
cbbaffc7d3 Merge branch 'MDL-41833-master' of git://github.com/ankitagarwal/moodle 2013-09-23 19:16:43 +10:00
Andrew Nicols
0082df9d12 MDL-36465 Course JavaScript: Ensure that the zero section is not draggable 2013-09-23 09:21:44 +01: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
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
Sam Hemelryk
98d696b6d5 MDL-31501 session: fixed missing autoloader during install 2013-09-23 15:38:45 +12:00
Sam Hemelryk
d99847a338 Merge branch 'w39_MDL-31501_m26_sessionreboot' of https://github.com/skodak/moodle 2013-09-23 15:02:49 +12:00
Frederic Massart
481753eca6 MDL-40048 events: New abstract event for old 'view all' log 2013-09-23 10:58:28 +08:00
Petr Škoda
bde002b81a MDL-41437 rework plugin_manager caching and version info in blocks and modules 
This patch includes:

* version column removed from modules table, now using standard config, this allows decimal version for modules
* version column removed from block table, now using standard config, this allows decimal version for blocks
* module version.php can safely use $plugins instead of module
* new plugin_manager bulk caching, this should help with MUC performance when logged in as admin
* all missing plugins are now in plugin overview (previously only blocks and modules)
* simplified code and improved coding style
* reworked plugin_manager unit tests - now using real plugins instead of mocks
* unit tests now fail if any plugin does not contain proper version.php file
* allow uninstall of deleted filters
 2013-09-22 21:25:26 +02:00