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

53309 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
6819c4287d MDL-32417: Fixed pagination bug in Flickr search results, also return thumbnail sizes 2012-04-23 09:33:58 +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
Jason Fowler
f77f2406fe MDL-26959 - Blog - changing wording of the entry delete confirmation string to make it more appropriate 2012-04-23 08:01:22 +08: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
Eloy Lafuente (stronk7)
6e803b9fe4 MDL-29262 backup: Clean controller obj form DB once finished ok 2012-04-23 00:03:37 +02:00
Eloy Lafuente (stronk7)
14e2704ad4 MDL-29262 backup: new setting to control the ttl of backup logs 
Add one new backup setting, moving from the general CFG->loglifetime,
to be able to delete backup logged information often.
 2012-04-22 21:23:55 +02:00
Petr Skoda
5563f5fbbb MDL-31553 do not timeout CLI upgrade scripts 
Credit goes to Michael Aherne.
 2012-04-22 17:51:06 +02:00
Petr Skoda
cdbea7eed1 MDL-31607 use full course object for require_login() if already available 
This eliminates 1 db query.
 2012-04-22 17:41:47 +02:00
Petr Skoda
fb8e3faba2 MDL-32569 always set $CFG->wwwroot to http://www.example.com/moodle in test environment 2012-04-22 17:23:20 +02:00
Petr Skoda
bcecc9ba68 MDL-32574 basic addodb connection tests + improved connection handling in enrol_database 
This should allow us to allow connection via dsn which will allow a lot more options in the future.
 2012-04-22 11:03:32 +02:00
AMOS bot
49e87823c6 Automatically generated installer lang files 2012-04-22 00:31:37 +00:00
Petr Skoda
e4ba066f1d MDL-32576 import Markdown 1.2.5 2012-04-21 22:17:41 +02:00
Petr Skoda
bc5c10f69e MDL-32575 import latest Typo3 libs for textlib and other improvements 
Includes new textlib reset, new test for faulty integer lower/upper casing.
 2012-04-21 21:31:03 +02:00
Petr Skoda
ee97a3adbb MDL-32574 import adodb 5.16 2012-04-21 20:02:29 +02:00
Petr Skoda
d88b0f9c29 MDL-32569 remove unittestprefix from config-dist.php, do not link other pages from old UI 2012-04-21 17:50:40 +02:00
Petr Skoda
37ba2528c1 MDL-32569 convert the remaining tests 2012-04-21 17:47:30 +02:00
Petr Skoda
4ca04fb58b MDL-32569 remove remaining references to simpletest and improve events test 2012-04-21 17:08:30 +02:00
Petr Skoda
f596005b6c MDL-32569 drop migrated module tests 2012-04-21 16:58:07 +02:00
Petr Skoda
2338458ac5 MDL-32569 drop all migrated question simpletests 2012-04-21 16:43:34 +02:00
Petr Skoda
5c3d290d75 MDL-32569 drop outdated webservice tests - it will be replaced by new tests soon 2012-04-21 16:37:45 +02:00
Petr Skoda
7a636d6e7f MDL-32569 drop migrated core simpletests 2012-04-21 16:36:37 +02:00
Petr Skoda
05d531a5fb MDL-32569 drop old functional DB tests 2012-04-21 16:32:14 +02:00
Petr Skoda
f59f03ad2d MDL-32569 drop more core simpletests that were already migrated 2012-04-21 16:27:30 +02:00
Petr Skoda
bb7898c6ab MDL-32569 convert remaining backup tests and drop old simpletests 2012-04-21 16:24:33 +02:00
Petr Skoda
10156165ae MDL-32569 hide old SimpleTest UI 2012-04-21 16:13:38 +02:00