mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-05 00:22:43 +01:00
Code Issues Projects Releases Wiki Activity
64,120 Commits 36 Branches 523 Tags
Commit Graph

64120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Mudrák
10549cfdb7 MDL-41954 Fix the grade for assessment calculation in the Workshop module 
In a pretty rare case of zero variance of received assessments, the "distance"
of the evaluated assessment from the referential ("best") one was not increased
regardless it's actual value. This led to higher grades for assessments in
certain situations (see the tracker for a particular example).
 2013-09-25 02:04:06 +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
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
Sam Hemelryk
b51fed38f2 MDL-40903 cache: renamed loader method to reflect static accelerator 2013-09-25 09:05:18 +12:00
Sam Hemelryk
d074fb091d MDL-40903 cache: renamed persistcache to staticacceleration 2013-09-25 09:05:18 +12:00
Sam Hemelryk
fb0eaa3fda MDL-40903 cache: fixed up event invalidation 2013-09-25 09:04:36 +12:00
Marina Glancy
d67a1a8815 MDL-40903 cache: Unittests and small fixes for persistent application cache 2013-09-25 09:04:36 +12:00
Sam Hemelryk
8bc1d659b8 MDL-40903 cache: coding style tidyup pre-integration 2013-09-25 09:04:35 +12:00
Sam Hemelryk
083fa87759 MDL-40903 cache: converted persistent into persistentdata 
At the same time all cache instances were made persistent
 2013-09-25 09:04:35 +12: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
James Henestofel
9d82f6a836 MDL-37558 Block course_overview/course_list use setting courselistshortname to show shortname and fullname 2013-09-24 10:38:44 -04: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
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