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
65806 commits 37 branches 544 tags 1.3 GiB
Commit graph

65806 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Nelson
7ca44a4963 MDL-42547 tool_uploaduser: trim values before uploading users 2013-11-18 20:07:01 -08:00
Rajesh Taneja
8c59114f24 MDL-42924 Administration: use normalize_component to extract plugin name and type 2013-11-19 11:51:20 +08:00
Dan Poltawski
f7b47f1c0c Merge branch 'wip-mdl-42403' of https://github.com/rajeshtaneja/moodle 2013-11-19 11:43:39 +08:00
Rajesh Taneja
3ea677e39a MDL-42403 course: Added behat to check visibility of bluk move action 2013-11-19 10:52:33 +08:00
Rajesh Taneja
a5888fb591 MDL-42403 course: Show bluk move to category only when something selected 2013-11-19 10:52:32 +08:00
Dan Poltawski
84cd1a2a91 Merge branch '42060-27' of git://github.com/samhemelryk/moodle 2013-11-19 10:39:30 +08:00
Dan Poltawski
2a0a33a6ee Merge branch 'MDL-42504' of git://github.com/timhunt/moodle 2013-11-19 10:30:16 +08:00
Dan Poltawski
0cf4e15baf Merge branch 'MDL-42181' of git://github.com/mkassaei/moodle 2013-11-19 10:04:59 +08:00
Damyon Wiese
86249e9aeb Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle 2013-11-19 09:49:57 +08:00
Sam Hemelryk
417d6f51cc Merge branch 'MDL-42905-master' of git://github.com/sammarshallou/moodle 2013-11-19 14:37:28 +13:00
Sam Hemelryk
8b5e008bc2 Merge branch 'MDL-42553_master' of https://github.com/markn86/moodle 2013-11-19 14:31:51 +13:00
Sam Hemelryk
496692fb9d Merge branch 'wip-MDL-42850-master' of git://github.com/abgreeve/moodle 2013-11-19 14:19:20 +13:00
AMOS bot
0455c4768f Automatically generated installer lang files 2013-11-19 00:40:26 +00:00
Dan Marsden
eef4c4c175 MDL-40223 SCORM: pass limit into function instead of hardcoding to allow cross-db 2013-11-19 13:23:06 +13:00
Sam Hemelryk
40dca7e4d6 Merge branch 'MDL-41316-master' of git://github.com/ankitagarwal/moodle 2013-11-19 12:28:08 +13:00
Sam Hemelryk
35a1978985 Merge branch 'w47_MDL-42612_m27_paypalruble' of https://github.com/skodak/moodle 2013-11-19 12:24:56 +13:00
Sam Hemelryk
40ce744d08 Merge branch 'MDL-42774-master' of git://github.com/andrewnicols/moodle 2013-11-19 12:06:29 +13:00
Sam Hemelryk
074e5686db Merge branch 'MDL-42863' of git://github.com/timhunt/moodle 2013-11-19 12:03:41 +13:00
Sam Hemelryk
04fcb4a96c Merge branch 'MDL-42865' of git://github.com/timhunt/moodle 2013-11-19 11:50:44 +13:00
Sam Hemelryk
3d2dc94bf1 MDL-42852 theme_bootstrapbase: fixed whitespace 2013-11-19 11:45:17 +13:00
Sam Hemelryk
d7a0da37d9 Merge branch 'wip-MDL-42852_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-19 11:42:25 +13:00
Sam Hemelryk
1098226524 Merge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle 2013-11-19 10:15:33 +13:00
Sam Hemelryk
34592ffd98 Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-19 10:08:45 +13:00
Damyon Wiese
ef16df1449 Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle 2013-11-18 16:08:57 +08:00
Dan Poltawski
66a02845e9 Merge branch 'MDL-42880b' of git://github.com/timhunt/moodle 2013-11-18 15:37:01 +08:00
Damyon Wiese
79149e85fb Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle 2013-11-18 15:26:52 +08:00
Damyon Wiese
67016a4d39 Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle 2013-11-18 15:12:56 +08:00
Damyon Wiese
7f2c374dcd Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle 2013-11-18 14:55:18 +08:00
Dan Poltawski
b6813d8f6a Merge branch 'MDL-42884_master' of https://github.com/markn86/moodle 2013-11-18 14:41:06 +08:00
Dan Poltawski
728f924ec1 Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/scorm/db/upgrade.php
 2013-11-18 14:32:55 +08:00
Damyon Wiese
61cdb947e8 Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle 2013-11-18 14:05:17 +08:00
Petr Škoda
93d31b5d77 MDL-42612 add support for Russian Ruble in PayPal 2013-11-18 11:49:10 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Adrian Greeve
a2071fbf7c MDL-42850 administration: Updated bulk user upload errors to be more descriptive. 2013-11-18 11:36:16 +08:00
Sam Hemelryk
19b13d531a MDL-42060 block_course_list: fixed sorting of mycourses 2013-11-18 11:15:02 +13:00
Dan Marsden
0d7eb69164 MDL-41695 SCORM: allow unlimited decimal places in CMIDecimal 2013-11-18 10:27:10 +13:00
Dan Marsden
27c58e5583 MDL-40223 SCORM: update scorm->launch param after restore - also check that scorm->launch is valid. 2013-11-18 09:44:54 +13:00
Gareth J Barnard
b3eadf7050 MDL-42852 lib: Blocks disappear in Clean in RTL. 2013-11-17 13:33:30 +00:00
Eloy Lafuente (stronk7)
953b6e2b34 MDL-42929 backup: keep own version & release updated. 2013-11-17 02:32:43 +01:00
Eloy Lafuente (stronk7)
b58bc15af5 weekly back-to-dev release 2.7dev 2013-11-16 23:46:18 +01:00
Eloy Lafuente (stronk7)
2b10fa0433 Moodle release 2.6 2013-11-16 17:28:07 +01:00
M Kassaei
0328341f97 MDL-42181 quiz nav: highight all buttons when all Qs on one page 2013-11-15 15:30:31 +00:00
Tim Hunt
c590848158 MDL-42880 quiz settings: remove unnecessary disabledif rules. 
These rules were causing problems in the case where the form was
sumitted with validation errors. In that case, the During the attempt ->
The attempt checkbox was becoming unset, and hence the other During the
attmept checkboxes became disabled, and the values were not saved.

Thanks to Sam Marshall for suggesting this fix.
 2013-11-15 15:09:25 +00:00
Tim Hunt
be8c2ec31f MDL-42865 Make XMLDB foreign key check more robust. 
Otherwise, installing one bad add-on can completely break this report.
 2013-11-15 15:08:51 +00:00
Tim Hunt
02793f156c MDL-42863 make capabilities overview more fault-tolerant. 2013-11-15 15:08:32 +00:00
Tim Hunt
52b612f08b MDL-42504 quiz autosave: alert users if connection lost. 
When the auto-save fails, we alert the user that they may have lost their
internet connection so that they don't do more work that they might just
lose.
 2013-11-15 15:08:13 +00:00
Eloy Lafuente (stronk7)
ad9e81eb98 Merge branch 'MDL-42926-master' of git://github.com/damyon/moodle 2013-11-15 16:06:22 +01:00
Damyon Wiese
ab9300dffe MDL-42926 Bootstrap base: Remove 6px spacing between form elements 
This was accidentally copied from the css for base. It is only visible when
the form fields are displayed with the label above the field. (less than 1200px).
 2013-11-15 22:58:10 +08:00
sam marshall
597ac7e5d2 MDL-42582 Availability: Restriction display incorrect for multi-para Labels 
When a label has multiple paragraphs, its name (converted to plain text)
contains a line feed. Due to an error in regular expressions that don't
accept the line feed, this caused incorrect display on the course page
when that label is shown as a requirement for accessing another activity.
 2013-11-15 12:45:32 +00:00
sam marshall
8f46e2a808 MDL-42905 Backup progress: Pointless line of code should be deleted 2013-11-15 12:44:34 +00:00