Commit graph

52597 commits

Author SHA1 Message Date
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
Petr Skoda
b29487664d MDL32575 make sure typo3 is not confused by non-string data types 2012-04-23 00:20:47 +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
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
Petr Skoda
b38d2ce7f8 MDL-32569 move other test related files to new tests directory 2012-04-21 16:11:36 +02:00
Petr Skoda
7e41a08d7a MDL-32512 remove deprecated table_sql constructor breaking E_STRICT 2012-04-21 11:26:14 +02:00
Petr Skoda
b3aad0a25a MDL-32451 fix block edit strict issue 2012-04-21 11:21:21 +02:00
Petr Skoda
dde4368ffc MDL-32451 fix remaining E_STRICT issues in wiki 2012-04-21 11:15:39 +02:00
Petr Skoda
6e9f0fd15d MDL-32569 improve SimpleTest emulation 2012-04-20 22:20:43 +02:00
Tim Hunt
e66c9c077b MDL-32519 completio: Fix spelling of Enrolled. 2012-04-20 09:47:43 +01:00
Dan Marsden
d5159fb8d3 MDL-29975 SCORM improve pop-up generation 2012-04-20 10:28:12 +12:00
sam marshall
cf76b3353c MDL-32215 Course: Ensure section entries are unique on course, section 2012-04-19 15:16:56 +01:00
Dan Poltawski
ead4f180a0 weekly release 2.3dev 2012-04-19 17:47:01 +08:00
Dan Poltawski
d10a9ee4df Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-04-19 17:37:38 +08:00
Iñaki Arenaza
7cac2608ae MDL-16646 auth/cas CAS configuration page mis-spellings
Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
2012-04-18 18:42:05 +02:00
Dan Poltawski
f0ab3a05e3 Merge branch 'w16_MDL-32377_m23_strcache' of git://github.com/skodak/moodle 2012-04-18 18:30:03 +08:00
Tim Hunt
34b037dec6 MDL-32396 more quiz strict syntax problems. 2012-04-18 16:05:13 +08:00
Jerome Mouneyrac
b449d3b7a2 MDL-30225 add some phpdoc mentioning to avoid to use broken get_user_capabilities ws lib function 2012-04-18 14:03:54 +08:00
Eloy Lafuente (stronk7)
099aaa8d51 Merge branch 'MDL-32061-master-2' of git://git.luns.net.uk/moodle 2012-04-18 02:31:47 +02:00
Eloy Lafuente (stronk7)
80695b2d51 MDL-32448 import YUI 3.5.0: update readme 2012-04-17 18:15:16 +02:00