mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 10:32:40 +01:00
Code Issues Projects Releases Wiki Activity
67,554 Commits 36 Branches 527 Tags
Commit Graph

15284 Commits

Author SHA1 Message Date
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
 2014-04-08 13:30:41 +08:00
Damyon Wiese
19346e06cb Merge branch 'wip-MDL-44340-master' of git://github.com/abgreeve/moodle 2014-04-08 12:16:42 +08:00
Marina Glancy
39b70b23b7 Merge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle 2014-04-08 11:14:52 +08:00
Damyon Wiese
1e16a58525 Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle 2014-04-08 10:09:21 +08:00
Dan Poltawski
36e051dab4 Merge branch 'wip-MDL-18598-master' of git://github.com/marinaglancy/moodle 2014-04-08 09:45:07 +08:00
Marina Glancy
72c0f16889 Merge branch 'master_MDL-44938' of git://github.com/danmarsden/moodle 2014-04-08 08:53:58 +08:00
Marina Glancy
08cf1d787e Merge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle 2014-04-08 08:53:49 +08:00
Sam Hemelryk
17c37406b5 Merge branch 'MDL-44408' of git://github.com/jleyva/moodle 2014-04-08 11:44:21 +12:00
James McQuillan
597662335d MDL-22999 core_grades: Added ability to configure maximum grade value both globally and for each graded-activity. 2014-04-07 16:02:37 -04:00
sam marshall
8270f0d0bd MDL-44070 Conditional availability enhancements (9): wider changes 
Changes to arbitrary areas of code that are necessary after the new
API (mostly to replace deprecated function calls).
 2014-04-07 20:11:59 +01:00
Damyon Wiese
e017c50bcf Merge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle 2014-04-07 16:57:06 +08:00
Nobelium
e3528983f2 MDL-41476 scorm settings- SCORM1.2 standard mode and CMIString length 
Adding SCORM 1.2 standard mode checkbox in scorm admin panel. By default it will be enabled
(i.e: config name = `scorm12standard`, plugin name = `scorm`, value = `1`)
If `scorm12standard` is `1` CMIString256 is of length 256 and CMIString4096 is of length is 4096
if `scorm12standard` is `0` CMIString256 and CMIString4096 are of length is 64000
 2014-04-07 14:07:48 +08:00
Dan Poltawski
0678d09213 Merge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle 2014-04-07 13:10:41 +08:00
Dan Poltawski
d69f584fe6 Merge branch 'wip-mdl-44945' of https://github.com/rajeshtaneja/moodle 2014-04-07 10:53:56 +08:00
Tim Hunt
07a0370bf8 MDL-44940 quiz editing page problems from MDL-43749. 
* If the quiz starts with an empty page, you could not move the first
question up onto it.
* Adding page breaks in the middle sometimes added them in the wrong
place.
* Adding a new page at the end is problematic, and here we fix it as
much as possible, by letting you move the last question down to create a
new page. This needs MDL-40987 to be fixed properly.
 2014-04-04 19:03:16 +01:00
Juan Leyva
4595c79b74 MDL-44408 Adding missing order (so we start looking for newest discussions) 2014-04-04 12:13:47 +02:00
Juan Leyva
1fee2cd4e9 MDL-44408 Add "pagination" to WebService get_forum_discussions 2014-04-04 12:13:47 +02:00
Marina Glancy
9fb549a543 MDL-40843 workshop: sort entries in recent activity block by time 2014-04-04 16:52:02 +08:00
Marina Glancy
a1bff2f92a MDL-40843 workshop: show user names in recent activity 2014-04-04 16:52:01 +08:00
Marina Glancy
e19c086c36 MDL-40843 recent_activity: corrections to grouping and user fields 2014-04-04 16:52:01 +08:00
Marina Glancy
d6f418cb77 MDL-40872 Restore functionality of showrecentsubmissions setting 2014-04-04 15:11:13 +08:00
Marina Glancy
f5c6e8db1d MDL-18598 forum: redefine index to allow faster cron jobs 2014-04-04 11:37:17 +08:00
Rajesh Taneja
fef8ee9114 MDL-44945 mod_workshop: fixed event snapshot 2014-04-04 10:09:08 +08:00
Dan Marsden
3babdf83fe MDL-43011 SCORM: use embedded layout instead of scorm for pop-up windows 2014-04-04 11:47:13 +13:00
Dan Marsden
e0eac0c6f3 MDL-44938 SCORM: missing constant definition during upgrade. 2014-04-04 09:38:48 +13:00
Adrian Greeve
1a219fb6c9 MDL-44340 mod_workshop: Added an event call to phase switched page. 
This event was missed in the previous workshop add_to_log change over. The
switch phase event has been moved into the workshop::switch_phase() method.
Also workshop::log() has been deprecated. Developers should use the event
classes to log events.
 2014-04-03 13:08:27 +08:00
Rajesh Taneja
ae8c220fd5 MDL-44832 behat: Fixed behat test 2014-04-03 10:59:58 +08:00
Damyon Wiese
c8afcb2e7b Merge branch 'master_MDL-44753' of https://github.com/danmarsden/moodle 2014-04-02 16:33:06 +08:00
Dan Marsden
e067e6f0ad MDL-44753 SCORM: make correct selection of first sco - also fixes MDL-44896 2014-04-02 20:50:21 +13:00
Marina Glancy
0123472c87 Merge branch 'MDL-41063' of git://github.com/jmvedrine/moodle 2014-04-02 09:46:35 +08:00
Eloy Lafuente (stronk7)
2e20fc3742 Merge branch 'MDL-31262' of git://github.com/timhunt/moodle 2014-04-02 03:18:05 +02:00
Marina Glancy
cc7c745c7d Merge branch 'master_MDL-44753' of git://github.com/danmarsden/moodle 2014-04-02 09:15:33 +08:00
Eloy Lafuente (stronk7)
6faa517856 Merge branch 'wip-MDL-34012-master' of git://github.com/marinaglancy/moodle 2014-04-02 02:57:15 +02:00
Eloy Lafuente (stronk7)
b224448ac6 Merge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle 2014-04-02 02:47:59 +02:00
Sam Hemelryk
3ed2a4b2cc Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle 2014-04-02 13:04:46 +13:00
Eloy Lafuente (stronk7)
929e32489f Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle 2014-04-02 01:12:52 +02:00
Dan Marsden
c87a50cb45 MDL-44753 SCORM: add check during SCORM restore to make sure valid launch sco is set 2014-04-02 10:01:54 +13:00
Sam Hemelryk
067573bd02 Merge branch 'MDL-44832-master' of git://github.com/damyon/moodle 2014-04-02 09:54:33 +13:00
Eloy Lafuente (stronk7)
eafbd56da9 Merge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle 2014-04-01 21:50:09 +02:00
Marina Glancy
e3e9701113 Merge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle 2014-04-01 17:40:22 +08:00
Jenny Gray
f8b3cd4bdf MDL-44021 mod_glossary - fixed search multiple keywords sql duplicate parameter error 2014-04-01 09:34:06 +01:00
Sam Hemelryk
4b92f2b79b Merge branch 'MDL-44745-master' of git://github.com/damyon/moodle 2014-04-01 21:20:05 +13:00
Ankit Agarwal
b63f773296 MDL-44717 events: Fix multiple issues in events 
Fix various incorrect urls
Fix incorrect phpdocs and other minor code style issues
Fix missing/incorrect strings

AMOS BEGIN
 MOV [eventblogassociationcreated, core_blog],[eventblogassociationadded, core_blog]
AMOS END
 2014-04-01 15:08:34 +08:00
Adrian Greeve
55f59c2b44 MDL-44717 events: Quick update to incorrect mod workshop class definition. 2014-04-01 14:45:05 +08:00
Marina Glancy
0b1afc71bb Merge branch 'w14_MDL-44715_m27_eventval' of git://github.com/skodak/moodle 2014-04-01 13:45:59 +08:00
Marina Glancy
902eec06e9 Merge branch 'MDL-44811' of git://github.com/timhunt/moodle 2014-04-01 13:24:09 +08:00
Damyon Wiese
c70de965aa MDL-44583 Assign: performance fixes 2014-03-31 12:53:02 +08:00
Marina Glancy
7e1288f847 Merge branch 'MDL-44822' of git://github.com/aolley/moodle 2014-03-31 12:46:21 +08:00
Jean-Michel Vedrine
f88d75e51a MDL-41063 Lesson qformat_default class is missing an error function 2014-03-30 09:03:38 +02:00
Tim Hunt
6a981b45c3 MDL-31262 fix quiz review capability check. 
This change is logically the same as changing
    $this->has_capability('mod/quiz:viewreports')
to
    $this->has_capability('mod/quiz:viewreports') || $this->has_capability('mod/quiz:preview')
in the original code. However, I rewrote the logic so that we test the
most common and performance-critical case first - that of a student
lookign at their own attempt.
 2014-03-28 18:37:21 +00:00