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

56894 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
1bfc006d96 Moodle release 2.3.5 2013-03-08 20:01:23 +01:00
Eloy Lafuente (stronk7)
d461ecf772 MDL-38378 Take rid of harcoded db prefix and bump. 2013-03-08 00:20:28 +01:00
Eloy Lafuente (stronk7)
2ab86289de weekly release 2.3.4+ 2013-03-07 16:23:20 +01:00
Eloy Lafuente (stronk7)
48cafb2b24 Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE 2013-03-07 16:16:27 +01:00
Frederic Massart
173a201f90 MDL-37852 repository: Admins can't access user instances settings 2013-03-07 16:35:27 +08:00
Frederic Massart
d5a3a92267 MDL-37852 repository: Prevent user from deleting a site-wide instance 2013-03-07 14:37:56 +08:00
Rossiani Wijaya
646059869e MDL-37411 Note Module: additional patch to fixed undefined property for stable branches 2013-03-07 11:09:17 +08:00
Damyon Wiese
38fd297dc7 Revert "MDL-38055 course: fixed print_overview use of title attribute" 
This reverts commit 905ee48370.
This reverts commit 45dbcbec5f.

This issue has failed testing and will be delayed.
 2013-03-07 10:28:30 +08:00
Eloy Lafuente (stronk7)
71db4e58d7 MDL-38173 Swap conditions to make CI servers happy. 
The alternatives were:

1) wrap the whole block within a "standard" upgrade step, indenting
   everything one more level.
2) Change (relax) the savepoints checker in the CI servers, not
   good in general.

So at the end, swapping conditions seemed to be the easier
and better alternative. After all, "&&" is commutative, lol.
 2013-03-06 18:53:15 +01:00
Eloy Lafuente (stronk7)
5379574a7d Merge branch 'MDL-38173-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-03-06 17:54:42 +01:00
Eloy Lafuente (stronk7)
c5c1f07453 Merge branch 'MDL-38352-en_fix_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE 2013-03-06 17:28:35 +01:00
Helen Foster
40d9932aa3 MDL-38352 Merge English strings from the en_fix language pack 2013-03-06 16:57:18 +01:00
Damyon Wiese
a954624bc8 MDL-38173 Courselib: Make the distinct clause in the upgrade step more cross DB. 2013-03-06 23:04:04 +08:00
Damyon Wiese
6369652f17 MDL-38173 Courselib: Improvements to the upgrade step for this issue. 
Set the upgrade step to only run for affected versions correctly (use a
range of affected versions) and make the query to find affected sections DISTINCT.
Also rename aliases and variables to use cm and cmid.
 2013-03-06 21:07:20 +08:00
Damyon Wiese
fcf890aa2b MDL-38173 Courselib: Improve the performance of the upgrade step by joining on course and only running for affected sites. 2013-03-06 20:41:01 +08:00
Damyon Wiese
2b0b5a203d MDL-38173 Course: Fix DB from regression when adding a (new) course module to a section. 
Updated to remove performance fix from first upgrade step.
 2013-03-06 20:41:01 +08:00
Russell Smith
14c2bada33 MDL-38173 Course: Use the correct module id's when adding to a section 
When course completion is on, $mod->id is the instance, not the
course_module id.  In add_to_section $mod->coursemodule must be used.
 2013-03-06 20:41:01 +08:00
Tim Hunt
8a7bc6c3d8 MDL-38311 question manual grading: comment fixes. 2013-03-06 10:37:38 +01:00
AMOS bot
47e93e02cf Automatically generated installer lang files 2013-03-06 00:36:58 +00:00
Eloy Lafuente (stronk7)
ee7251689f Merge branch 'MDL-38311_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-03-06 01:24:22 +01:00
Rossiani Wijaya
1b628c489d MDL-37411 Notes: unset courseid and userid when updating the note to prevent accidental changes. Thank you Sam Hemelryk for suggesting an alternative solution. 
Conflicts:
	notes/edit.php
 2013-03-06 09:40:16 +13:00
Eloy Lafuente (stronk7)
9aa0a709cd Merge branch 'MDL-37642-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2013-03-05 18:00:31 +01:00
Eloy Lafuente (stronk7)
76cab144c8 Merge branch 'MDL-38119_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-03-05 16:46:05 +01:00
Tim Hunt
0d1fccaf15 MDL-38311 questions: manual grading API should accept commentformat 
Comment format (FORMAT_...) was correctly being processed when the
manual grading happened as the result of a form submission. It was only
when done using the question_usage or question_attempt API method that
there was no way to specify the format. (Although I think the only place
this API as used was in the unit tests.)

Note that question_attempt::manual_grade API had to change, but I don't
think that is a real API change. Calling code should be using
question_usage::question_attempt, which is backwards compatible.

Note that now, if you don't pass format, then no error is generated, but
a developer debugging message is generated.
 2013-03-05 11:57:42 +00:00
Aparup Banerjee
b30fea4e05 Merge branch 'wip-MDL-34775-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE 2013-03-05 17:04:05 +08:00
Frederic Massart
4a8da21c62 MDL-37852 repository: Prevent undesired access to repositories settings 2013-03-05 09:56:15 +01:00
Damyon Wiese
18329cbf1e Merge branch 'MDL-38282_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-03-05 16:14:55 +08:00
Damyon Wiese
0622ef3aa5 Merge branch 'MDL-38279_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-03-05 15:37:13 +08:00
Aparup Banerjee
792dab0f75 Merge branch 'MDL-30481_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2013-03-05 12:56:40 +08:00
Damyon Wiese
db66ab7898 Merge branch 'wip-MDL-38055-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE 2013-03-05 11:40:02 +08:00
Frederic Massart
55b330e6d8 MDL-34284 library: Import ZF2012-01 security patch for Zend 2013-03-05 10:32:36 +08:00
Sam Hemelryk
c2cef5809e Merge branch 'wip-MDL-37901_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE 2013-03-05 15:23:09 +13:00
Eloy Lafuente (stronk7)
c6014dccd9 Merge branch 'wip-MDL-36215-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE 2013-03-05 01:28:15 +01:00
Sam Hemelryk
180e1b2fe9 Merge branch 'MDL-38101-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2013-03-05 09:29:35 +13:00
Eloy Lafuente (stronk7)
d47f3d499c Merge branch 'MDL-37522-published-attachment_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE 2013-03-04 20:47:15 +01:00
Eloy Lafuente (stronk7)
a366e1282a Merge branch 'wip-MDL-33013-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE 2013-03-04 20:17:12 +01:00
Eloy Lafuente (stronk7)
48f3a2495b Merge branch 'MDL-36380-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2013-03-04 18:00:15 +01:00
Eloy Lafuente (stronk7)
328b5eab5c Merge branch 'wip-MDL-37983-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE 2013-03-04 16:43:09 +01:00
Eloy Lafuente (stronk7)
c3dd18842b Merge branch 'MDL-38170-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2013-03-04 16:26:25 +01:00
Sam Hemelryk
ac19bd186a Merge branch 'MDL-35350_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2013-03-04 16:12:43 +13:00
Sam Hemelryk
fa5509b73c Merge branch 'MDL-35127-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-03-04 16:07:51 +13:00
Frederic Massart
ded4050f1b MDL-36426 repository: Prevent login_as() users to access 2013-03-04 02:38:29 +01:00
Sam Hemelryk
c3a1ea1843 Merge branch 'MDL-37625-m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE 2013-03-04 14:18:19 +13:00
Sam Hemelryk
8e7afd6bf5 Merge branch 'MDL-36128-moodle23' of https://github.com/StudiUM/moodle into MOODLE_23_STABLE 2013-03-04 13:59:21 +13:00
Frederic Massart
0e94caf991 MDL-37681 repository_webdav: improved form handling when configuring an instance 2013-03-04 13:45:04 +13:00
Sam Hemelryk
fb3f9c4a50 Merge branch 'MDL-38168-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2013-03-04 13:34:47 +13:00
Frederic Massart
ca2a7956b2 MDL-37507 repositories: improved formatting of external resources 2013-03-04 13:28:31 +13:00
Mark Nielsen
2c7cdbb3b0 MDL-36901: Remove system paths from exceptions 
Replaces any server paths, like dataroot, with a token
in exception messages and debug info.

Conflicts:
	lib/tests/setuplib_test.php
 2013-03-04 00:16:55 +01:00
Frederic Massart
c7eea4e585 MDL-37481 user: fixed bug when logged in as guest 2013-03-04 11:18:05 +13:00
Sam Hemelryk
0897b1eab1 Merge branch 'MDL-32125-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_STABLE 2013-03-04 10:30:24 +13:00