51858 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f0131f57d9 Merge branch 'w11_MDL-31595_m23_enrolme' of git://github.com/skodak/moodle 2012-03-12 18:00:23 +01:00
Petr Skoda
39ec18db5b MDL-31595 improve enrol link comments 2012-03-12 16:47:28 +01:00
Eloy Lafuente (stronk7)
c9a16202d7 Merge branch 'w11_MDL-31815_m23_confirmemail' of git://github.com/skodak/moodle 2012-03-12 16:33:27 +01:00
Eloy Lafuente (stronk7)
ccd7a793ee Merge branch 'w11_MDL-31534_m23_pageinitroot' of git://github.com/skodak/moodle 2012-03-12 15:49:04 +01:00
Petr Skoda
98054db10b MDL-31534 init PAGE before require_login() 2012-03-12 13:58:01 +01:00
Eloy Lafuente (stronk7)
bf0233fb7b Merge branch 'w11_MDL-31494_m23_adodblink' of git://github.com/skodak/moodle 2012-03-12 13:38:30 +01:00
Eloy Lafuente (stronk7)
05386929de Merge branch 'w11_MDL-29514_m23_enum' of git://github.com/skodak/moodle 2012-03-12 12:47:56 +01:00
Sam Hemelryk
fe0979ea3d Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/styles.css
2012-03-12 17:29:39 +13:00
Sam Hemelryk
52cbd9cbd2 MDL-27304 mod_wiki: Fixed up phpdocs for globals 2012-03-12 17:20:37 +13:00
Sam Hemelryk
2774a46792 Merge branch 'MDL-27304-master' of https://github.com/mackensen/moodle 2012-03-12 17:20:01 +13:00
Charles Fulton
2d20d5488a MDL-31664 fix invalid boolean to string comparison 2012-03-12 17:02:38 +13:00
Sam Hemelryk
c257dfc5ff MDL-27212 Fixed up whitespace after integration 2012-03-12 16:36:29 +13:00
Sam Hemelryk
f0fe35bbbd Merge branch 'MDL-27212-master' of git://github.com/ankitagarwal/moodle 2012-03-12 16:28:16 +13:00
Sam Hemelryk
401f929515 Merge branch 'MDL-28998-master' of git://github.com/ankitagarwal/moodle 2012-03-12 15:19:20 +13:00
Sam Hemelryk
d9fc82157b Merge branch 'MDL-31811-master-2' of git://git.luns.net.uk/moodle 2012-03-12 15:15:23 +13:00
Sam Hemelryk
6bf6e113bb Merge branch 'MDL-31877-master-1' of git://git.luns.net.uk/moodle 2012-03-12 14:57:11 +13:00
Sam Hemelryk
100875efdb Merge branch 'MDL-31918-master-2' of git://git.luns.net.uk/moodle 2012-03-12 14:54:42 +13:00
Sam Hemelryk
8dd4ccfbb3 Merge branch 'MDL-31923-master-6' of git://git.luns.net.uk/moodle 2012-03-12 14:33:42 +13:00
Sam Hemelryk
44f24f1351 Merge branch 'MDL-31841_feedback_align' of git://github.com/andyjdavis/moodle 2012-03-12 14:22:20 +13:00
Sam Hemelryk
2b824233ad Merge branch 'wip-MDL-30906-master' of git://github.com/abgreeve/moodle 2012-03-12 14:20:02 +13:00
Petr Skoda
05aae0a571 MDL-29514 drop support for enum data types 2012-03-10 21:36:48 +01:00
Petr Skoda
63900cc51e MDL-31494 fix link to adodb driver docs
target="_bank" is valid again in html5, it does help a lot here no matter what legacy accessibility guides say…
2012-03-10 11:04:51 +01:00
Petr Skoda
3d951178fc MDL-31815 encode dots in confirm url which helps email clients with url highlighting 2012-03-10 10:46:36 +01:00
Petr Skoda
6813cdf73a MDL-31595 do not show enrolee link to guest account 2012-03-10 09:40:42 +01:00
Eloy Lafuente (stronk7)
23778a4dfa Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-03-09 11:56:22 +01:00
AMOS bot
80a0272a1d Automatically generated installer lang files 2012-03-09 11:54:12 +01:00
Eloy Lafuente (stronk7)
3a016edc0b weekly release 2.3dev 2012-03-09 11:13:09 +01:00
Eloy Lafuente (stronk7)
c5d5d911a0 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-03-09 11:03:53 +01:00
Eloy Lafuente (stronk7)
e45cad3e5e Merge branch 'wip-MDL-31248-master-v3' of git://github.com/abgreeve/moodle 2012-03-09 09:44:30 +01:00
Eloy Lafuente (stronk7)
a0808e8eda Revert "MDL-31248 - lib - Alteration to the rc4encrypt function to allow for old password use."
This reverts commit 6aa13eb36b79677a0a98058e048f74ed4b89f2e8.
2012-03-09 09:37:06 +01:00
Ankit Agarwal
5c333af0c0 MDL-2712 tags: removing the anchor links when there are no results 2012-03-09 15:02:10 +08:00
Ankit Agarwal
9247265b81 MDL-28998 libraries: Adding validation to customisable profile fields during signup 2012-03-09 14:48:36 +08:00
Adrian Greeve
40fe364713 MDL-31248 - lib - Retaining the old password key and creating a new cookie prefix. 2012-03-09 13:38:51 +08:00
Eloy Lafuente (stronk7)
d395ad7042 Revert "[MDL-31708] - wiki 2.0 non-group member can see edit option in navigation block."
This reverts commit ebadb9b9a674f5e91ddb7460ea3f9dafc6c34523.
2012-03-09 01:58:09 +01:00
Eloy Lafuente (stronk7)
61b0512c44 Revert "MDL-31708 wiki groups: whitespace fix"
This reverts commit 6273fb83770305c2631e13c309d1409d75c5b3d0.
2012-03-09 01:58:01 +01:00
Andrew Robert Nicols
ce13ea6ceb MDL-31923 Correctly respect hiddenfields and capabilities 2012-03-08 10:05:14 +00:00
Andrew Davis
62a966ada0 MDL-31841 grade: prevented the feedback column on the user report from being centered 2012-03-08 15:19:17 +07:00
Eloy Lafuente (stronk7)
2583b7d22f Merge branch 'wip-MDL-31248-master-v2' of git://github.com/abgreeve/moodle 2012-03-08 02:27:55 +01:00
AMOS bot
d30b5d8f16 Automatically generated installer lang files 2012-03-08 00:31:35 +00:00
Adrian Greeve
6aa13eb36b MDL-31248 - lib - Alteration to the rc4encrypt function to allow for old password use. 2012-03-08 08:09:39 +08:00
Eloy Lafuente (stronk7)
427ad4d3c3 Merge branch 'wip-MDL-29086-master' of git://github.com/abgreeve/moodle 2012-03-08 00:48:04 +01:00
Eloy Lafuente (stronk7)
e233175df1 Merge branch 'wip-MDL-30991-master' of git://github.com/phalacee/moodle 2012-03-07 21:41:36 +01:00
Andrew Robert Nicols
ccb8d546e3 MDL-31918 Use cached module info for activity completion report 2012-03-07 15:25:38 +00:00
Eloy Lafuente (stronk7)
f1662409a0 Merge branch 'MDL-31712_master' of git://github.com/kordan/moodle 2012-03-07 15:39:01 +01:00
Petr Skoda
a681b6c0a9 MDL-31689 fix moodle_database:execute() description 2012-03-07 12:36:40 +01:00
Eloy Lafuente (stronk7)
daf714ef12 MDL-31832 CLI upgrade will return 0 exit status if no upgrade is needed
Discussed with David, both points were valid but finally
we agreed about to consider the "no upgrade needed" exit
a normal/succesful one, mainly because it keeps previous
behavior the same (exit non-zero only for real errors).
2012-03-07 10:58:56 +01:00
David Mudrak
91c038f932 MDL-31832 CLI upgrade checks if the upgrade is actually needed 2012-03-07 10:58:07 +01:00
Eloy Lafuente (stronk7)
a1ef8c6d3c MDL-28364 whitespace fixes 2012-03-07 04:00:39 +01:00
Eloy Lafuente (stronk7)
12c5685a50 Merge branch 'MDL-28364' of git://github.com/jonof/moodle 2012-03-07 03:55:53 +01:00
Eloy Lafuente (stronk7)
47ee3c5569 MDL-30976 whitespace fixes 2012-03-07 02:19:59 +01:00