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

56380 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aparup Banerjee
89577d774d Merge branch 'MDL-31284-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-06 19:36:24 +08:00
Martin Vögeli
b5cd5f83e1 MDL-31365 Regions for pagelayout 'secure' 2012-09-06 18:11:13 +08:00
Martin Vögeli
934f04e7c3 MDL-31365 Follow up after discussion 2012-09-06 18:11:09 +08:00
Eloy Lafuente (stronk7)
0cbf023ab6 Merge branch 'w36_MDL-35172_m24_editortoolbar' of git://github.com/skodak/moodle 2012-09-06 12:08:26 +02:00
Aparup Banerjee
7183a1f4a4 Revert "MDL-34257 quiz 'secure' mode: PAGE initialisation order issues." 
This reverts commit 0e708c3476.

note : there is another commit prefixed with MDL-34257 hash 'ddda79c' which was really for MDL-34187. 'ddda79c' is not being reverted as its not really about MDL-34257.
 2012-09-06 17:35:40 +08:00
Dan Marsden
81f460b1e2 MDL-33755 SCORM only auto-skipview for users with skipview cap that can't see reports 
also don't generate unrequired content when scorm will be launched automatically.
 2012-09-06 20:30:37 +12:00
Piers Harding
35cfa9e62c MDL-33755 mod/scorm: directview scorm activity 
Enable direct view of scorm activity from the course
overview page

Conflicts:

	mod/scorm/view.js
 2012-09-06 20:28:42 +12:00
Dan Marsden
122878590a MDL-35123 SCORM: cleaner version of get_last_attempt and get_last_completed_attempt, fixes support for MS Sql driver 2012-09-06 18:42:55 +12:00
Jerome Mouneyrac
7d6c58bc24 MDL-35190 random failures in course externallib test 2012-09-06 11:15:56 +08:00
Eloy Lafuente (stronk7)
0e08f394f5 Merge branch 'MDL-35034-master' of git://github.com/FMCorz/moodle 2012-09-06 02:01:11 +02:00
Eloy Lafuente (stronk7)
37a74d1e28 Merge branch 'MDL-27799' of git://github.com/timhunt/moodle 2012-09-06 01:29:04 +02:00
Eloy Lafuente (stronk7)
44a2eb911b Revert "MDL-30643 - Fixed speed issues with stats generation." 
This reverts commit 5d911452cd.
 2012-09-05 19:04:01 +02:00
Eloy Lafuente (stronk7)
cbcf50a2f4 Revert "MDL-30643 - Added additional temporary tables to deal with log growth in daily tables." 
This reverts commit e710925a24.
 2012-09-05 19:03:46 +02:00
Eloy Lafuente (stronk7)
583a19d772 Revert "MDL-30643 - Moved table create/drop out of loop to fix performance issue." 
This reverts commit 678f53c5f7.
 2012-09-05 19:03:30 +02:00
Eloy Lafuente (stronk7)
6a7fb9f778 Revert "MDL-30643 - Now loading table definitions from XML files." 
This reverts commit d352e733b3.
 2012-09-05 19:03:17 +02:00
Eloy Lafuente (stronk7)
8127f098d8 Revert "MDL-30643 - Added statslib test file." 
This reverts commit 8646f5a436.
 2012-09-05 19:03:06 +02:00
Eloy Lafuente (stronk7)
06d54f411c Revert "MDL-30643 - Fixing minor log output error and test cases." 
This reverts commit 2da32bd6a5.
 2012-09-05 19:02:54 +02:00
Eloy Lafuente (stronk7)
fa4fbd9790 Revert "MDL-30643 - Updated test cases to handle timezones better." 
This reverts commit f0f0fec295.
 2012-09-05 19:02:38 +02:00
Eloy Lafuente (stronk7)
447721b44f Revert "RFC-30643 - Removed get_context_instance calls." 
This reverts commit eb0ffd3214.
 2012-09-05 19:02:27 +02:00
Eloy Lafuente (stronk7)
ac9fe9b3a5 Revert "MDL-30643 fixed whitespace" 
This reverts commit 5c27678d3a.
 2012-09-05 19:02:07 +02:00
Eloy Lafuente (stronk7)
393cadf205 MDL-29662 quiz overrides: use proper course value (was php notice). 2012-09-05 18:01:24 +02:00
David Mudrák
0e5ebc8755 MDL-35272 Fix typo in qformat_blackboard_six.php 
Credit goes to German Valero for spotting and reporting this.
 2012-09-05 14:05:36 +02:00
Eloy Lafuente (stronk7)
130eddd24c Merge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle 2012-09-05 13:12:59 +02:00
Petr Škoda
61712b0fb0 MDL-35077 do not show link to system stats report if stats disabled 2012-09-05 10:01:30 +02:00
Aparup Banerjee
379833e0d0 Merge branch 'MDL-35089' of git://github.com/stronk7/moodle 2012-09-05 15:02:17 +08:00
Petr Škoda
717a993122 MDL-35172 fix handling of more than 10 tinymce toolbars 2012-09-05 08:23:36 +02:00
Aparup Banerjee
01ba041fa6 Merge branch 'w36_MDL-35177_m24_editoradminicons' of git://github.com/skodak/moodle 2012-09-05 11:45:56 +08:00
Aparup Banerjee
937b0acba1 MDL-26504 blog: fixed SQL to add explicit casting 2012-09-05 10:25:22 +08:00
Dan Marsden
c792565b9d MDL-35255 mod_assign plagiarism api shift update_status call to after header has been printed. 2012-09-05 12:44:18 +12:00
Eloy Lafuente (stronk7)
4bab07c68c Merge branch 'MDL-34997-master' of git://github.com/FMCorz/moodle 2012-09-05 00:52:17 +02:00
Aparup Banerjee
5c27678d3a MDL-30643 fixed whitespace 2012-09-05 01:51:39 +08:00
Aparup Banerjee
b0381539e5 Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle 2012-09-05 01:16:51 +08:00
Tyler Bannister
eb0ffd3214 RFC-30643 - Removed get_context_instance calls. 
- Added fifth table to speed up enrolment look ups.
 2012-09-04 10:11:16 -04:00
Tyler Bannister
f0f0fec295 MDL-30643 - Updated test cases to handle timezones better. 2012-09-04 10:10:19 -04:00
Aparup Banerjee
c43f715d42 Merge branch 'wip-mdl-34537' of git://github.com/rajeshtaneja/moodle 2012-09-04 17:31:50 +08:00
Kordan
087c28d62e MDL-34916 theme_formal_white: added support for relative path of logos 2012-09-04 09:52:13 +02:00
Aparup Banerjee
736cc6a246 Merge branch 'MDL-26504_blog_unregister' of git://github.com/andyjdavis/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-09-04 13:43:11 +08:00
Jerome Mouneyrac
4647b4d76f MDL-34973 PHPunit test: notes/externallib.php 2012-09-04 13:38:36 +08:00
Sam Hemelryk
b5b82ae943 Merge branch 'MDL-30022_message_duplicate' of git://github.com/andyjdavis/moodle 2012-09-04 16:50:36 +12:00
Jerome Mouneyrac
1f867c025b MDL-34970 PHPunit test: group/externallib.php 2012-09-04 12:34:40 +08:00
Jerome Mouneyrac
566596abd7 MDL-34967 PHPunit test: enrol/externallib.php and enrol/manual/externallib.php 2012-09-04 12:26:21 +08:00
Aparup Banerjee
82fb0aa576 MDL-31365 theme: mymobile updated to compatible declaration 2012-09-04 12:10:30 +08:00
Tim Hunt
0e708c3476 MDL-34257 quiz 'secure' mode: PAGE initialisation order issues. 2012-09-04 11:39:38 +08:00
Aparup Banerjee
8f8e28c0b6 Merge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle 2012-09-04 11:38:11 +08:00
Tim Lock
c3a0938e79 MDL-35092: Add proxy support to enrol/paypal IPN 2012-09-04 10:55:09 +08:00
Simon Coggins
02ed0df5ae MDL-34755 SCORM: pop-up not loading in IE7/IE8 compat mode 2012-09-04 13:11:22 +12:00
Eloy Lafuente (stronk7)
519fb0b878 Merge branch 'wip-mdl-34606' of git://github.com/rajeshtaneja/moodle 2012-09-04 02:08:54 +02:00
Eloy Lafuente (stronk7)
12e0ecde48 Merge branch 'MDL-34633-master' of git://github.com/FMCorz/moodle 2012-09-04 01:52:08 +02:00
Eloy Lafuente (stronk7)
259208e0ab MDL-31295 assign: fix comments in upgrade code. 2012-09-04 01:27:49 +02:00
Eloy Lafuente (stronk7)
7ef0d527b2 Merge branch 'MDL-31295-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-04 01:20:55 +02:00