moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 19:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60290 commits 37 branches 544 tags 1.3 GiB
Commit graph

60290 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
5c70d6505a Merge branch 'MDL-37768_master' of git://github.com/dmonllao/moodle 2013-02-12 15:44:17 +08:00
Dan Poltawski
2b8741aaa6 Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle 2013-02-12 15:08:53 +08:00
Rajesh Taneja
afd5e85ca8 MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default 2013-02-12 14:57:47 +08:00
Damyon Wiese
147f592742 Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle 
Conflicts:
	course/tests/behat/add_activities.feature
 2013-02-12 14:48:40 +08:00
Damyon Wiese
f49ec42973 Merge branch 'MDL-37750_master-fix' of git://github.com/dmonllao/moodle 2013-02-12 14:47:50 +08:00
Damyon Wiese
2262c52122 Merge branch 'MDL-37012-master' of git://github.com/mouneyrac/moodle 2013-02-12 14:39:20 +08:00
Damyon Wiese
5926f85960 Merge branch 'wip-mdl-20131' of git://github.com/rajeshtaneja/moodle 2013-02-12 14:15:29 +08:00
David Monllao
333cb91fbf MDL-37750 behat: Removing (now) collapsed elements 2013-02-12 14:06:51 +08:00
Dan Poltawski
26f94655d5 Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle 2013-02-12 13:47:37 +08:00
Dan Poltawski
4dea0a7719 Merge branch 'MDL-37074-master' of git://github.com/damyon/moodle 2013-02-12 13:39:07 +08:00
Tim Hunt
b4be77c570 MDL-37924 quiz settings: change wrong 'fix' => 'adv'. 2013-02-12 13:36:54 +08:00
Damyon Wiese
6904688967 Merge branch 'MDL-37654_master' of https://github.com/markn86/moodle 2013-02-12 13:09:18 +08:00
Damyon Wiese
7339d6c0e9 Merge branch 'MDL-37164_message_self' of git://github.com/andyjdavis/moodle 2013-02-12 12:12:44 +08:00
Damyon Wiese
dad4fa26e7 Merge branch 'MDL-37828_master' of git://github.com/lazydaisy/moodle 2013-02-12 11:40:40 +08:00
Rajesh Taneja
390ef41e02 MDL-20131 Glossary: Fixed courseid typo 2013-02-12 10:57:10 +08:00
Dan Poltawski
501bdad2b9 Merge branch 'wip-MDL-34798_master-2' of git://github.com/gjb2048/moodle 2013-02-12 10:34:07 +08:00
Mark Nelson
8076010d37 MDL-37953 mod_forum: using named parameters to build SQL statement 2013-02-12 10:31:10 +08:00
Damyon Wiese
234fdc206c Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-02-12 10:09:26 +08:00
Marina Glancy
2333bfa7e8 MDL-37976 fixed missing global 2013-02-12 12:59:35 +11:00
Dan Poltawski
008a6514ae Merge branch 'MDL-37952' of git://github.com/stronk7/moodle 2013-02-12 09:45:38 +08:00
Dan Poltawski
08eef1a4bd Merge branch 'MDL-37886_master' of git://github.com/dmonllao/moodle 2013-02-12 09:43:50 +08:00
Damyon Wiese
87c9271514 MDL-37831: Version bump for js changes. 2013-02-12 09:34:02 +08:00
Damyon Wiese
82708d0615 Merge branch 'MDL-37831_filepicker_buttons' of git://github.com/davosmith/moodle 2013-02-12 09:15:23 +08:00
Eloy Lafuente (stronk7)
e8e6802225 Merge branch 'MDL-37943' of git://github.com/timhunt/moodle 2013-02-12 01:20:56 +01:00
Eloy Lafuente (stronk7)
ce9c323635 Merge branch 'MDL-37686-master' of git://github.com/FMCorz/moodle 2013-02-12 01:16:48 +01:00
Eloy Lafuente (stronk7)
625d5f8164 Merge branch 'MDL-37896' of git://github.com/timhunt/moodle 2013-02-12 01:13:18 +01:00
Eloy Lafuente (stronk7)
ef1a4d20d4 Merge branch 'MDL-37919-phpunit-exception' of git://github.com/mudrd8mz/moodle 2013-02-12 01:07:43 +01:00
Eloy Lafuente (stronk7)
9a061c3285 Merge branch 'MDL-35037' of git://github.com/danpoltawski/moodle 2013-02-12 00:59:39 +01:00
Eloy Lafuente (stronk7)
65412c365d Merge branch 'MDL-37961-master' of git://github.com/FMCorz/moodle 2013-02-12 00:43:38 +01:00
Eloy Lafuente (stronk7)
e196517bf5 Merge branch 'wip-MDL-35832-master' of git://github.com/phalacee/moodle 2013-02-11 23:31:38 +01:00
David Mudrák
55834476c4 MDL-37598 Proceed full setup in YUI serving files if needed 
When serving Moodle YUI files, including just moodlelib.php is not enough
any more. We need the full setup in order to use MUC.

Please note that cookies are disabled in these two scripts. This may make
cache_store::MODE_SESSION caches unavailable. We do not expect they will
be needed here.
 2013-02-11 16:35:16 +01:00
Gareth J Barnard
cbddba1887 MDL_34798 format_topics and format_weeks: Adjust section names when moving up. 2013-02-11 13:43:42 +00:00
Dan Poltawski
32f832b22b Merge branch 'master_MDL-35332' of git://github.com/totara/moodle 2013-02-11 16:43:34 +08:00
Simon Coggins
5c4ffeb883 MDL-35332: Use fast hash when generating hashes during tests 2013-02-11 21:38:07 +13:00
Matt Oquist
da48404391 MDL-37953 mod_forum: replace hard-coded numbers with defined values 
mod/forum/lib.php sets forum_posts.mailed to 0, 1, and 2. What do these numbers
mean? This patch creates defined values for these otherwise-mysterious
numbers.
 2013-02-11 15:20:18 +08:00
Damyon Wiese
a052fe8a6b MDL-37122 core get_max_upload_sizes: Removed unit test for no limit as it is depends on settings in php.ini 2013-02-11 15:18:12 +08:00
Dan Poltawski
354348865c Merge branch 'MDL-34137_label_dndupload' of git://github.com/davosmith/moodle 2013-02-11 14:55:13 +08:00
Damyon Wiese
1e7db9fee8 Merge branch 'master_MDL-35332' of git://github.com/totara/moodle 
Conflicts:
	lib/tests/moodlelib_test.php
	version.php
 2013-02-11 14:51:11 +08:00
Frederic Massart
4d3fd60d28 MDL-37961 webservice: PARAM_BOOL with PARAM_DEFAULT accepts boolean default 2013-02-11 14:37:19 +08:00
Dan Poltawski
9d7d0c4f2b Merge branch 'MDL-37039-master' of git://github.com/damyon/moodle 2013-02-11 14:32:53 +08:00
Dan Poltawski
2ae00d0d3c Merge branch 'MDL-37122-master' of git://github.com/damyon/moodle 2013-02-11 14:24:04 +08:00
Dan Poltawski
acd561c66a Merge branch 'MDL-37797' of git://github.com/rwijaya/moodle 2013-02-11 13:58:36 +08:00
Jerome Mouneyrac
0c34e8034d MDL-29938 ignore invalid keys 2013-02-11 13:58:00 +08:00
Jerome Mouneyrac
bb1105ae31 MDL-29938 Fix typo bypassing some code + remove misplaced code in deprecated function + some code cleaning 2013-02-11 13:57:59 +08:00
Jerome Mouneyrac
ec80bc6bf8 MDL-29938 don't validate return user info against PARAM_USERNAME as PARAM_USERNAME only apply to manual authentication (and web service) 2013-02-11 13:57:59 +08:00
Jerome Mouneyrac
b0365ea5d1 MDL-29938 get_users - search users external function 2013-02-11 13:57:59 +08:00
Andrew Davis
c90e6b4644 MDL-36091 added debugging() calls in blocks of code marked as "should never happen" 2013-02-11 13:24:52 +08:00
Frederic Massart
506522d582 MDL-5875 forum: Option to display post word count 2013-02-11 12:08:46 +08:00
Rajesh Taneja
95556ce4e8 MDL-20131 Glossary: Global glossary can be added in Random glossary entry block. 2013-02-11 11:55:26 +08:00
Dan Poltawski
06d8f380e9 MDL-35819 - version bump for various JS changes 2013-02-11 10:56:36 +08:00