Commit graph

12762 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
956d55e638 Merge branch 'MDL-30995' of git://github.com/ankitagarwal/moodle 2012-03-14 18:07:21 +01:00
Ankit Agarwal
f55ff38a1b MDL-30995 completion: updating PHPdocs as suggested by little smurfs 2012-03-14 14:39:36 +08:00
Sam Hemelryk
4dd2af1270 MDL-28972 formslib: Fixed up variable naming 2012-03-14 14:40:12 +13:00
Sam Hemelryk
00efe93759 Merge branch 'wip-mdl-28972' of git://github.com/rajeshtaneja/moodle 2012-03-14 14:40:07 +13:00
Aparup Banerjee
12b8995749 Merge branch 'MDL-31853_admin_externalpage_setup' of git://github.com/davosmith/moodle 2012-03-14 09:16:27 +08:00
Sam Hemelryk
652d49ab35 Merge branch 'MDL-29147_insertElementBefore_warning' of git://github.com/davosmith/moodle 2012-03-14 11:52:38 +13:00
Eloy Lafuente (stronk7)
4c31dfd14a Merge branch 'wip-MDL-31929-master' of git://github.com/marinaglancy/moodle 2012-03-13 23:01:11 +01:00
Eloy Lafuente (stronk7)
f02702760a Merge branch 'wip-MDL-27405-m23' of git://github.com/samhemelryk/moodle 2012-03-13 22:35:04 +01:00
Sam Hemelryk
bc40124bfe MDL-27405 navigation: Fixed up buggy array_merge call 2012-03-14 10:16:34 +13:00
Eloy Lafuente (stronk7)
b39877ef10 Merge branch 'w11_MDL-31790_m23_resetunenrol' of git://github.com/skodak/moodle 2012-03-13 18:13:52 +01:00
Eloy Lafuente (stronk7)
7ca5dd85dc MDL-31718 add a few more tests to check that lens and tags are properly handled 2012-03-13 13:13:31 +01:00
Eloy Lafuente (stronk7)
45c41bdc06 Merge branch 'w11_MDL-31718_m23_shortentext' of git://github.com/skodak/moodle 2012-03-13 12:51:41 +01:00
Petr Skoda
5b8a9d1329 MDL-31790 prevent removing of protected role assignments from subcontexts 2012-03-13 12:30:13 +01:00
Sam Hemelryk
a28c6b40fe Merge branch 'scorm_graph_report' of git://github.com/ankitagarwal/moodle 2012-03-13 16:35:15 +13:00
Eloy Lafuente (stronk7)
b20bb8454a Merge branch 'w11_MDL-31985_m23_lobsizes' of git://github.com/skodak/moodle 2012-03-13 00:15:59 +01:00
Eloy Lafuente (stronk7)
403ff1b8ff Merge branch 'w11_MDL-31899_m23_mysqlcolumns' of git://github.com/skodak/moodle 2012-03-12 23:16:27 +01:00
Sam Hemelryk
3108b6412c Merge branch 'MDL-31362_unused_constant' of git://github.com/andyjdavis/moodle 2012-03-13 10:10:36 +13: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)
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)
05386929de Merge branch 'w11_MDL-29514_m23_enum' of git://github.com/skodak/moodle 2012-03-12 12:47:56 +01: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
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
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
6bf6e113bb Merge branch 'MDL-31877-master-1' of git://git.luns.net.uk/moodle 2012-03-12 14:57:11 +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
Petr Skoda
f13489df50 MDL-31985 remove LOB sizes from code and UI 2012-03-11 13:42:37 +01:00
Petr Skoda
bc09aa158b MDL-31899 use information_schema for normal db tables in get_columns()
This change is based on patch by Charles Fulton.
2012-03-10 21:41:44 +01:00
Petr Skoda
f886a2cf79 MDL-31899 add extra text size unit tests 2012-03-10 21:38:57 +01:00
Petr Skoda
05aae0a571 MDL-29514 drop support for enum data types 2012-03-10 21:36:48 +01:00
Petr Skoda
dcc27dd143 MDL-31790 add more support for user unenrolments in course reset 2012-03-10 15:25:53 +01:00
Petr Skoda
e60ba0c919 MDL-31805 test invalid html processing in html2text 2012-03-10 12:46:11 +01:00
Petr Skoda
3d6b5d37b2 MDL-31805 import html2text revision 5886 with our customisations
snapshot from https://github.com/moodle/custom-html2text/tree/MOODLE_5886_1
2012-03-10 12:40:04 +01:00
Petr Skoda
04673aee32 MDL-31805 add tests for our html2text tweaks 2012-03-10 12:38:52 +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)
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 6aa13eb36b.
2012-03-09 09:37:06 +01: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)
2583b7d22f Merge branch 'wip-MDL-31248-master-v2' of git://github.com/abgreeve/moodle 2012-03-08 02:27:55 +01:00