mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
54,016 Commits 36 Branches 523 Tags
Commit Graph

54016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
29304b6c7d Merge branch 'MDL-33401-master' of git://github.com/ankitagarwal/moodle 2012-06-05 12:34:29 +08:00
Dan Poltawski
820b845415 Merge branch 'MDL-33476' of git://github.com/esqueeze/moodle 2012-06-05 12:15:47 +08:00
Dan Poltawski
490ef89365 Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle 2012-06-05 12:09:44 +08:00
Dan Poltawski
ac0ad29c6f Merge branch 'MDL-33319' of git://github.com/netspotau/moodle-mod_assign 2012-06-05 12:03:56 +08:00
Dan Poltawski
d54020bf4c Merge branch 'MDL-30880_feedback_property' of git://github.com/andyjdavis/moodle 2012-06-05 11:58:32 +08:00
Tim Barker
8de9272c6c MDL-33476 repositories: Added instructions to assist with setting up Dropbox keys 2012-06-05 10:19:06 +08:00
Dan Poltawski
f7091beef4 Merge branch 'MDL-33485' of git://github.com/timhunt/moodle 2012-06-05 10:16:44 +08:00
Dan Poltawski
7e5789c12c Merge branch 'wip-tablelib' of git://github.com/marinaglancy/moodle 2012-06-05 10:10:21 +08:00
Dan Poltawski
92c1f40445 MDL-31460 mod_forum: fix trailing whitespace 2012-06-05 09:34:26 +08:00
Dan Poltawski
50bc155cce Merge branch 'MDL-31460_unsubscribe' of git://github.com/andyjdavis/moodle 2012-06-05 09:33:38 +08:00
Marina Glancy
2ea47082f0 MDL-33479 removed legacy constructor causing strict notice in php5 2012-06-05 09:27:32 +08:00
Marina Glancy
9945ec5e13 MDL-33445 Added file size check to files inserted by reference 2012-06-05 09:26:26 +08:00
Marina Glancy
2dfa16ef8a MDL-33409 Newly copied files should take on the userid of the current user, and dates reset 
- changed function repository::copy_to_area so it accepts more file attributes, pass changed attributes to it
- changed file_info::copy_to_storage and file_info_stored::copy_to_storage to accept more file attributes
- simplified file size check for moodle files in repository/repository_ajax.php
- removed unused code in repository/repository_ajax.php
 2012-06-05 09:26:26 +08:00
Helen Foster
3c97ce2461 MDL-31803 lang - make the mooch registration message more descriptive 2012-06-05 09:09:52 +08:00
Ankit Agarwal
586e797689 MDL-33401 blocks: Allow managers to have block:edit capability by default 2012-06-05 08:50:43 +08:00
Eloy Lafuente (stronk7)
0b1f477618 Merge branch 'MDL-32649_ratings_sort' of git://github.com/andyjdavis/moodle 2012-06-05 02:22:33 +02:00
Eloy Lafuente (stronk7)
aa12ec984c MDL-32985 cron: prevent notices on "new" sites. 2012-06-05 02:14:13 +02:00
Eloy Lafuente (stronk7)
4baa746eae Merge branch 'MDL-32985' of git://github.com/merrill-oakland/moodle 2012-06-05 02:02:12 +02:00
Eloy Lafuente (stronk7)
d291dfd0aa Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle 2012-06-05 00:42:59 +02:00
Eloy Lafuente (stronk7)
c76bd30885 Merge branch 'MDL-33133-master' of git://github.com/sammarshallou/moodle 2012-06-05 00:38:04 +02:00
Eloy Lafuente (stronk7)
080f585f39 Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle 2012-06-04 21:47:14 +02:00
Eloy Lafuente (stronk7)
0b702fca0b Merge branch 'w23_MDL-33436_m23_testprinter' of git://github.com/skodak/moodle 2012-06-04 19:55:21 +02:00
Dan Poltawski
b3245b758c Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle 
Conflicts:
	admin/index.php
	admin/renderer.php
	version.php
 2012-06-04 19:25:58 +08:00
Eloy Lafuente (stronk7)
a301675101 Merge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle 2012-06-04 11:33:47 +02:00
Dan Poltawski
1cf840074b Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle 2012-06-04 17:13:35 +08:00
Dan Poltawski
f27735e470 Merge branch 'MDL-33480' of git://github.com/stronk7/moodle 2012-06-04 16:59:49 +08:00
Petr Skoda
03f0cd1039 MDL-33007 fix incorrect min_fix_utf8() tests 
Credit goest to Eloy Lafuente.
 2012-06-04 10:45:44 +02:00
Dan Poltawski
1cbaf803d0 MDL-29173 - fix whitespace error 2012-06-04 16:32:25 +08:00
Dan Poltawski
6f337ea935 Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle 2012-06-04 15:55:54 +08:00
Dan Poltawski
7b61ac39d2 MDL-33507 - oauth2lib: switch 'code' to oauth2code 
To avoid param collisions in future.
 2012-06-04 11:25:19 +08:00
Dan Poltawski
5df1b73748 MDL-33501 - oauth2lib: enforce sesskey in oauth2callback.php 
The sesskey needs to be embeded in the local url returned as this is the
only parameter we have control of.
 2012-06-04 11:11:38 +08:00
Dan Poltawski
db7602af7c MDL-33501 - oauth2lib: improve redirect url handling 
Only accept PARAM_LOCALURL for state params and enforce
use of moodle_url param in oauthlib to facilitate that.
 2012-06-04 10:57:39 +08:00
Andrew Davis
c84d86e0b7 MDL-30880 grade: added a check for the feedback property existing before it is used 2012-06-04 09:17:06 +07:00
Andrew Davis
74a37e1deb MDL-31460 mod_forum: added some controls to mod/forum/unsubscribeall.php to prevent the removal of subscriptions the user shouldnt be able to delete 2012-06-04 09:16:21 +07:00
Andrew Davis
94e40193a4 MDL-32649 rating: fixed the sorting in /rating/index.php 2012-06-04 09:13:26 +07:00
Eloy Lafuente (stronk7)
34570f86bc MDL-33480 book print tool: display intro images properly 2012-06-04 01:46:53 +02:00
Petr Skoda
bd672f7830 MDL-33436 include phpunit printer file from our lib.php 
The problem is that the phpunit.xml does not support relative links.
 2012-06-02 21:48:26 +02:00
Tim Hunt
fc86f69b52 MDL-33485 quiz manual grading report: fix SQL typo. 2012-06-01 08:11:48 -06:00
sam marshall
38d06fea66 MDL-32107 Activity completion: should use get_enrolled_sql instead of reinventing wheel 2012-06-01 12:25:59 +01:00
Petr Skoda
0aff15c2c9 MDL-33007 add workaround for broken iconv //IGNORE 
This patch adds mbstring utf-8 cleanup fallback and admin warning if no utf-8 cleanup possible in user submitted data.
 2012-06-01 12:23:09 +02:00
Petr Skoda
3681e78429 MDL-33007 add buggy iconv workaround to configonlylib, add tests and fix minor issues 2012-06-01 12:23:09 +02:00
Dan Poltawski
4db061680e on-demand release 2.3dev 2012-06-01 17:03:32 +08:00
Dan Poltawski
fe591d0d24 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-06-01 17:01:41 +08:00
Sam Hemelryk
84ec16a861 Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle 2012-06-01 13:42:01 +12:00
Eloy Lafuente (stronk7)
5669b28d59 Merge branch 'MDL-33326' of git://github.com/stronk7/moodle 2012-06-01 00:58:08 +02:00
Eloy Lafuente (stronk7)
dac01a7444 Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle 2012-05-31 16:14:57 +02:00
Dan Poltawski
c9bd018825 Merge branch 'MDL-33434' of git://github.com/stronk7/moodle 2012-05-31 16:59:23 +08:00
Aparup Banerjee
267080d4ea Merge branch 'MDL-33040-master-1' of git://git.luns.net.uk/moodle 2012-05-31 15:20:53 +08:00
Aparup Banerjee
ffbe29a6bd Merge branch 'MDL-33140' of git://github.com/timhunt/moodle 2012-05-31 14:15:19 +08:00
Frederic Massart
ccc604a24d MDL-33398 Cron: fix wrong variable type in completion criterias 2012-05-31 12:50:38 +08:00