Commit graph

15532 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
ee5c647e84 Merge branch 'MDL-31616' of git://github.com/timhunt/moodle 2013-01-15 20:14:03 +01:00
Eloy Lafuente (stronk7)
fcdc9b7717 NOBUG: 1 more whitespace, was hurting my eyes all the time. 2013-01-15 19:20:17 +01:00
Andrew Robert Nicols
d7d68b03ee MDL-37426 Fix JSHint issues for moodle-core-formchangechecker 2013-01-15 17:34:04 +00:00
Eloy Lafuente (stronk7)
ceda80962c Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle 2013-01-15 18:17:12 +01:00
Eloy Lafuente (stronk7)
62a9604677 Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle 2013-01-15 18:12:20 +01:00
Eloy Lafuente (stronk7)
dfcb38a1c7 Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle 2013-01-15 18:00:17 +01:00
Dan Poltawski
2773aa41de Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle 2013-01-15 16:04:57 +08:00
Frederic Massart
d6731600c8 MDL-30070 message: Web Services for contact list 2013-01-15 16:04:00 +08:00
Rossiani Wijaya
c316c3944e MDL-35817 Login: set page focus to error message for login error 2013-01-15 15:45:15 +08:00
Dan Poltawski
2429051d2f Merge branch 'MDL-37381-master' of git://github.com/mouneyrac/moodle 2013-01-15 14:29:41 +08:00
Dan Poltawski
0efd8de527 Merge branch 'w02_MDL-36898_m25_ccontact' of git://github.com/skodak/moodle 2013-01-15 13:57:39 +08:00
Dan Poltawski
09ade47f55 Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle 2013-01-15 13:55:50 +08:00
Dan Poltawski
85533e2a03 Merge branch 'MDL-37077-master' of git://github.com/ankitagarwal/moodle 2013-01-15 13:54:40 +08:00
Frederic Massart
7aff468346 MDL-36708 files: Checking the size limit of a draft area does include references 2013-01-15 13:48:05 +08:00
Ankit Agarwal
5e1350abaa MDL-37077 webservices: Define the ws api method for deleting calendar events 2013-01-15 13:23:13 +08:00
Dan Poltawski
8b16bbfc68 Merge branch 'MDL-35556d' of git://github.com/srynot4sale/moodle 2013-01-15 13:15:31 +08:00
Dan Poltawski
cc1521f57b Merge branch 'MDL-37355-master' of git://github.com/mouneyrac/moodle 2013-01-15 13:11:46 +08:00
Dan Poltawski
27885779bc Merge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle 2013-01-15 13:06:10 +08:00
Dan Poltawski
37f3f3ac73 Merge branch 'wip-MDL-30316-master' of git://github.com/phalacee/moodle 2013-01-15 12:46:44 +08:00
Dan Poltawski
aa452f97e3 Merge branch 'MDL-29835_master' of git://github.com/pauln/moodle 2013-01-15 12:41:13 +08:00
Dan Poltawski
28cfdfe180 Merge branch 'MDL-37366-master' of git://github.com/andrewnicols/moodle 2013-01-15 12:10:10 +08:00
Sam Hemelryk
c8d3475e17 Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle 2013-01-15 16:30:36 +13:00
Erik Lundberg
af7e05d6cc MDL-34436 - Blogs - Adding event triggers when adding a new entry, editing an entry or remove an entry. 2013-01-15 11:29:12 +08:00
Dan Poltawski
a0ea4d9fe1 Merge branch 'MDL-37415-m' of git://github.com/andrewnicols/moodle 2013-01-15 11:09:27 +08:00
David Monllao
6b21986911 MDL-37457 testing Mark current classes as deprecated 2013-01-15 11:07:45 +08:00
David Monllao
5c3c2c81be MDL-37457 testing Refactoring references 2013-01-15 11:07:43 +08:00
Dan Poltawski
121d7a3f7d Merge branch 'MDL-37413-m' of git://github.com/andrewnicols/moodle 2013-01-15 10:58:31 +08:00
Paul Nicholls
d7c29c2257 MDL-32652 - Make block drag-drop work throughout Moodle
Other than shifting the initialisation from course/lib.php to
lib/outputrequirementslib.php, some workarounds/tweaks were required
in order to make it work correctly on admin pages and My Home.
2013-01-15 14:55:31 +13:00
Eloy Lafuente (stronk7)
f38ac3510a Merge branch 'w02_MDL-37483_m25_redirect' of git://github.com/skodak/moodle 2013-01-14 23:29:55 +01:00
Rajesh Taneja
72b181ba59 MDL-36674 Administration: out_as_local_url will check for both http and https url's
out_as_local_url will first check if url passed in wwwroot, if it's not then it will check
if loginhttps is enabled and url is httpswwwroot
2013-01-14 15:59:06 +08:00
Dan Poltawski
5c2aacc21c Merge branch 'MDL-37143-master' of git://github.com/mouneyrac/moodle 2013-01-14 15:34:29 +08:00
Dan Poltawski
5590e85e1a Merge branch 'w02_MDL-37286_m25_tracebuffer' of git://github.com/skodak/moodle 2013-01-14 15:11:42 +08:00
Dan Poltawski
ddaf0983b2 Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle 2013-01-14 15:05:15 +08:00
Marina Glancy
a03dfb7dbe MDL-37207 Add modchoosertoggle in renderer to allow themes to override 2013-01-14 15:10:07 +11:00
Marina Glancy
ff233851a0 MDL-36967 Deprecate function print_overview() 2013-01-14 15:05:31 +11:00
Marina Glancy
9a36be7361 MDL-37085 Properly deprecated functions print_xxx() from course/lib.php
- get_print_section_cm_text()
- print_section_add_menus()
- print_section()
- make_editing_buttons()
2013-01-14 15:01:28 +11:00
Marina Glancy
5c016ab30d MDL-37085 fixed mess with code overwriting cm_info properties
In case when groupmode is forced by the course we should take it from the
course and not overwrite cm_info::groupmode externally
2013-01-14 15:01:25 +11:00
Marina Glancy
f89c53f679 MDL-37085 Substitute get_print_section_cm_text() with cm_info functions 2013-01-14 15:01:21 +11:00
Rossiani Wijaya
8be244b2e2 MDL-36553 Admin settings: make tables class consistent throughout admin plugins setting 2013-01-14 10:09:51 +08:00
Andrew Robert Nicols
699a13e1a6 MDL-37366 Fix JS Lint issues with moodle-core-formautosubmit 2013-01-13 23:58:04 +00:00
Sam Hemelryk
d9a3d932db Merge branch 'MDL-37397-m' of git://github.com/andrewnicols/moodle 2013-01-14 11:04:52 +13:00
Petr Škoda
ee17c773c1 MDL-37483 improve require_login redirect when activity not accessible 2013-01-13 11:37:14 +01:00
Petr Škoda
4fa7fdeada MDL-37286 improve coding style in unit tests 2013-01-12 15:28:57 +01:00
Petr Škoda
e7259ec998 MDL-37286 add new combined_progress_trace
This type of trace should be useful when multiple trace outputs requested.
2013-01-12 15:16:39 +01:00
Petr Škoda
78048e15f2 MDL-37286 add error_log progress trace 2013-01-12 15:16:38 +01:00
Petr Škoda
837e304260 MDL-37286 add progres_trace buffer and unit tests 2013-01-12 15:16:38 +01:00
Petr Škoda
01b4040a27 MDL-37429 zipping improvements
Changes:
* zip_packer can create empty zip archives
* new option to ignore problematic files when creating archive
* detection of non-existent files
* debugging messages for opening of faulty zip archives
* coding style improvements
* no PHP 5.2 hacks
* more unit tests
2013-01-12 14:58:26 +01:00
Andrew Robert Nicols
8743aabca0 MDL-37397 Test for a valid select in formautosubmit
Ideally we shouldn't get into this situation, but in cases where the
generated select element is incorrectly configured, we should try and
handle it gracefully with a warning.
2013-01-11 11:49:44 +00:00
Eloy Lafuente (stronk7)
b64a33bade fix permissions 2013-01-11 12:23:22 +01:00
Andrew Robert Nicols
f96ec5ad96 MDL-37413 Use correct variable in chooserdialogue 2013-01-11 08:18:47 +00:00