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

59973 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dan Poltawski
a614fb7457 Merge branch 'MDL-35819-m' of git://github.com/andrewnicols/moodle 2013-02-11 10:56:07 +08:00
Damyon Wiese
8dcca4aacb MDL-30637 Formslib - Cleanup for shortforms implementation (mostly comments) 
Also added deprecated functions for the functions that were removed from MoodleQuickForm.
 2013-02-11 10:37:13 +08:00
Damyon Wiese
40f1c065b4 Merge branch 'MDL-30637-master' of git://github.com/lucisgit/moodle 2013-02-11 10:37:03 +08:00
Frederic Massart
58b1904fd1 MDL-35622 files: Add support for SMART Notebook MIME types 
- The MIME type for Notebook files is: application/x-smarttech-notebook
- The MIME type for Gallery files is also: application/x-smarttech-notebook
Refs: http://exchange-forum.smarttech.com/forums/p/5152/11945.aspx#11945

Original author: Matteo Scaramuccia <moodle@matteoscaramuccia.com>
Fixed by: Paul Holden <pholden@greenhead.ac.uk>
 2013-02-11 10:26:09 +08:00
Andrew Davis
01da2d3665 MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests 2013-02-11 08:49:43 +08:00
Andrew Davis
2e2d197798 MDL-37164 core_message: prevent users from interacting with themself 2013-02-11 08:48:56 +08:00
Andrew Robert Nicols
238b8bc9b6 MDL-35819 AJAX Rewrite Moodle popup help to be more friendly and more efficient 2013-02-10 11:50:56 +00:00
AMOS bot
384dd10a8a Automatically generated installer lang files 2013-02-10 00:41:38 +00:00
Eloy Lafuente (stronk7)
82b61ff8a5 MDL-37952 make helper descendants abstract 2013-02-09 16:22:06 +01:00
Davo Smith
039677df70 MDL-37831 filepicker - icons / details / tree selector buttons now work more reliably 2013-02-08 20:37:19 +00:00
Simon Coggins
ec2d8ceb88 MDL-35332 lib: Improve security of hashed passwords 2013-02-09 06:47:57 +13:00
Tim Hunt
2d2018abda MDL-37896 qtype_essay: correct PARAM_CLEANHTML -> PARAM_RAW. 
It turns out that you should almost never use PARAM_CLEANHTML.
 2013-02-08 12:51:21 +00:00
Tim Hunt
1fa845437c MDL-37943 upgrade: logic error in upgrade_plugins_blocks. 
Derek Woolhead tracked down the problem and what needed to be fixed. I
just made the patch.

The problem was that if $plugin->cron had changed in version.php, then
the version number in the database could end up wrong after the upgrade,
and so the upgrade would immediately run a second time.
 2013-02-08 12:40:49 +00:00
David Mudrák
b3c00549c5 MDL-37774 Do not pass trailing slash if the method does not want it 2013-02-08 12:05:44 +01:00
David Mudrák
d0530ed444 MDL-37774 Make moodle1_file_manager::migrate_directory() support trailing slash in rootpath 
As the $rootpath is concatenated with the $relpath, we would end with a
path like course_files//file.txt. Such a path is detected as not-valid
later and an error would be thrown.

So the patch makes sure that the trailing slash is cut off and a
debugging for the developer is displayed.
 2013-02-08 11:45:24 +01:00
David Mudrák
86083f9752 MDL-37774 Add unit test to illustrate the problem with the trailing slash 
The patch introduces two new tests for moodle1_file_manager::migrate_directory().
The second test with the trailing slash reveals the trouble here.
The expected behaviour is that the method would deal with the trailing
slash. Debugging message for the developer should be displayed though.
 2013-02-08 11:41:38 +01:00
David Monllao
68fae082df MDL-37787 behat: Using progress format by default 2013-02-08 17:14:57 +08:00