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

52648 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
c833026b24 Merge branch 'MDL-32249' of github.com:srynot4sale/moodle 2012-04-24 12:56:30 +02:00
Andrew Robert Nicols
ede323e2b3 MDL-31914 Ensure that completion criteria are deleted when removing a course module 
Conflicts:

	lib/db/upgrade.php
	version.php
 2012-04-24 12:25:53 +02:00
Eloy Lafuente (stronk7)
14ffb91959 Merge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle 2012-04-24 10:37:13 +02:00
Petr Skoda
3932d474e3 MDL-32574 fi sqlsrv adodb test 2012-04-24 09:22:26 +02:00
Dan Poltawski
e5055d3e5e Merge branch 'master_MDL-32102' of git://github.com/danmarsden/moodle 2012-04-24 15:17:43 +08:00
Dan Poltawski
06f29d7d76 Merge branch 'wip-MDL-31928-master' of git://github.com/marinaglancy/moodle 2012-04-24 10:32:18 +08:00
Dan Poltawski
8e8f247f2c Merge branch 'w17_MDL-32427_m23_protocols' of git://github.com/skodak/moodle 2012-04-24 10:27:15 +08:00
Dan Poltawski
1e77ca296d Merge branch 'w17_MDL-25407_m23_innodb' of git://github.com/skodak/moodle 2012-04-24 10:23:14 +08:00
Eloy Lafuente (stronk7)
434fc13dbe Merge branch 'MDL-32454-master-1' of git://git.luns.net.uk/moodle 2012-04-24 01:47:14 +02:00
Eloy Lafuente (stronk7)
55a0c2d787 Merge branch 'MDL-32514-master-1' of git://git.luns.net.uk/moodle 2012-04-24 01:42:28 +02:00
Eloy Lafuente (stronk7)
5989454498 Merge branch 'MDL-19549' of git://github.com/danpoltawski/moodle 2012-04-24 01:00:16 +02:00
Eloy Lafuente (stronk7)
9614e54bfc Merge branch 'MDL-28176' of git://github.com/danpoltawski/moodle 2012-04-24 00:30:50 +02:00
Eloy Lafuente (stronk7)
f24628a290 Merge branch 'MDL-32134' of git://github.com/danpoltawski/moodle 2012-04-24 00:07:23 +02:00
Eloy Lafuente (stronk7)
3e0b0ae59b Merge branch 'wip-MDL-26500' of git://github.com/danpoltawski/moodle 2012-04-24 00:03:36 +02:00
Petr Skoda
e498621a95 MDL-25407 ignore errors in CLI mysql engine conversion script 2012-04-23 19:19:19 +02:00
Eloy Lafuente (stronk7)
93f9755c74 MDL-29262 phpunit: fix forgotten mock objects to avoid strict notices 2012-04-23 15:01:14 +02:00
Dan Poltawski
a0a87e85f0 Merge branch 'w17_MDL-32477_m23_cloneperm' of git://github.com/skodak/moodle 2012-04-23 16:35:26 +08:00
Petr Skoda
d72bb48662 MDL-32427 add HTML Purifier allowed scheme tests 2012-04-23 10:30:00 +02:00
Petr Skoda
590abcf801 MDL-32427 fix suport for extra schemes in links in HTML Purifier 2012-04-23 10:29:43 +02:00
Dan Poltawski
3bbfe7d636 Merge branch 'w17_MDL-32449_m23_tinymce' of git://github.com/skodak/moodle 2012-04-23 15:37:34 +08:00
Dan Poltawski
98fc9c8363 Merge branch 'w17_MDL-31553_m23_clitimeout' of git://github.com/skodak/moodle 2012-04-23 15:25:42 +08:00
kordan
25d4221200 MDL-32578 theme_formal_white: modified two lang strings 2012-04-23 15:20:34 +08:00
Dan Poltawski
be7358bc18 Merge branch 'wip-MDL-32497-master' of git://github.com/marinaglancy/moodle 2012-04-23 14:25:59 +08:00
Dan Poltawski
4e25e4696b Merge branch 'wip_mdl-31540-master' of https://github.com/iarenaza/moodle 
Conflicts:
	auth/ldap/auth.php
 2012-04-23 13:55:00 +08:00
Dan Poltawski
b68eef5e0b Merge branch 'MDL-32462' of git://github.com/timhunt/moodle 2012-04-23 12:54:01 +08:00
Dan Poltawski
544cfe962e Merge branch 'MDL-32104-master' of git://github.com/ankitagarwal/moodle 2012-04-23 12:49:56 +08:00
Dan Poltawski
e0ed91ba39 Merge branch 'MDL-29262' of git://github.com/stronk7/moodle 
Conflicts:
	version.php
 2012-04-23 12:42:16 +08:00
Dan Poltawski
fb1b14299a Merge branch 'w17_MDL-25407_m23_innodb' of git://github.com/skodak/moodle 2012-04-23 12:24:39 +08:00
Dan Poltawski
e7e0f8d27f Merge branch 'MDL-32215-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	course/simpletest/testcourselib.php
    lib/db/upgrade.php
	version.php
 2012-04-23 12:20:57 +08:00
Dan Poltawski
bebf083159 Merge branch 'w17_MDL-31607_m23_login' of git://github.com/skodak/moodle 2012-04-23 11:47:11 +08:00
Jerome Mouneyrac
e1f9702056 MDL-31431 webservices: improve user pic docs 
Explain how to retrieve profile picture when forcelogin is set to NO and guestaccess to Yes
 2012-04-23 11:42:30 +08:00
Dan Poltawski
f488088109 Merge branch 'w17_MDL-32569_m23_phpunit5' of git://github.com/skodak/moodle 2012-04-23 11:21:06 +08:00
Dan Poltawski
eadff47811 Merge branch 'master_MDL-29975' of git://github.com/danmarsden/moodle 2012-04-23 10:59:17 +08:00
Dan Poltawski
0439fed4d3 Merge branch 'MDL-30187-master-2' of git://git.luns.net.uk/moodle 2012-04-23 10:51:02 +08:00
Dan Poltawski
42b206e47a Merge branch 'MDL-32459-master-1' of git://git.luns.net.uk/moodle 2012-04-23 10:42:42 +08:00
Dan Poltawski
75285aa03a Merge branch 'wip_mdl-16646_master' of https://github.com/iarenaza/moodle 2012-04-23 10:32:37 +08:00
Dan Poltawski
c6d2dca7a0 Merge branch 'MDL-23647_master' of git://github.com/lazydaisy/moodle 2012-04-23 10:27:44 +08:00
Dan Poltawski
d6dd4f40e1 Merge branch 'w17_MDL-32451_m23_wikistrict' of git://github.com/skodak/moodle 2012-04-23 10:25:54 +08:00
Dan Poltawski
a50a1b5dbf Merge branch 'w17_MDL-32512_m23_estrict' of git://github.com/skodak/moodle 2012-04-23 10:22:04 +08:00
Dan Poltawski
1d99324f38 Merge branch 'w17_MDL-32451_m23_blockstrict' of git://github.com/skodak/moodle 2012-04-23 10:16:27 +08:00
Dan Poltawski
c4974b077a Merge branch 'w17_MDL-32576_m23_markdown' of git://github.com/skodak/moodle 2012-04-23 10:09:02 +08:00
Dan Poltawski
242c26e063 Merge branch 'w17_MDL-32575_m23_typo3' of git://github.com/skodak/moodle 2012-04-23 10:07:07 +08:00
Dan Poltawski
1c8be0eb7f Merge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle 2012-04-23 10:00:24 +08:00
Chris Follin
895e76ea51 MDL-32492 auth/cas: respect https login links 2012-04-23 09:49:19 +08:00
Marina Glancy
dc571f3010 MDL-32497: WebDAV repository need to return more information and work correctly with subdirs 2012-04-23 09:34:08 +08:00
Marina Glancy
8685679a2a MDL-31928: Fixing bugs in repository_url 
- if the same image occurs several times on the page list it only once
- resolve image path correctly if it has a query string
- show images included in CSS
- non-JS file picker ignores thumbnail width and height attributes (this is a temp fix until renderers are implemented)
 2012-04-23 09:33:27 +08:00
Aaron Barnes
412cecc32b MDL-32249 completion: Round course grades and remove hardcoded string 2012-04-23 12:18:44 +12:00
Dan Marsden
cbed6472b4 MDL-32102 Course completion - only restore user completion if not adding to existing course 2012-04-23 11:30:11 +12:00
Petr Skoda
b29487664d MDL32575 make sure typo3 is not confused by non-string data types 2012-04-23 00:20:47 +02:00
Eloy Lafuente (stronk7)
749fd68cbb MDL-29262 restore: Clean controller obj form DB once finished ok 2012-04-23 00:14:32 +02:00