moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54111 commits 37 branches 540 tags 1.3 GiB
Commit graph

54111 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aparup Banerjee
7f1fcda5ad Revert "Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle" 
MDL-27120 backup: reverting due to phpunit failure at backup/converter/moodle1/tests/fixtures/lib_test.php test_stash_storage()

This reverts commit c70b7fd81f, reversing
changes made to e6f5528585.
 2012-05-29 14:29:09 +08:00
Martin Dougiamas
5fece0f28d MDL-33404 Fix defaults for ordinary files that are drag/dropped into the course page 2012-05-29 12:58:24 +08:00
Sam Hemelryk
849b9a6af7 MDL-33399 mixed: Fixed up calls to get_area_files that used empty sorts 2012-05-29 16:44:28 +12:00
Sam Hemelryk
9f4789b842 MDL-33399 files: Fixed up handling of empty sort in File API methods. 
The following three methods of file_storage have been patched:
* get_external_files
* get_area_files
* get_directory_files
 2012-05-29 16:38:47 +12:00
Aparup Banerjee
c70b7fd81f Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle 2012-05-29 10:26:21 +08:00
Dan Poltawski
f40f6c14b1 MDL-32221 - googledocs: Add support for all file types. 
Now google supports 'file' as well as converted formats.
 2012-05-29 10:13:21 +08:00
Dan Poltawski
9b27ffa042 MDL-29857 - portfolio: Fix E_STRICT errors 2012-05-29 10:13:20 +08:00
Sam Hemelryk
e6f5528585 MDL-28949 upgrade: Split course completion upgrade into smaller chunks 2012-05-29 08:50:45 +12:00
Sam Hemelryk
bd633dda9a Merge branch 'MDL-28949d' of git://github.com/srynot4sale/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-05-29 08:49:29 +12:00
Eloy Lafuente (stronk7)
b3520a4ae7 Merge branch 'MDL-33359' of git://github.com/danpoltawski/moodle 2012-05-28 21:25:01 +02:00
sam marshall
540f89d7d4 MDL-33212 Course page: Eye icon should override other conditions 2012-05-28 16:17:39 +01:00
Ruslan Kabalin
c1d09c6fa3 MDL-33042: Assign: get rid of email statements in messaging functions 2012-05-28 11:48:18 +01:00
David Mudrak
77a439336f MDL-33378 file thumbnail falls back to the default mimetype icon 
If for some reason the thumbnail generation fails, the default core
mimetype icon for the given file is sent to the browser.
 2012-05-28 12:19:05 +02:00
Ruslan Kabalin
599f7a279c MDL-33045: Assign: remove references to old assignment in URLs 2012-05-28 10:53:40 +01:00
Ruslan Kabalin
f5b32abe57 MDL-33045: Assign: Make get_module_name() return something 2012-05-28 10:52:11 +01:00
Marina Glancy
140669a9dd MDL-33026 set default author and license in drag-n-drop upload 2012-05-28 17:05:25 +08:00
David Mudrak
2da7fbc0c2 MDL-33382 CLI install and upgrade scripts display hint on --allow-unstable in non-interactive mode 2012-05-28 10:59:22 +02:00
Dan Poltawski
6bea694b6c Revert "MDL-33212 Course page: Eye icon should override other conditions" 
This reverts commit 5d0d373733.
 2012-05-28 16:57:41 +08:00
Marina Glancy
f92b65e5a6 MDL-33377 Do not allow to link to course files since reference is preferable 2012-05-28 16:27:22 +08:00
Petr Skoda
716b50dc2c MDL-33001 improve error handling in mysql engine conversion tool and add listing of engines 2012-05-28 10:25:58 +02:00
Petr Skoda
b7c5627f5b MDL-33089 flag test database as soon as possible in PHPUnit init 2012-05-28 10:10:32 +02:00
Petr Skoda
17b60e9d98 MDL-33089 detect more problems when initialising PHPUnit test environment 2012-05-28 10:10:32 +02:00
Dan Poltawski
f18dd15d3e Merge branch 'wip-MDL-33321-master' of git://github.com/kwiliarty/moodle 2012-05-28 16:10:16 +08:00
Dan Poltawski
da5cd8cee8 Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle 2012-05-28 16:03:03 +08:00
Dan Poltawski
995e479067 Merge branch 'wip-MDL-33338-master' of git://github.com/marinaglancy/moodle 2012-05-28 15:43:33 +08:00
Dan Poltawski
830fdc8ce8 Merge branch 'wip-MDL-33356-master' of git://github.com/marinaglancy/moodle 2012-05-28 15:37:31 +08:00
Dan Poltawski
ffec9bc70f Merge branch 'MDL-31393' of git://github.com/timhunt/moodle 2012-05-28 15:23:01 +08:00
Marina Glancy
4c2fcbfc85 MDL-33338 recognising the mimetype for uploaded files 
- when file is uploaded in php, the tmpname does not have initial extension and mimetype recognition by extension fails
- another issue is that import form for questions fails with fatal error when it should just say that field is required
 2012-05-28 15:19:41 +08:00
Dan Poltawski
5ab310d5d3 Merge branch 'wip-MDL-32199-master' of git://github.com/abgreeve/moodle 2012-05-28 15:18:51 +08:00
Dan Poltawski
0fe4db6dd1 Merge branch 'MDL-33194-master' of https://github.com/mackensen/moodle 2012-05-28 14:58:56 +08:00
Dan Poltawski
c865e08fab Merge branch 'MDL-32860_user_iterator' of git://github.com/andyjdavis/moodle 2012-05-28 14:56:48 +08:00
Dan Poltawski
d079d6d8c1 Merge branch 'MDL-33110_master' of git://github.com/lazydaisy/moodle 2012-05-28 14:54:23 +08:00
Dan Poltawski
54495fe41d MDL-33375 course: set anchor after changing sections 
So scrolling isn't required
 2012-05-28 14:44:23 +08:00
Dan Poltawski
3f1bca9d56 Merge branch 'master_MDL-27368' of git://github.com/danmarsden/moodle 
Conflicts:
	version.php
    lib/db/upgrade.php
 2012-05-28 14:32:16 +08:00
Marina Glancy
6adb5f1363 MDL-33356 fixed a regression after function form_filemanager_redner() was deleted 2012-05-28 13:52:32 +08:00
Adrian Greeve
17ec4bf045 Alteration to the code to hide the body of the post / discussion 2012-05-28 13:09:23 +08:00
Andrew Robert Nicols
7ea78d9f28 MDL-32199 Ensure that forum RSS feeds don't leak posts and discussions 2012-05-28 13:09:22 +08:00
Sam Hemelryk
bdb315cca2 Merge branch 'w21_MDL-32972_m23_avatargifs' of git://github.com/skodak/moodle 2012-05-28 17:05:10 +12:00
Dan Poltawski
193198187c Merge branch 'wip-mdl-33347' of git://github.com/rajeshtaneja/moodle 2012-05-28 13:01:44 +08:00
Sam Hemelryk
c67b08828c MDL-18763 Fixed up typo in comments of new pic size 2012-05-28 16:52:53 +12:00
Sam Hemelryk
a2aba3f612 Merge branch 'w21_MDL-18763_m23_avatar512' of git://github.com/skodak/moodle 2012-05-28 16:50:46 +12:00
Rossiani Wijaya
8d5745fa92 MDL-32766: course view section log: fixed typo for course_sections table 
Conflicts:

	version.php
 2012-05-28 16:46:29 +12:00
Dan Poltawski
287451dcd4 Revert "MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php" 
Breaking unit tests.

This reverts commit 4be0947bbe.
 2012-05-28 12:37:50 +08:00
Dan Poltawski
83ae05f620 Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle 2012-05-28 12:16:12 +08:00
Aaron Barnes
424a19b106 MDL-28949 course completion: Database structure fixes 2012-05-28 16:13:25 +12:00
Marina Glancy
5e11746696 MDL-33218 fixing filemanager/filepicker look in IE 
now all YUI dialogues are under the div with id #filesskin. This way we can avoid using !important in CSS and use #filesskin instead. It will have priority over YUI skin in all browswers including IE (!important does not work in IE).

Conflicts:

	files/renderer.php
	theme/base/style/filemanager.css
 2012-05-28 11:54:33 +08:00
Dan Poltawski
131bd2f68f Merge branch 'MDL-33192-master-1' of git://git.luns.net.uk/moodle 2012-05-28 11:47:22 +08:00
Barbara Ramiro
6077e3813c MDL-33218 Filemanager and Filepicker IE issue 2012-05-28 11:44:51 +08:00
Damyon Wiese
2c6a3dbfca MDL-33319: Support quickgrading in feedback plugins 2012-05-28 11:10:09 +08:00
Sam Hemelryk
d8a05d83b5 Merge branch 'MDL-32752-master-1' of git://git.luns.net.uk/moodle 2012-05-28 14:56:06 +12:00