49821 Commits

Author SHA1 Message Date
Henning Bostelmann
4ac9f47051 MDL-29810 Assignment grading: don't include teachers in list of students 2011-10-27 22:16:03 +01:00
Eloy Lafuente (stronk7)
38e9a1cc79 weekly release 2.2dev 2011-10-27 18:51:29 +02:00
Eloy Lafuente (stronk7)
d2822153b0 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-10-27 18:48:55 +02:00
Petr Skoda
8d1da74863 MDL-29474 fix undefined release, phpdocs and one TODO 2011-10-27 15:07:34 +02:00
Petr Skoda
2dfef18842 MDL-29474 tell AMOS we have a new install string 2011-10-27 14:36:20 +02:00
Petr Skoda
c1f55426ee MDL-29474 fix cli upgrade regression 2011-10-27 14:04:19 +02:00
Petr Skoda
72081a6f75 MDL-29474 add env and plugin test to cli db install 2011-10-27 13:56:22 +02:00
Petr Skoda
f433088d5a MDL-29474 fix regressions in CLI install 2011-10-27 13:55:41 +02:00
AMOS bot
4ca17ac303 Automatically generated installer lang files 2011-10-27 00:55:29 +00:00
Sam Hemelryk
7b27861217 Merge branch 'MDL-29912' of git://github.com/stronk7/moodle 2011-10-27 12:57:21 +13:00
Eloy Lafuente (stronk7)
86e00f970b MDL-29912 course search - oracle inabilities with concats, empties, nulls and type-restrictions 2011-10-26 19:04:31 +02:00
Eloy Lafuente (stronk7)
85819105a6 Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle 2011-10-26 11:40:01 +02:00
Petr Skoda
dcb9a0c1f1 MDL-29688 rewrite complex joins to be compatible with MySQL
Unfortunately MySQL does not handle complex EXISTS queries properly…
2011-10-26 11:35:42 +02:00
Eloy Lafuente (stronk7)
75d9479f8b MDL-29474 plugin dependencies: version minibump 2011-10-26 10:34:28 +02:00
Eloy Lafuente (stronk7)
10dd4995da Merge branch 'MDL-29474' of git://github.com/timhunt/moodle 2011-10-26 10:33:37 +02:00
Aparup Banerjee
a0b10b271f Merge branch 'MDL-29854_b' of git://github.com/timhunt/moodle 2011-10-26 11:23:09 +08:00
Dan Marsden
da69510f2a MDL-28559 - hide send for marking button from people that are enrolled but don't have capability to submit files - displays the same way as teachers/admins - keeps ability to display previously submitted files if they exist 2011-10-26 10:59:13 +13:00
Eloy Lafuente (stronk7)
036f27a420 Merge branch 'w42_MDL-29670_m22_croncleanup' of git://github.com/skodak/moodle 2011-10-25 23:51:10 +02:00
Sam Hemelryk
e6369d951c Merge branch 'MDL-29569' of git://github.com/rwijaya/moodle 2011-10-26 10:44:41 +13:00
Dan Poltawski
10aeaf0f74 MDL-26568 block_online_users - reporting incorrect number of users
When over 50 users were online the count used in the listing was incorrect
2011-10-25 23:34:46 +02:00
Sam Hemelryk
462a064cf0 Merge branch 'MDL-29716' of git://github.com/mouneyrac/moodle 2011-10-26 10:21:35 +13:00
Petr Skoda
4332cc468c MDL-29670 add more timeout resets 2011-10-25 22:07:04 +02:00
Stephen Bourget
d31a1ad808 MDL-29368 Assignment: Fixed a fatal error caused by a missing include 2011-10-25 19:19:02 +02:00
Eloy Lafuente (stronk7)
f65cd7f46c Merge branch 'w42_MDL-29918_m22_accesslibdocs' of git://github.com/skodak/moodle 2011-10-25 17:47:09 +02:00
Eloy Lafuente (stronk7)
35454bd55d Merge branch 'MDL-29815' of git://github.com/timhunt/moodle 2011-10-25 17:43:51 +02:00
Eloy Lafuente (stronk7)
44a9630623 MDL-29815 dbtest - added one test_get_records_sql_complicated related test 2011-10-25 17:37:34 +02:00
Eloy Lafuente (stronk7)
94da1daf40 Merge branch 'w42_MDL-29866_m22_setupinit' of git://github.com/skodak/moodle 2011-10-25 16:41:11 +02:00
Eloy Lafuente (stronk7)
a7fc769154 Merge branch 'w42_MDL-29914_m22_codesniffer' of git://github.com/skodak/moodle 2011-10-25 16:34:04 +02:00
Eloy Lafuente (stronk7)
bad48c0cbc MDL-29881 pear/console/getopt - deleting one more occurrence 2011-10-25 16:21:35 +02:00
Eloy Lafuente (stronk7)
980dfc5720 Merge branch 'w42_MDL-29881_m22_profiling' of git://github.com/skodak/moodle 2011-10-25 16:17:40 +02:00
Tim Hunt
bed495578f MDL-29854 questions: display better message and more useful continue
when an error occurs in the middle of processing responeses.
2011-10-25 14:49:57 +01:00
Petr Skoda
99ddfdf4c4 MDL-29918 improve accesslib inline docs 2011-10-25 14:20:22 +02:00
Eloy Lafuente (stronk7)
1bf0076e83 Merge branch 'w42_MDL-29882_m22_overlib' of git://github.com/skodak/moodle 2011-10-25 13:27:09 +02:00
Petr Skoda
9845bd201f MDL-29914 remove unused CodeSniffer lib 2011-10-25 09:14:29 +02:00
Petr Skoda
41701ffd2d MDL-29866 fix p tags and more docs 2011-10-25 08:54:30 +02:00
Rossiani Wijaya
b43251b846 MDL-29569: lesson_mod: in matching type questions, fixed and set default value for scoring and fixed jump page setting when response text is set to empty 2011-10-25 12:22:02 +08:00
Sam Hemelryk
1c3bd9b3ff Merge branch 'MDL-28718' of git://github.com/timhunt/moodle 2011-10-25 16:47:20 +13:00
Jerome Mouneyrac
5b9735b949 MDL-29716 Make token more flexible to support third party client - also fix issue with some code not matching the way the server authenticate/authorize token, missing iprestriction/validuntil for restricted users (there are iprestriction/validiuntil on token and on restricted user). Also add missing check when the user is not listed in the authorised list. 2011-10-25 11:17:18 +08:00
Sam Hemelryk
e6acc5518b MDL-29106 white space clean up 2011-10-25 15:28:52 +13:00
Sam Hemelryk
d040ea8893 Merge branch 'wip-MDL-29231-master' of git://github.com/phalacee/moodle 2011-10-25 15:19:45 +13:00
Sam Hemelryk
6327bf8f2b Merge branch 'w42_MDL-29444_m22_iframe' of git://github.com/skodak/moodle 2011-10-25 14:28:53 +13:00
Sam Hemelryk
44d10ad002 Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle 2011-10-25 14:02:20 +13:00
Sam Hemelryk
9d9d8e17eb Merge branch 'MDL-29902' of git://git.luns.net.uk/moodle 2011-10-25 13:10:43 +13:00
Eloy Lafuente (stronk7)
9bfe68bff8 Merge branch 'MDL-29339_b' of git://github.com/timhunt/moodle 2011-10-25 01:53:51 +02:00
Eloy Lafuente (stronk7)
dc83f5b006 Merge branch 'w42_MDL-28627_m22_kses' of git://github.com/skodak/moodle 2011-10-25 01:42:48 +02:00
Sam Hemelryk
6f59dd1a8b Merge branch 'MDL-29906' of git://github.com/timhunt/moodle 2011-10-25 12:25:28 +13:00
Eloy Lafuente (stronk7)
4ecbf079b5 Merge branch 'w42_MDL-29671_m22_odbc' of git://github.com/skodak/moodle
Conflicts:
	lib/thirdpartylibs.xml
2011-10-25 01:21:09 +02:00
Eloy Lafuente (stronk7)
e1595b32dc Merge branch 'w42_MDL-29863_m22_extendsorder' of git://github.com/skodak/moodle 2011-10-25 01:01:10 +02:00
Sam Hemelryk
9c99c3df46 Merge branch 'w42_MDL-29862_m22_fullmeinit' of git://github.com/skodak/moodle 2011-10-25 11:49:25 +13:00
Sam Hemelryk
2d94084463 Merge branch 'MDL-29825' of git://github.com/mouneyrac/moodle 2011-10-25 11:46:51 +13:00