52166 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
e4ccd85f3a Merge branch 'w11_MDL-31956_m23_paypal' of git://github.com/skodak/moodle 2012-03-12 21:36:36 +01:00
Eloy Lafuente (stronk7)
649fd88d8f MDL-31805 html2text - change tests acordingly with the new version
With the new version in place, both <th> and <a> contents are
being handled by the conversion. Accomodate existing tests to
that change.
2012-03-12 21:17:22 +01:00
Eloy Lafuente (stronk7)
39115a4fee Merge branch 'MDL-31979-master' of git://github.com/micaherne/moodle 2012-03-12 20:18:09 +01:00
Eloy Lafuente (stronk7)
89a47fcc4e Merge branch 'w11_MDL-31805_m23_html2text' of git://github.com/skodak/moodle 2012-03-12 18:04:55 +01:00
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
b226ef619f MDL-31805 migrate html2text tests from web lib to new location
Note: the handling of <p> seems to have changed, it does double newlines only between paragraphs now (this makes sense to me).
2012-03-12 17:18:55 +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
Andrew Robert Nicols
950a11e8df MDL-32004 Set the defaultrequestcategory correctly when deleting/creating the default category 2012-03-12 13:15:25 +00: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
Mary Evans
180bf7d494 MDL-30298 report_progress: adds outer wrapper with class no-overflow to report table so as to enable horizontal scroll bar 2012-03-12 10:37:35 +00:00
Michael Aherne
d8a30af8be MDL-31979 Typo in config-dist.php 2012-03-12 09:43:31 +00:00
Ankit Agarwal
95dd54eea3 MDL-30995 Completion Fixedup some more PHP DOC issues 2012-03-12 16:13:35 +08:00
Sam Hemelryk
836375ec8a MDL-30995 completion: Fixed up PHPdocs for activity completion 2012-03-12 15:27:21 +08:00
Ankit Kumar Agarwal
e61a71379c MDL-29745 SCORM Introducing new Graphs report for scorm module 2012-03-12 15:02:26 +08: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
Marina Glancy
20ee508499 MDL-31929: Repositories wikimedia and youtube lack paging
repositories wikimedia and youtube:
- save last search in
- process parameter 'page'
- remove buttons 'Refresh', 'Search' and 'Logout' since they don't have meaning
filepicker:
- allow unknown number of pages (['pages'] = -1), show one 'Next' page after the current (both JS and non-JS modes)
repository wikimedia:
- add non-AJAX search form to make it work with JS disabled
2012-03-12 11:35:50 +08:00
Marina Glancy
7f9358fcc0 MDL-31838: Allow caching static responses from repositories in file picker 2012-03-12 11:35:35 +08:00
Sam Hemelryk
f0fe35bbbd Merge branch 'MDL-27212-master' of git://github.com/ankitagarwal/moodle 2012-03-12 16:28:16 +13:00
Rajesh Taneja
7f850b23d7 MDL-28972 formslib: orignalvalue is considered and checkboxes are updated depending on orignalvalue of controller 2012-03-12 10:25:21 +08:00
Rajesh Taneja
c14584f206 MDL-28972 formslib: Checkbox controller will use yui to select and unselect checkboxes 2012-03-12 10:25:21 +08:00
Sam Hemelryk
401f929515 Merge branch 'MDL-28998-master' of git://github.com/ankitagarwal/moodle 2012-03-12 15:19:20 +13:00
Rajesh Taneja
c069c01755 MDL-27862 Themes: Device name first letter is capital and font is made similar to theme name font 2012-03-12 10:18:28 +08:00
Rajesh Taneja
df46b9b40d MDL-27862 Themes: clear theme cache button will redirect to the page on which it was pressed 2012-03-12 10:18:28 +08:00
Rajesh Taneja
36ff8d05de MDL-27862 Themes: replaced disabled use theme button with unset theme button 2012-03-12 10:18:28 +08:00
Rajesh Taneja
bff67f4904 MDL-27862 Themes: Added button to un-select theme for devices, except default device 2012-03-12 10:18:28 +08:00
Rajesh Taneja
604cb17920 MDL-27862 Themes: Strings updated on theme selection pages 2012-03-12 10:18:27 +08:00
Rajesh Taneja
9e4baaf96f MDL-30817 activity_completion: Fixed title and alt string (on checkbox) to have module name prefixed 2012-03-12 10:16:31 +08: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
Dan Poltawski
35b7dd7b6a MDL-29440 calendar: iCal export don't allow html in description export 2012-03-12 09:51:43 +08: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
Sam Hemelryk
00f286ed7b MDL-31175 backup: Fixed undefined in register_dependency 2012-03-12 09:42:50 +13:00
Sam Hemelryk
aad30b6a39 MDL-27405 navigation: Improved checking when fetching all parent categories 2012-03-12 09:42:41 +13:00
Sam Hemelryk
b0712163e6 MDL-27405 navigation: My courses branch now shows categories if navshowcategories is enabled 2012-03-12 09:42:41 +13:00
Petr Skoda
e235f2a36e MDL-31718 utf-8 support in shorten_text() 2012-03-11 21:31:33 +01:00
Petr Skoda
bb88a54d06 MDL-31985 remove text sizes from all install.xml files 2012-03-11 15:55:37 +01:00
Petr Skoda
436650b075 MDL-31985 convert all existing LOBs 2012-03-11 15:51:49 +01:00
Mary Evans
a5ba7c3654 MDL-30298 report_completion: adds outer wrapper with class no-overflow to report table so as to enable horizontal scroll bar 2012-03-11 14:09:37 +00:00
Petr Skoda
f13489df50 MDL-31985 remove LOB sizes from code and UI 2012-03-11 13:42:37 +01:00