mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-12 11:32:04 +01:00
Code Issues Projects Releases Wiki Activity
63,913 Commits 36 Branches 523 Tags
Commit Graph

63913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frederic Massart
05549cc5d0 MDL-42004 enrol_cohort: Convert handlers to observers 2013-09-26 16:23:25 +08:00
Marina Glancy
65a4f26d8a Revert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle" 
This reverts commit 093a6fe77fc39b06c804fbe4bfcac9834a52c966, reversing
changes made to 88a4cb473439f5a2875260368b92fac1bb808c12.
 2013-09-26 12:29:03 +10:00
Sam Hemelryk
f8023f3072 Revert "MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array)" 
This reverts commit e89dfdbce62ad5be906cb2d822fa0f746cf6afd6.
 2013-09-26 11:56:00 +12:00
Sam Hemelryk
bc29e8f07a Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle 2013-09-26 10:13:01 +12:00
Eloy Lafuente (stronk7)
6da8594018 Merge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle 2013-09-25 23:48:42 +02:00
Sam Hemelryk
e2ad11d87e Revert "MDL-39871 output: improved block manipulation inheritance" 
This reverts commit eeb08203dce0131d3988a3707fbbf8563cd4bd30.
 2013-09-26 09:12:44 +12:00
Andrew Nicols
e818be1046 MDL-40811 JavaScript: Cast activityid to string when checking resources to show/hide 2013-09-25 18:14:06 +01:00
Eloy Lafuente (stronk7)
c72cad1f85 Merge branch 'int_uninstall' of https://github.com/skodak/moodle 2013-09-25 13:36:40 +02:00
Mayank Gupta
bb22cd80b7 MDL-39910 mod_scorm: fix enable/disable navigation buttons 2013-09-25 16:41:33 +05:30
Eloy Lafuente (stronk7)
a07a9c74de Merge branch 'w39_MDL-41208_m26_yui312' of https://github.com/skodak/moodle 2013-09-25 11:41:45 +02:00
Petr Škoda
723a6e5679 MDL-41437 inform developers that version column was removed from module and block tables 2013-09-25 10:52:23 +02:00
Petr Škoda
5f8012d499 MDL-41437 fix some more forgotten module.version's 2013-09-25 10:50:00 +02:00
Petr Škoda
effff2a466 MDL-41437 refactor and cleanup module uninstall support 2013-09-25 10:27:09 +02:00
Petr Škoda
74762da37f MDL-41437 implement new block, enrol and course format pluginfo uninstall methods 2013-09-25 10:12:11 +02:00
Petr Škoda
3e51580be3 MDL-43437 fix course format disabling 2013-09-25 10:03:06 +02:00
Petr Škoda
72df03235e MDL-41437 implement plugininfo_quiz necessary for quiz report uninstall 2013-09-25 09:57:19 +02:00
Petr Škoda
a707a0b461 MDL-41437 fix non-functional message processor uninstall 2013-09-25 09:39:36 +02:00
Dan Marsden
6db676bfa1 MDL-39910 SCORM: hide toggle button when course structure disabled and fix upgrade of old settings 2013-09-25 19:25:37 +12:00
Petr Škoda
5037785247 MDL-41208 fix more invalid @VERSION@ 2013-09-25 09:14:36 +02:00
David Monllao
6427c7d54e MDL-41421 tool_generator: Fixing help text 
- p.e. replaced by e.g. which sounds more English-friendly
- Adding an extra line break as markdown don't like
p and li together
 2013-09-25 15:06:35 +08:00
Petr Škoda
a31e0b40c9 MDL-41437 fix and cleanup filter uninstall 2013-09-25 08:41:33 +02:00
Sam Hemelryk
e50df55c91 Merge branch 'MDL-40848_master' of git://github.com/totara/openbadges 
Conflicts:
	theme/base/style/core.css
	theme/bootstrapbase/less/moodle/core.less
	theme/bootstrapbase/style/moodle.css
 2013-09-25 16:27:09 +12:00
Marina Glancy
093a6fe77f Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/styles.css
 2013-09-25 12:53:09 +10:00
Marina Glancy
88a4cb4734 Merge branch 'MDL-41778_master' of https://github.com/nitzo/moodle 2013-09-25 12:52:39 +10:00
Marina Glancy
d0b63cbde5 Merge branch 'MDL-41870-master' of git://github.com/damyon/moodle 2013-09-25 12:21:46 +10:00
Marina Glancy
e26e4b8a7b Merge branch 'MDL-41713-master' of git://github.com/phalacee/moodle 
Conflicts:
	lib/editor/atto/styles.css
 2013-09-25 12:21:37 +10:00
Marina Glancy
7375d9eb1f Merge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle 2013-09-25 11:53:48 +10:00
Eric Merrill
4ed604996f MDL-41845 Activity Completion: Make default selection an option. 
Makes an option to either default to the activity default, or default
to COMPLETION_TRACKING_NONE. This leaves open the possibility of
allowing activities to pick an actual default, instead of just on/off.
 2013-09-25 11:41:07 +10:00
David Monllao
35aa018208 MDL-41421 tool_generator: Adding a CLI tool to generate the test plan 2013-09-25 09:23:37 +08:00
David Monllao
1325d493cd MDL-41421 tool_generator: Adding a test plan generator to feed JMeter 
Also changing course_backend.php coding style
according to codechecker.
 2013-09-25 09:19:11 +08:00
Eloy Lafuente (stronk7)
1d453eff25 Merge branch 'MDL-41910_master' of git://github.com/dmonllao/moodle 2013-09-25 03:11:53 +02:00
Marina Glancy
dbad2a65ec Merge branch 'w39_MDL-41223_m26_customlogin' of https://github.com/skodak/moodle 2013-09-25 10:54:19 +10:00
Eloy Lafuente (stronk7)
75c7c41283 Merge branch 'MDL-41827_master' of git://github.com/dmonllao/moodle 
Conflicts:
	admin/tool/generator/classes/site_backend.php
 2013-09-25 02:38:34 +02:00
Eloy Lafuente (stronk7)
14976b3568 Merge branch 'MDL-41839-master' of git://github.com/sammarshallou/moodle 2013-09-25 02:33:30 +02:00
Eloy Lafuente (stronk7)
25e02ab6ee Merge branch 'MDL-41660-imscc-tempdir' of https://github.com/mpetrowi/moodle 2013-09-25 02:14:57 +02:00
Eloy Lafuente (stronk7)
a18daae62b Merge branch 'MDL-41342_master' of git://github.com/dmonllao/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-09-25 02:11:51 +02:00
Eloy Lafuente (stronk7)
109d6fe290 Merge branch '40903-26' of git://github.com/samhemelryk/moodle 2013-09-25 02:00:22 +02:00
Eloy Lafuente (stronk7)
ae67f8201f MDL-41889 Use moodle collator for NATURAL sort 2013-09-25 01:46:53 +02:00
Eloy Lafuente (stronk7)
5f7aa1e2e9 MDL-41726 bump to force site/phpunit/behat reinstall 2013-09-25 01:26:54 +02:00
Eloy Lafuente (stronk7)
24262f5948 Merge branch 'master_MDL-41806' of git://github.com/totara/moodle 2013-09-25 01:01:23 +02:00
Eloy Lafuente (stronk7)
007b803b4a Merge branch 'MDL-38192-master' of git://github.com/sammarshallou/moodle 2013-09-25 00:27:57 +02:00
Sam Hemelryk
6eef32525e Merge branch 'MDL-41907' of https://github.com/merrill-oakland/moodle 2013-09-25 10:18:30 +12:00
Sam Hemelryk
35ed37be8f Merge branch 'MDL-40835_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-09-25 10:02:57 +12:00
Sam Hemelryk
548fbd8e1c Merge branch 'MDL-39730_master' of https://github.com/nadavkav/moodle 2013-09-25 09:59:31 +12:00
Sam Hemelryk
4b005d8751 Merge branch 'MDL-41889_master' of git://github.com/dmonllao/moodle 2013-09-25 09:49:29 +12:00
Sam Hemelryk
1f6181e5aa Merge branch 'MDL-38286-m' of git://github.com/andrewnicols/moodle 2013-09-25 09:31:43 +12:00
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
Sam Hemelryk
0c5cb2bf22 MDL-40903 fixed merge conflicts against integration 2013-09-25 09:19:56 +12:00