Commit graph

58322 commits

Author SHA1 Message Date
Petr Škoda
b3ef2e519e MDL-37175 enable PayPal enrolment editing 2013-01-12 16:35:19 +01:00
Petr Škoda
0aaea0d241 MDL-37184 refactor enrolment editing code to be shared by plugins
AMOS BEGIN
 MOV [editenrolment,enrol_self],[editenrolment,core_enrol]
AMOS END
2013-01-12 15:47:04 +01:00
Eloy Lafuente (stronk7)
ca48fe5f97 NOBUG: Bumping version to test auto-packaging 2013-01-11 13:42:08 +01:00
Eloy Lafuente (stronk7)
2e5d013417 weekly release 2.5dev 2013-01-11 12:36:05 +01:00
Eloy Lafuente (stronk7)
b64a33bade fix permissions 2013-01-11 12:23:22 +01:00
Eloy Lafuente (stronk7)
d0942f0744 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-01-11 12:15:57 +01:00
Petr Škoda
92b00c32a7 MDL-37420 rework pg schema testing 2013-01-11 02:12:38 +01:00
David Mudrák
fe7e411e7c MDL-37467 Do not provide blog posts via RSS when blogging is disabled 2013-01-10 18:22:56 +01:00
Eloy Lafuente (stronk7)
72a504dc2a Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle 2013-01-10 11:13:13 +01:00
Mark Nelson
941294ef43 MDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using count_records_sql incorrectly as well as generating RSS content when no data exists 2013-01-10 17:59:40 +08:00
Mark Nelson
faf3016f35 MDL-37247 mod_forum: removing unnecessary variable in the get_forums web service 2013-01-10 13:45:45 +08:00
Mark Nelson
0c246ae5d9 MDL-37247 mod_forum: perform conditional checks before returning forums via web service 2013-01-10 12:47:23 +08:00
Dan Poltawski
319d937602 Revert "Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle"
This reverts commit 8361f557a1,
2b9e957a27 and
fae51910bf
2013-01-10 11:17:33 +08:00
Andrew Robert Nicols
632f3effdb MDL-36600 Add missing sesskey check when previewing the message 2013-01-10 10:18:56 +08:00
Frederic Massart
1017426c26 MDL-32639 phpunit: Hack not to fail on debugging 2013-01-09 11:48:44 +08:00
Sam Hemelryk
a0af8cb8c3 Merge branch 'wip-MDL-37404-master' of git://github.com/marinaglancy/moodle 2013-01-09 14:35:09 +13:00
Eloy Lafuente (stronk7)
f9f750cecc Merge branch 'w51_MDL-37420_m25_pgschema' of git://github.com/skodak/moodle 2013-01-09 01:32:09 +01:00
Eloy Lafuente (stronk7)
8361f557a1 Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle
Conflicts:
	course/tests/courselib_test.php
2013-01-09 01:31:50 +01:00
Sam Hemelryk
7316589831 MDL-36904 mod_assign: Fixed whitespace issue 2013-01-09 12:33:29 +13:00
Sam Hemelryk
6f51092fbe Merge branch 'MDL-35413-master' of git://github.com/damyon/moodle
Conflicts:
	mod/assign/locallib.php
2013-01-09 11:59:43 +13:00
Eloy Lafuente (stronk7)
e801c74c54 Merge branch 'w51_MDL-37183_m25_excelcleanup' of git://github.com/skodak/moodle 2013-01-08 23:30:19 +01:00
Eloy Lafuente (stronk7)
c68f339e5e Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle 2013-01-08 23:25:34 +01:00
Eloy Lafuente (stronk7)
ac4c7aed68 Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle
Conflicts:
	lib/odslib.class.php
2013-01-08 23:11:54 +01:00
Sam Hemelryk
3913743aa3 Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle 2013-01-09 10:20:46 +13:00
Sam Hemelryk
5ba45e34bb Merge branch 'wip-MDL-35842-master' of git://github.com/phalacee/moodle 2013-01-09 10:07:16 +13:00
Sam Hemelryk
21117c9d17 Merge branch 'wip-MDL-35891-master' of git://github.com/phalacee/moodle 2013-01-09 09:41:00 +13:00
Sam Hemelryk
086e78da69 MDL-36357 cache: removed double semicolon 2013-01-09 09:37:09 +13:00
Sam Hemelryk
f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
Conflicts:
	user/view.php
2013-01-09 09:34:22 +13:00
Andrew Robert Nicols
60fb0ef8a9 MDL-36600 user: improve course messaging checks 2013-01-09 09:21:35 +13:00
Eloy Lafuente (stronk7)
4f90540e0c Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle 2013-01-08 18:01:43 +01:00
Petr Škoda
59706ff6c7 MDL-37420 add support for db schemas in auth test 2013-01-08 17:20:42 +01:00
Petr Škoda
917fddb5e2 MDL-37420 add support for db schemas in enrol test 2013-01-08 17:20:26 +01:00
Petr Škoda
6ad8d762da MDL-37420 add support for more PostgreSQL schemas 2013-01-08 17:12:31 +01:00
Jean-Michel Vedrine
d55399a098 MDL-28183 fix for problem during integration
Conflicts:
	question/type/multianswer/question.php
2013-01-08 12:03:48 +01:00
Eloy Lafuente (stronk7)
f9ba4fd83b Merge branch 'MDL-37220_dnd_icon' of git://github.com/davosmith/moodle 2013-01-08 11:54:19 +01:00
Eloy Lafuente (stronk7)
a74c3851f7 Merge branch 'w51_MDL-37284_m25_mysqlutf8' of git://github.com/skodak/moodle 2013-01-08 11:39:23 +01:00
Eloy Lafuente (stronk7)
783a51ba48 Merge branch 'w51_MDL-37291_m25_paypalrestore' of git://github.com/skodak/moodle 2013-01-08 10:51:49 +01:00
Eloy Lafuente (stronk7)
cf78070a63 Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle 2013-01-08 10:34:04 +01:00
Eloy Lafuente (stronk7)
b315a45274 Merge branch 'w51_MDL-37323_m25_dlgstrings' of git://github.com/skodak/moodle 2013-01-08 10:21:50 +01:00
Dan Poltawski
6c8d7fed66 Merge branch 'w51_MDL-7537_m25_paypalcur' of git://github.com/skodak/moodle 2013-01-08 16:49:47 +08:00
Dan Poltawski
6d0a62bc37 MDL-3941 - version bump for TLS support in ldap 2013-01-08 16:42:47 +08:00
Dan Poltawski
6c74a228f3 Merge branch 'wip_master_mdl-3941_add_support_for_LDAP_TLS' of git://github.com/iarenaza/moodle 2013-01-08 16:40:50 +08:00
Dan Poltawski
655b566b9e Merge branch 'w51_MDL-37299_m25_manselfprogress' of git://github.com/skodak/moodle 2013-01-08 15:08:05 +08:00
Dan Poltawski
1a12cbd9df Merge branch 'w51_MDL-35685_m25_capinit_b' of git://github.com/skodak/moodle 2013-01-08 14:50:29 +08:00
Dan Poltawski
bfb5580f92 Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle 2013-01-08 14:46:14 +08:00
Dan Poltawski
81a38f50fb Merge branch 'wip_master_mdl-28585_ldap_auth_doesnt_handle_password_expiration' of https://github.com/iarenaza/moodle 2013-01-08 14:40:15 +08:00
Dan Poltawski
c37c9e760d Merge branch 'w51_MDL-37125_m25_yui380' of git://github.com/skodak/moodle 2013-01-08 14:29:32 +08:00
Dan Poltawski
397e4ecf76 Merge branch 'w51_MDL-37282_m25_tinymce358' of git://github.com/skodak/moodle 2013-01-08 14:26:52 +08:00
Dan Poltawski
df0b14c3b5 Merge branch 'w51_MDL-37303_m25_enrolinstancestatus' of git://github.com/skodak/moodle 2013-01-08 14:22:11 +08:00
Dan Poltawski
7f3e944aa1 Merge branch 'w51_MDL-37304_m25_authdbcleanup' of git://github.com/skodak/moodle 2013-01-08 14:15:22 +08:00