mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-22 02:49:53 +01:00
Code Issues Projects Releases Wiki Activity
47,333 Commits 36 Branches 523 Tags
Commit Graph

47333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
83ee4693c5 Merge branch 'MDL-26908' of git://github.com/samhemelryk/moodle 2011-03-21 19:08:46 +01:00
Petr Skoda
7b2dde5a80 Merge branch 'wip-MDL-26747' of git://github.com/sammarshallou/moodle 2011-03-21 19:06:28 +01:00
Petr Skoda
94ff0f08f3 Merge branch 'MDL-26922' of git://github.com/stronk7/moodle 2011-03-21 19:02:16 +01:00
Eloy Lafuente (stronk7)
f80de2f25c MDL-26922 dml - avoid PHP_INT_MAX overflow on limit queries 2011-03-21 18:49:08 +01:00
Petr Skoda
25bd4d9a37 Merge branch 'MDL-26847_amended' of git://github.com/timhunt/moodle 2011-03-21 18:10:35 +01:00
Eloy Lafuente (stronk7)
4386e0d101 Merge branch 'master' of git.moodle.org:/git/integration 2011-03-21 18:04:25 +01:00
Petr Skoda
2c23734a7f Merge branch 'MDL-25975' of git://github.com/samhemelryk/moodle 2011-03-21 18:02:46 +01:00
Petr Skoda
61baea5d22 Merge branch 'MDL-26903' of git://github.com/samhemelryk/moodle 2011-03-21 18:00:07 +01:00
Eloy Lafuente (stronk7)
1f95c9a4af Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle 2011-03-21 17:55:40 +01:00
Petr Skoda
cd278cd454 MDL-26842 fix invalid parameter mix discovered by the new test 2011-03-21 17:19:36 +01:00
Eloy Lafuente (stronk7)
1997d9dc1d Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle 2011-03-21 16:38:19 +01:00
Petr Skoda
4c1638c10f MDL-26842 fix o_ prefix regression 2011-03-21 16:32:09 +01:00
Eloy Lafuente (stronk7)
c0c232ab63 Merge branch 'master' of git.moodle.org:/git/integration 2011-03-21 16:31:27 +01:00
Tim Hunt
af7b3673d7 MDL-26847 new method file_storage::delete_area_files_select for efficient bulk file deletion. 2011-03-21 15:21:02 +00:00
Petr Skoda
10464ffb33 Merge branch 'MDL-26887' of git://github.com/timhunt/moodle 2011-03-21 15:39:31 +01:00
Eloy Lafuente (stronk7)
7a5852c857 Merge branch 'w12_MDL-26844_20_limittests' of git://github.com/skodak/moodle 2011-03-21 15:35:17 +01:00
Eloy Lafuente (stronk7)
9c3865c81c MDL-25565 - fix borked merge. The power of one curly bracket! 2011-03-21 15:32:24 +01:00
Petr Skoda
dca072aedc Merge branch 'MDL-26571_lesson_scale' of git://github.com/andyjdavis/moodle 2011-03-21 14:52:11 +01:00
Petr Skoda
e5be555c27 Merge branch 'MDL-26768_0_grade' of git://github.com/andyjdavis/moodle 2011-03-21 14:49:18 +01:00
Petr Skoda
949fe7154c Merge branch 's8_MDL-26919_search_dialog_event' of git://github.com/dongsheng/moodle 2011-03-21 14:46:59 +01:00
Petr Skoda
d96b0a969b Merge branch 'wip-MDL-26822' 2011-03-21 14:03:33 +01:00
Petr Skoda
ae8c1f3d06 MDL-26822 fix whitespace 2011-03-21 14:02:50 +01:00
Dongsheng Cai
e4e9e853d2 Fix three minor filepicker bugs: 1. use language string in search dialog instead of hard code filepicker MDL-26915 2. search dialog now response to enter key MDL-26919 3. search dialog should be modal mode MDL-26918 2011-03-21 20:56:36 +08:00
Sam Hemelryk
8196e3c08d Merge branch 'MDL-26557' of git://git.luns.net.uk/moodle 2011-03-21 17:32:06 +08:00
Sam Hemelryk
587a4ee42c Merge branch 'MDL-26827' of git://git.luns.net.uk/moodle 2011-03-21 17:23:13 +08:00
Sam Hemelryk
c889fb8372 Merge branch 'w12_MDL-26904_20_PHPLOL' of git://github.com/skodak/moodle 2011-03-21 17:19:06 +08:00
Sam Hemelryk
beb81f4947 Merged PULL-496/MDL-26859 and fixed incorrect defines 2011-03-21 17:13:20 +08:00
Sam Hemelryk
ee780aeeaf Merge branch 'w12_MDL-26876_20_blogformat' of git://github.com/skodak/moodle 2011-03-21 16:50:07 +08:00
Sam Hemelryk
d9738e84d6 Merged PULL-480/MDL-24877 and bumped version number to fix conflict 2011-03-21 15:58:19 +08:00
Sam Hemelryk
161ba40d03 Merge branch 'w12_MDL-26808_20_enrolpageurl' of git://github.com/skodak/moodle 2011-03-21 15:47:36 +08:00
Sam Hemelryk
ca3fce634f Merge branch 'w12_MDL-26826_20_youtubedim' of git://github.com/skodak/moodle 2011-03-21 14:27:45 +08:00
Sam Hemelryk
909fc3ff2e Merge branch 'w12_MDL-26726_20_typocat' of git://github.com/skodak/moodle 2011-03-21 14:16:51 +08:00
Sam Hemelryk
e460480080 Merge branch 'w12_MDL-26825_20_cancelform' of git://github.com/skodak/moodle 2011-03-21 14:10:44 +08:00
Sam Hemelryk
d1f5425171 Merge branch 'w12_MDL-26837_20_algebra' of git://github.com/skodak/moodle 2011-03-21 13:37:36 +08:00
Sam Hemelryk
1698268db1 Merge branch 'w12_MDL-26834_20_inactiveparticipants' of git://github.com/skodak/moodle 2011-03-21 13:30:59 +08:00
Sam Hemelryk
885e86b108 Merge branch 'w12_MDL-26833_20_inactiveforum' of git://github.com/skodak/moodle 2011-03-21 12:36:47 +08:00
Sam Hemelryk
37fff87398 Merge branch 'w12_MDL-26803_20_userupload' of git://github.com/skodak/moodle 2011-03-21 12:28:45 +08:00
Sam Hemelryk
b89d39bfcb Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle 2011-03-21 12:22:23 +08:00
Sam Hemelryk
9d61397181 Merge branch 'MDL-26607_search_error' of git://github.com/andyjdavis/moodle 2011-03-21 11:54:20 +08:00
Sam Hemelryk
0235bd8706 Merged MDL-25565 PULL-451 and fixed conflicts 2011-03-21 11:16:50 +08:00
Sam Hemelryk
553669ae17 navigation MDL-26908 Fixed up positioning of icons for items that are both expandable and have an icon 2011-03-21 10:45:23 +08:00
Sam Hemelryk
c78262b542 navigation MDL-26903 Fixed regression to navigation ajax after CM changes 2011-03-21 10:22:28 +08:00
Matteo Scaramuccia
c6e46d37bc MDL-26905 - Fixed missing of currentorg initialization in AICC API 2011-03-20 23:54:39 +01:00
Petr Skoda
7119e1a0a7 MDL-26904 fix funny constant typo 2011-03-20 19:25:47 +01:00
Petr Skoda
8f6c1f3488 MDL-26859 improve blog access control and prevent unnecessary blog includes 2011-03-20 13:34:51 +01:00
Petr Skoda
5b183f51a8 MDL-26859 do not show "my blog" link to guests and not-logged-in users 2011-03-20 12:34:41 +01:00
Petr Skoda
fd85ceac57 MDL-26859 improve coding style in blog related blocks 2011-03-20 12:29:22 +01:00
Petr Skoda
d9e0b80ffb MDL-26859 automatically enable and disable blog related blocks when bloglevel changed 2011-03-20 12:28:34 +01:00
Petr Skoda
61c32b7b27 MDL-26808 solve chicken-egg problem with moodle url on the user enrolments page 2011-03-20 11:03:16 +01:00
Petr Skoda
d6614d667d MDL-26876 use correct blog post format when migrating to forum posts 2011-03-20 08:28:46 +01:00