mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
54,039 Commits 36 Branches 519 Tags
Commit Graph

13486 Commits

Author SHA1 Message Date
Dan Poltawski
e73b42ca57 Merge branch 'wip-MDL-33399-m23' of git://github.com/samhemelryk/moodle 2012-05-29 14:57:05 +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
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
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
Marina Glancy
140669a9dd MDL-33026 set default author and license in drag-n-drop upload 2012-05-28 17:05:25 +08:00
Dan Poltawski
6bea694b6c Revert "MDL-33212 Course page: Eye icon should override other conditions" 
This reverts commit 5d0d373733a42d1b5b25716c8d11087debd62942.
 2012-05-28 16:57:41 +08: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
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
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
Sam Hemelryk
bdb315cca2 Merge branch 'w21_MDL-32972_m23_avatargifs' of git://github.com/skodak/moodle 2012-05-28 17:05:10 +12: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 4be0947bbe63f32f38aa1698d4bbb9068d7a9dc9.
 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
Sam Hemelryk
d8a05d83b5 Merge branch 'MDL-32752-master-1' of git://git.luns.net.uk/moodle 2012-05-28 14:56:06 +12:00
Sam Hemelryk
9757d47ebf Merge branch 'MDL-33084_strict_calc' of git://github.com/andyjdavis/moodle 2012-05-28 14:07:59 +12:00
Dan Poltawski
4ad85bd857 MDL-33359 - mtrace: dont output to STDOUT in unit tests 
This allows us to use phpunit output buffering functions
 2012-05-28 09:36:12 +08:00
Sam Hemelryk
c31081d0a4 Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle 
Conflicts:
	version.php
 2012-05-28 11:19:06 +12:00
Sam Hemelryk
63f2813497 Merge branch 'dev_MDL-33147_transaction' of git://github.com/dongsheng/moodle 2012-05-28 11:04:43 +12:00
Dan Marsden
d2e3a1b4f9 MDL-27368 Clean up invalid course completion records 
keep oldest timestamps from all records
 2012-05-28 08:55:57 +12:00
Charles Fulton
80c27aab8c MDL-27559 opendir: validate directory pointer on open 2012-05-25 08:52:12 -07:00
Ruslan Kabalin
a252a14835 MDL-33192: Prevent global DDM conflicting with others drag-drop instances. 2012-05-25 16:33:39 +01:00
Dan Poltawski
e7b7cd5b98 Merge branch 'w21_MDL-33075_m23_phpunitclassreflex' of git://github.com/skodak/moodle 2012-05-25 15:25:30 +08:00
Aparup Banerjee
708738cd73 Merge branch 'wip-MDL-33324-master' of git://github.com/marinaglancy/moodle 2012-05-25 11:25:25 +08:00
Dan Poltawski
9a16bd1798 Merge branch 'w22_MDL-33114_m23_tinymce3511' of git://github.com/skodak/moodle 2012-05-25 11:00:53 +08:00
Dan Poltawski
588d3a7e1f Merge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle 2012-05-25 10:55:49 +08:00
Dan Poltawski
10a9d27d74 Merge branch 'w21_MDL-33034_m23_roletests' of git://github.com/skodak/moodle 2012-05-25 10:37:48 +08:00
Dan Poltawski
753199ba63 Merge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle 2012-05-25 09:57:35 +08:00
Frederic Massart
4c88645920 MDL-33173 Filepicker: renamed private files edit page to main page 2012-05-25 09:24:39 +08:00
Sam Hemelryk
6347a6216d MDL-33172: Fixed whitespace 2012-05-25 11:37:07 +12:00
Dan Poltawski
3447100cdb MDL-33172 - filestorage: Fix oracle incompatibilites 
Fixes the following problems:

* When we select from two tables with the same named fields (id)
  and ask to sort by that field, Oracle doesn't know which table to
  sort frm unless that field is named in the SELECT. Here we do that
  by explicitly naming the fields. This keeps compatibility with before
  the reference table was added.

* Text comparisong without sql_compare_text
 2012-05-25 11:17:56 +12:00
Dan Poltawski
ac29403e39 MDL-33172 - filestorage: Add unit test for breaking oracle functions 2012-05-25 11:17:56 +12:00
Petr Skoda
798f0dece2 MDL-33114 import TinyMCE 3.5.1.1 and fix preview 2012-05-24 23:15:52 +02:00
Dan Poltawski
4b0992ca19 Merge branch 'wip-MDL-33329-master' of git://github.com/marinaglancy/moodle 2012-05-24 23:30:23 +08:00
Dan Poltawski
0fb13aa3d8 Merge branch 'dev_MDL-33127_draft_storing' of git://github.com/dongsheng/moodle 2012-05-24 16:34:32 +08:00
Dan Poltawski
2625d99b52 Merge branch 'wip-MDL-33144-master' of git://github.com/marinaglancy/moodle 2012-05-24 16:32:32 +08:00