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

56823 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
9f4cd940b1 Merge branch 'MDL-36380-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2013-02-18 14:18:46 +08:00
Rossiani Wijaya
7e89587526 MDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable in quickenrolment.js 2013-02-18 13:41:13 +08:00
Damyon Wiese
bf78144a45 Merge branch 'MDL-37939-m23' of https://github.com/andrewnicols/moodle into MOODLE_23_STABLE 
Conflicts:
	lib/db/upgrade.php
 2013-02-18 13:31:40 +08:00
Dan Poltawski
45c8baafd0 Merge branch 'MDL-35336_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2013-02-18 12:24:23 +08:00
Frederic Massart
e4594f737e 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>

Conflicts:

	lib/db/upgrade.php
	version.php
 2013-02-18 11:35:31 +08:00
Dan Poltawski
d623842807 Merge branch 'MDL-34800_ajax_submit_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2013-02-18 11:07:48 +08:00
Rossiani Wijaya
1989bb2ed8 MDL-37396 User Enrollment: fixed missing user from enrolment sub-menu 2013-02-18 10:25:01 +08:00
Rossiani Wijaya
9f2be81a8e MDL-35336 report (course overview): check the setting for enablestats before printing out the node for setting > site admin > reports 2013-02-18 10:23:26 +08:00
Rossiani Wijaya
39239e299b MDL-35336 Report (course overview): fixed redirect url to enable statistics setting page when statistics is disable 2013-02-18 10:23:26 +08:00
Mary Evans
8b6a3b4e11 MDL-28692 theme_base: Added background-color to admin settings form overridden in base/style/admin.css 2013-02-18 01:54:23 +00:00
Sam Hemelryk
fe0ce21840 MDL-38075 csslib: fixed coding error when working with an array of styles 2013-02-18 08:22:15 +13:00
Jean-Michel Vedrine
f60f3b6c39 MDL-38051 Annihilate all the CRLFs present in some questions/fixtures... 2013-02-16 14:47:07 +01:00
Petr Škoda
0bf47bc403 MDL-38059 explain that cachedir must be shared in cluster 2013-02-16 14:46:19 +01:00
Matteo Scaramuccia
2ceaefb420 MDL-37449 Incorrect doubled 'u.email' field in the SQL query (Oracle error: ORA-00918) 2013-02-15 21:27:59 +01:00
Andrew Robert Nicols
0c9e550def MDL-37939 Course: Add unit test to ensure module moves are correct 2013-02-15 20:06:08 +00:00
Andrew Robert Nicols
31db9c51a2 MDL-37939 Course: Correct broken sequence data 2013-02-15 18:50:07 +00:00
Andrew Robert Nicols
4bcf7d3e74 MDL-37939 Course: Ensure that the cm->section is set when moving modules 2013-02-15 18:50:07 +00:00
Frederic Massart
e30af43f40 MDL-36380 stats: No more duplicated entries when viewing monthly stats 2013-02-15 15:03:21 +08:00
Frederic Massart
e0f5cb19a3 MDL-38048 documentation: Typo in README file 2013-02-15 13:15:07 +08:00
Eloy Lafuente (stronk7)
41eb312243 MDL-38040 Clean core from CRLFs 2013-02-15 02:25:36 +01:00
Mary Evans
9cf21fc4e3 MDL-38039 theme_base: Corrected typo fickering to flickering in CSS comment which blocked IPCOP browser firewall in IE. 2013-02-15 01:13:03 +00:00
Rex Lorenzo
99a2923de2 MDL-35175 - Lesson shows no attempts if associated with a grouping 2013-02-14 15:22:43 -08:00
Davo Smith
7d7b959bd6 MDL-38033 dndupload - ignore case when comparing dropped file extensions with those supported by activity modules 2013-02-14 20:24:12 +00:00
Jean-Michel Vedrine
a56ced75e7 MDL-37934 Blackboard_six question import fails in some cases 
Import fails if the same image is used several times
in the same field of the same question.
 2013-02-14 14:50:41 +01:00
Damyon Wiese
bbcf8dab4f weekly release 2.3.4+ 2013-02-14 14:05:42 +08:00
Damyon Wiese
212fa54826 Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE 2013-02-14 14:04:18 +08:00
AMOS bot
5f68421b93 Automatically generated installer lang files 2013-02-14 00:49:58 +00:00
Mary Evans
856e1568d6 MDL-37749 theme_mymobile: Removed redundant JS and CSS code for Collapsed Topic contributed plugin. 2013-02-12 17:25:53 +00:00
Eloy Lafuente (stronk7)
dafe3db606 MDL-37893 Take rid of old comment. 2013-02-12 10:04:48 +01:00
Eloy Lafuente (stronk7)
79cccda3a9 Merge branch 'MDL-37893-grouped-empty_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE 2013-02-12 10:04:40 +01:00
Dan Poltawski
fff248b163 Merge branch 'wip-mdl-37633-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2013-02-12 15:50:10 +08:00
Rajesh Taneja
37010cc708 MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default 
Conflicts:

	mod/forum/db/upgrade.php
	mod/forum/version.php
 2013-02-12 15:02:42 +08:00
Andrew Davis
46c9d980e5 MDL-34800 core_grade:switched from hiding the submit button to disabling it if ajax is enabled 2013-02-12 14:55:06 +08:00
Dan Poltawski
35f7e66ed7 Merge branch 'MDL-32076_unlimited2_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2013-02-12 14:42:43 +08:00
Dan Poltawski
0225b635c4 Merge branch 'MDL-37074-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-02-12 13:40:04 +08:00
Dan Poltawski
ac45271157 Merge branch 'MDL-37924_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-02-12 13:36:15 +08:00
Dan Poltawski
a8bf41cec6 Merge branch 'MDL-37964_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE 2013-02-12 12:27:02 +08:00
Dan Poltawski
35f667d850 Merge branch 'wip-MDL-34798_M23-2' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE 2013-02-12 10:34:23 +08:00
Dan Poltawski
f81a08b491 Merge branch 'MDL-37952_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE 2013-02-12 09:46:28 +08:00
Eloy Lafuente (stronk7)
bced529e0e Merge branch 'MDL-37943_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-02-12 01:21:12 +01:00
Eloy Lafuente (stronk7)
596881dbaf Merge branch 'MDL-37896_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-02-12 01:14:43 +01:00
David Mudrák
473b153982 MDL-37919 Let PHPUnit display the content of $a even if the error string is not found 2013-02-12 01:08:44 +01:00
Eloy Lafuente (stronk7)
c27b257b14 Merge branch 'MDL-35037-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE 2013-02-12 01:00:16 +01:00
Frederic Massart
a3ded4c023 MDL-37961 webservice: PARAM_BOOL with PARAM_DEFAULT accepts boolean default 2013-02-12 00:44:42 +01:00
Gareth J Barnard
d26cc0a022 MDL_34798 format_topics and format_weeks: Adjust section names when moving up. 2013-02-11 13:56:54 +00:00
Petr Škoda
9ba2682e38 MDL-37964 very basic support for enrolments in data generator 2013-02-11 17:29:00 +08:00
Dan Poltawski
731ff94a87 Merge branch 'MDL-37039-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-02-11 14:33:36 +08:00
Dan Poltawski
ffad867dd0 Merge branch 'MDL-37797_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2013-02-11 13:58:56 +08:00
David Mudrák
ed1f5a1f25 MDL-37774 Do not pass trailing slash if the method does not want it 2013-02-10 08:59:27 +01:00
David Mudrák
e2f455b8ca 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.
 2013-02-10 08:59:19 +01:00