Compare commits

..

2586 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) 928f14b3cc Moodle release 2.4.11 2014-07-12 19:10:21 +02:00
AMOS bot e417377e89 Merge branch 'MOODLE_24_STABLE' into install_24_STABLE 2014-07-11 00:44:37 +00:00
Ankit Agarwal c110815236 MDL-46148 qtype_calculated: low-level defence against bad formulas
This catches things like:
 * Malicious equations coming from backup files.
 * Malicious equations in old questions in the database.
2014-07-10 17:54:28 +08:00
Damyon Wiese bc4fd27768 MDL-46148 questions: Added missing allow_commit for transaction 2014-07-10 11:38:29 +08:00
Tim Hunt 2576939e4d MDL-46148 qtype_calculatedsimple: fix notice
... when adding a dataset with a formula error.
2014-07-09 14:42:35 +01:00
Tim Hunt c8beaf6d70 MDL-46148 qtype_calculated: fix validation when importing.
In order to do this in a sane way, I cleaned up a lot of old mess,
inclduing:

1. Previously, qtype_calcuated used ->answeres when importing, and
->answer when saving the form. This was crazy, so I fixed it, and
stripped out the code that made the alternative variable name work.

2. Similarly, it could handle ->answer being either an array, such as
you would get form the HTML editor, or a simple string, which is what
you get form the form. I simplified that too.

3. Finally, I made import use a transaction around saving each
question, so we don't get half questions in the database when an error
occurs.
2014-07-09 14:42:24 +01:00
Tim Hunt 64d9b08a99 MDL-46148 qtype_calculated: removed unused method. 2014-07-09 14:38:14 +01:00
David Mudrák b5dacb5488 MDL-46223 Fix frequently used comments in the marking guide
When the frequently used comment contains a character like >, re-use it
directly instead of its HTML entitiy.
2014-07-09 16:45:35 +08:00
David Mudrák 8380722bb1 MDL-46223 Improve the display of marking guide validation message 2014-07-09 16:45:32 +08:00
Frederic Massart a1ae35173b MDL-45471 javascript: Escape content of exception dialogs 2014-07-08 14:12:40 +01:00
Marina Glancy a99ad20d94 MDL-43948 forms: setting types to filemanager and editor elements 2014-07-08 10:47:40 +01:00
David Mudrák 470a466d7f MDL-46223 Improve the marking guide output 2014-07-08 13:26:25 +08:00
David Mudrák f25f472be4 MDL-46223 Improve the rubric output 2014-07-08 13:26:25 +08:00
Marina Glancy 8f7d596058 MDL-45760 make sure to check permission before setting header 2014-07-07 15:06:57 +01:00
Tim Hunt a2bf5412a7 MDL-46148 qtype_calculated: fix formula validation. 2014-07-07 14:34:19 +01:00
Frederic Massart 9b60a086cf MDL-45417 mod_imscp: Prevent entity injections from package content 2014-07-07 13:03:11 +01:00
Frederic Massart 3b68d1b23a MDL-45463 mod_lti: Prevent XML entity injections from provider 2014-07-07 13:00:30 +01:00
Marina Glancy 5c4ef26c39 MDL-45616 repositories: use json encoding instead of serialization 2014-07-07 14:57:35 +08:00
Marina Glancy cb2b42aed8 MDL-45616 repositories: more clearly distinguish when we use source and when reference
Function repository::get_moodle_file() should always be called on packed reference and not on the source received from user.
Also added phpdocs to some other methods that were confusing source and reference
2014-07-07 14:57:33 +08:00
Rex Lorenzo a5abafcde2 MDL-45485 auth_shibboleth: User taking over other user's session
Replacing code with call to complete_user_login() since it calls session_regenerate_id().
2014-07-07 13:57:55 +08:00
Dan Poltawski 33bd0be19d MDL-43848 messages: do not display message content in popups
The user is not in control of when these popups show up and it
may not be appropiate to have part of this content display whilst
in the presence of other users.
2014-07-07 13:48:58 +08:00
AMOS bot dadf5df9a1 Automatically generated installer lang files 2014-07-04 00:44:43 +00:00
AMOS bot 67ed4cf0db Automatically generated installer lang files 2014-07-02 00:45:02 +00:00
AMOS bot c02a7aa383 Automatically generated installer lang files 2014-06-29 00:43:15 +00:00
AMOS bot a66d3cf108 Automatically generated installer lang files 2014-06-25 00:45:49 +00:00
AMOS bot a4cbbf1513 Automatically generated installer lang files 2014-06-25 00:45:49 +00:00
AMOS bot 693b574a7e Automatically generated installer lang files 2014-06-21 00:43:57 +00:00
AMOS bot e6ec9e634a Automatically generated installer lang files 2014-06-19 00:43:12 +00:00
AMOS bot 89f0eef044 Automatically generated installer lang files 2014-06-18 00:42:48 +00:00
AMOS bot 7f1c9be2b0 Automatically generated installer lang files 2014-06-15 00:43:07 +00:00
AMOS bot bab839a451 Automatically generated installer lang files 2014-06-12 00:43:56 +00:00
AMOS bot a06829f8ac Automatically generated installer lang files 2014-05-30 01:24:59 +00:00
AMOS bot 2776e08311 Automatically generated installer lang files 2014-05-30 01:24:59 +00:00
AMOS bot 1315b34bff Automatically generated installer lang files 2014-05-23 00:53:12 +00:00
AMOS bot c3a5b90bf5 Automatically generated installer lang files 2014-05-22 01:08:33 +00:00
Eloy Lafuente (stronk7) c348d41703 Moodle release 2.4.10 2014-05-10 18:30:28 +02:00
AMOS bot 9bf48960a3 Merge branch 'MOODLE_24_STABLE' into install_24_STABLE 2014-05-09 00:41:12 +00:00
Frederic Massart 729783c4ba MDL-45332 repository_url: URL parameter is using PARAM_URL 2014-05-08 15:36:20 +08:00
Damyon Wiese 42367c0f27 MDL-44750 Assign: Do not reveal student identities to screen readers 2014-05-07 16:51:01 +08:00
Marina Glancy ec22de0a5e MDL-45126 do not allow guests see name and summary of hidden course 2014-05-07 16:22:25 +08:00
Juan Leyva 437240b5aa MDL-43119 Add valid until dates for tokens created by login/token.php
3 months were decided

Conflicts:
	login/token.php
2014-05-07 16:16:24 +08:00
Frederic Massart 40ad22fdd0 MDL-43877 blocks: Files from blocks in my/ were accessible to the world 2014-05-07 14:27:34 +08:00
Damyon Wiese a57eacc114 MDL-44606 Assign: Some grading functions are missing sesskey protection 2014-05-07 12:37:22 +08:00
AMOS bot 5c8dd04a6c Automatically generated installer lang files 2014-05-02 00:39:26 +00:00
AMOS bot e893e0bf51 Automatically generated installer lang files 2014-04-23 00:38:22 +00:00
AMOS bot 5bcd9913b9 Automatically generated installer lang files 2014-04-22 11:15:24 +00:00
AMOS bot 7e69ec54cc Automatically generated installer lang files 2014-04-10 22:38:54 +00:00
AMOS bot 55399b5964 Automatically generated installer lang files 2014-04-07 22:40:03 +00:00
AMOS bot 1199892ebd Automatically generated installer lang files 2014-04-03 09:28:26 +00:00
AMOS bot c24fc9707c Automatically generated installer lang files 2014-03-27 00:48:36 +00:00
Eloy Lafuente (stronk7) 8ec057ca45 Moodle release 2.4.9 2014-03-07 18:51:34 +01:00
AMOS bot fbc50fb699 Merge branch 'MOODLE_24_STABLE' into install_24_STABLE 2014-03-07 00:54:52 +00:00
AMOS bot b0ec2d8cb5 Automatically generated installer lang files 2014-03-05 00:54:50 +00:00
Dan Poltawski eee61675f0 MDL-43146 enrol_imsenterprise: missing sesskey protection 2014-03-04 12:28:11 +08:00
Frederic Massart 4bc5dd3217 MDL-29409 repository_alfresco: Drop support for URL/link
The current solution has two major issues. Firstly, it is using the
session key in the file URL, allowing anyone with the link to steal
the identify of the poster. Secondly, the links are not presistent
and become broken as soon as the server is restarted. Let's not
support this any more until a proper solution is found in MDL-26454.
2014-03-04 11:35:03 +08:00
Marina Glancy d9596365e5 MDL-39990 wiki: more detailed validation of view/edit access 2014-03-03 14:45:17 +08:00
Andrew Davis 7748e17207 MDL-44082 mod_chat: added a security check for users already in the chat activity 2014-03-03 12:16:54 +08:00
Tomasz Muras aea324963d MDL-43656 mod_feedback: availablity date logic incorrect 2014-03-03 11:24:44 +08:00
Tim Hunt fd4b7f5739 MDL-43690 quiz_question_tostring missing s().
This meant that the edit quiz page sometimes had invalid HTML.
2014-03-03 11:00:33 +08:00
Maria Torres ae0ec61180 MDL-43916 - Email addresses incorrectly displayed
When capabilities and settings do not allow it.
2014-03-03 10:37:29 +08:00
Dan Poltawski b97e5658ea Merge branch 'w06_MDL-43344_m24_flow' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2014-03-03 10:07:30 +08:00
AMOS bot c3083344ec Automatically generated installer lang files 2014-03-01 00:56:08 +00:00
AMOS bot b186033382 Automatically generated installer lang files 2014-02-21 00:45:34 +00:00
Eloy Lafuente (stronk7) a3edb5252a weekly release 2.4.8+ 2014-02-20 12:43:14 +01:00
Eloy Lafuente (stronk7) b268d4a05c Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2014-02-20 12:43:10 +01:00
Damyon Wiese e50a4e2386 Merge branch 'MDL-44018_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2014-02-19 10:25:00 +08:00
Tim Hunt 9b19a46099 MDL-44118 new environment check are all quiz attempts upgraded.
In Moodle 2.1, there was a major DB upgrade relating to questions, and
it was possible to delay some of that upgrade. Now, those DB tables are
changing again, and the time has come to insist that all the updata has
been upgraded (or deleted).
2014-02-18 12:06:15 +00:00
AMOS bot 77f8c68f44 Automatically generated installer lang files 2014-02-15 00:43:55 +00:00
AMOS bot 798b7b04af Automatically generated installer lang files 2014-02-12 00:42:56 +00:00
AMOS bot 88c96fd2f3 Automatically generated installer lang files 2014-02-11 00:42:15 +00:00
Tim Hunt 16ae4b809d MDL-44018 quesiton variant was not backed up or restored. 2014-02-06 09:53:45 +00:00
AMOS bot 35f6017d21 Automatically generated installer lang files 2014-02-02 00:42:21 +00:00
AMOS bot 085abbb371 Automatically generated installer lang files 2014-01-31 00:43:06 +00:00
Petr Skoda c3cd5e1db9 MDL-43344 upgrade to latest Flowplayer 2014-01-30 10:33:40 +08:00
AMOS bot 1f771e4103 Automatically generated installer lang files 2014-01-22 00:55:32 +00:00
AMOS bot cc18262792 Automatically generated installer lang files 2014-01-21 00:41:41 +00:00
AMOS bot ba7340108e Automatically generated installer lang files 2014-01-20 00:41:25 +00:00
AMOS bot 9dadea2557 Automatically generated installer lang files 2014-01-19 00:41:59 +00:00
AMOS bot 832d5b682d Automatically generated installer lang files 2014-01-16 00:43:20 +00:00
AMOS bot a2c9045867 Automatically generated installer lang files 2014-01-14 00:45:42 +00:00
Eloy Lafuente (stronk7) 76b9a9407f Moodle release 2.4.8 2014-01-11 15:57:17 +01:00
Damyon Wiese 532df04583 weekly release 2.4.7+ 2014-01-10 14:19:59 +08:00
Damyon Wiese f8d0e9ad5b Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2014-01-10 14:19:55 +08:00
Eloy Lafuente (stronk7) a4a01b4b96 MDL-36721 make upgrade queries cross-db 2014-01-10 11:24:52 +08:00
AMOS bot 93d224f333 Automatically generated installer lang files 2014-01-09 00:42:16 +00:00
Eloy Lafuente (stronk7) 09aa9e90b9 Merge branch 'wip-MDL-42310-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2014-01-08 01:52:58 +01:00
Eloy Lafuente (stronk7) 143dc29e0d Merge branch 'm24_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle into MOODLE_24_STABLE 2014-01-08 00:46:31 +01:00
Dan Poltawski cf51a722c7 Merge branch 'm24_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle into MOODLE_24_STABLE 2014-01-07 17:20:57 +08:00
Andrew Nicols 076792a3f1 MDL-43411 JavaScript: Correct checks for section support to use helper function 2014-01-07 12:51:01 +08:00
Dan Poltawski 32d89e0c0d Merge branch 'm24_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle into MOODLE_24_STABLE 2014-01-07 12:43:34 +08:00
Rajesh Taneja 8b2dca7427 MDL-42643 course: Member in same group should only loginas
If course groupmode is set to SEPARATEGROUPS, and user doesn't have
site:accessallgroups capability than only allow user to loginas if
current user is in same group as loginas user
2014-01-07 11:05:45 +08:00
Tony Butler a4720e016e MDL-43373 core_enrol: Display enrolments dimmed if outside of start or end times 2014-01-07 10:44:39 +08:00
Damyon Wiese f8acb4a7de Merge branch 'MDL-43448_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2014-01-07 09:15:08 +08:00
Tim Hunt 31a70002d3 MDL-43448 Links to the gradebook not fixed on restore.
Note we can only fix certain generic links, we can't handle ones like
/grade/report/{reportname}/index.php, but fortunately, we were only
using the generic ones.

I added a couple of other likely things too (badges and participants
list).
2014-01-06 12:31:28 +00:00
Damyon Wiese 506bae6791 Merge branch 'w01_MDL-36721_m24_passlog' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2014-01-06 14:49:39 +08:00
Dan Poltawski e9576ab6b4 Merge branch '43349-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2014-01-06 14:21:50 +08:00
Rajesh Taneja a902db80d6 MDL-42883 Administration: Check sessionkey before taking action on user profile fields 2014-01-06 13:59:12 +08:00
Sam Hemelryk b8ac884f9d Merge branch 'MDL-37962_beep_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2014-01-06 11:17:47 +13:00
Sam Hemelryk 6e2745d238 Merge branch 'MDL-42212-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2014-01-06 10:29:55 +13:00
Michael Milette b9bdec3f35 MDL-42310 feedback mod - Enable filtering of multichoice and multichoice rated controls
Conflicts:
	mod/feedback/item/multichoice/lib.php
	mod/feedback/item/multichoicerated/lib.php

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
2014-01-03 10:35:41 +08:00
Sam Hemelryk 87f62d8e09 MDL-43349 cache: init now checks store requirements are met 2014-01-02 09:22:28 +13:00
AMOS bot 76f354d196 Automatically generated installer lang files 2013-12-30 00:43:27 +00:00
AMOS bot fb327938c9 Automatically generated installer lang files 2013-12-29 00:43:28 +00:00
Matteo Scaramuccia 6cafb62b1e MDL-40379 Files Prevent mobile network providers from modifying content. 2013-12-28 14:07:28 +01:00
Matteo Scaramuccia 73c8dc3692 MDL-43508 Quiz Invalid get_string() identifier. 2013-12-28 11:32:55 +01:00
Petr Škoda 6537f3525e MDL-36721 do not store passwords in config logs 2013-12-27 11:39:07 +08:00
AMOS bot 199ca97486 Automatically generated installer lang files 2013-12-25 00:42:53 +00:00
Matteo Scaramuccia adf8e5ce6e MDL-43482 Chat Lot of "Only variables should be passed by reference". 2013-12-24 11:12:17 +01:00
Sam Hemelryk 14d1f4e42e weekly release 2.4.7+ 2013-12-24 17:17:36 +13:00
Sam Hemelryk 52c4f06af3 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-12-24 17:17:34 +13:00
Sam Hemelryk 27b1ba527a Merge branch 'MDL-41246-moodle24' of git://github.com/StudiUM/moodle into MOODLE_24_STABLE 2013-12-24 11:41:15 +13:00
Sam Hemelryk 085c2fd228 Merge branch 'MDL-43438-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-12-24 11:22:37 +13:00
Sam Hemelryk 235b5a0c1d Merge branch 'MDL-43250-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-12-24 11:03:51 +13:00
AMOS bot 04d6be9bb2 Automatically generated installer lang files 2013-12-23 12:40:16 +00:00
AMOS bot f66f661ce0 Automatically generated installer lang files 2013-12-23 12:26:30 +00:00
Sam Hemelryk 7f4fa839fe Merge branch 'MDL-35032-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-12-23 15:57:25 +13:00
Sam Hemelryk faf4e51da9 Merge branch 'MDL-30195-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-12-23 14:35:24 +13:00
Sam Hemelryk a7dae3ef8e Merge branch 'w52_MDL-43367_m24_contextpath' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-12-23 14:31:18 +13:00
Sam Hemelryk a35428cf86 Merge branch 'MDL-34182-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-12-23 08:15:48 +13:00
Petr Škoda f06d89b2b5 MDL-43367 stop returning of bogus context children when path unknown
This also prevents deletion of system context.
2013-12-22 16:01:25 +08:00
Damyon Wiese 346ef562dc weekly release 2.4.7+ 2013-12-20 11:57:15 +08:00
Damyon Wiese 2718718464 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-12-20 11:57:12 +08:00
Andrew Nicols 05c42f7539 MDL-34182 Repositories: Check for and warn on invalid output in the file picker 2013-12-19 10:29:56 +08:00
Andrew Nicols 05ca6dadf8 MDL-34182: Add functions to warn of output in AJAX scripts
We need to be able to capture output when including contributed code as it
may add additional content which makes makes the json we output invalid.

We only warn of these errors if the site is in debugdeveloper, otherwise
we silently drop them.
2013-12-19 10:29:56 +08:00
Eloy Lafuente (stronk7) 4226a54d53 Revert "MDL-43306 restore: fix grade item sortorder restoration"
This reverts commit bea3c273a3.
2013-12-19 02:15:51 +01:00
AMOS bot 02d052026c Automatically generated installer lang files 2013-12-19 00:44:18 +00:00
Jean-Philippe Gaudreau 19ef016778 MDL-41246 cache: Fix PHP notice of non well formed numeric values for the memcache store 2013-12-18 08:53:41 -05:00
Frederic Massart 5e64cff4f1 MDL-43438 mod_assignment: Prevent double inclusion of plugin files 2013-12-18 09:17:00 +01:00
Dan Poltawski e575b2f6d1 Merge branch 'MDL-41198-24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE 2013-12-18 15:00:11 +08:00
Russell Smith 3cc1d4b9fe MDL-41198 lib: Add comment about the changes to srand on adodb 2013-12-18 17:05:48 +11:00
Russell Smith a7b9ce4caf MDL-41198 lib: Allow PHP to generate random seed on script start
Most srand instances are removed to allow PHP to do the work.

srand was left for group randomization due to the method used.

Conflicts:

	lib/tests/accesslib_test.php
2013-12-18 17:05:09 +11:00
Russell Smith 17d617dc66 MDL-41198 lib: Allow PHP to generate random seed on script start
All mt_srand instances are removed to allow PHP to do the work.
2013-12-18 17:04:11 +11:00
Sam Hemelryk ceb23943ee Revert "MDL-42104: trap tab focus within dialog modal,"
This reverts commit 172321d7d8.
2013-12-18 15:54:21 +13:00
Russell Smith 44eaae9610 MDL-41292 cache: only update identifiers if they change 2013-12-18 02:23:55 +01:00
Sam Hemelryk 47358bdaa5 Merge branch 'MDL-42104_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-12-18 11:59:28 +13:00
Sam Hemelryk a39ff69d58 Merge branch 'MDL-38698-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-12-18 09:21:10 +13:00
Eloy Lafuente (stronk7) c70955dfa9 Merge branch 'MDL-43306-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-12-17 10:29:51 +01:00
Frederic Massart 8187097dc0 MDL-38698 filter_urltolink: Remove performance test in Unit Test 2013-12-17 07:04:56 +01:00
Frederic Massart 3d947610a0 MDL-38698 filter_urltolink: Do not link the URL property of CSS 2013-12-17 07:04:56 +01:00
Marina Glancy 003638cb8d Merge branch 'MDL-37679-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-12-17 16:44:36 +11:00
Mark Nielsen c30533cfed MDL-37679 Course: Adding section to page title on section only pages 2013-12-17 11:43:14 +08:00
Marina Glancy 6af74e102c Merge branch 'MDL-41075-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-12-17 11:24:46 +11:00
Russell Smith 18559a0df6 MDL-39725 database: Add statistics collection functions
Conflicts:
	lib/dml/moodle_database.php
2013-12-17 10:29:32 +13:00
Russell Smith eb17e8ecd5 MDL-39725 database: Include stats collections in unit tests
Conflicts:
	lib/ddl/tests/ddl_test.php
2013-12-17 10:29:29 +13:00
Russell Smith 96e60a978e MDL-39725 database: Apply database statistics update to daily stats 2013-12-17 10:29:25 +13:00
Sam Hemelryk 1b5fea23bd Merge branch 'MDL-25473-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-12-17 08:53:38 +13:00
Sam Hemelryk 00621ce929 Merge branch 'MDL-34321-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-12-17 08:47:26 +13:00
Frederic Massart 1ed22de511 MDL-30195 portfolio_googledocs: Allow export of rich HTML 2013-12-16 11:05:46 +01:00
Frederic Massart 48ffd4c677 MDL-42212 mod_lesson: Localise area names 2013-12-16 06:50:02 +01:00
Frederic Massart 4a59b3b555 MDL-42212 mod_lesson: Fix callbacks retrieving activity files 2013-12-16 06:50:01 +01:00
Jerome Mouneyrac 00f2669025 MDL-41075 Remove "Choose..." option from participants page. 2013-12-16 12:09:01 +08:00
Sam Hemelryk 4d3ee68536 Merge branch 'wip-mdl-21180-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-12-16 15:43:12 +13:00
Rajesh Taneja 0034080028 MDL-21180 Gradebook: Consistent handling of change in aggregation
Change from/to GRADE_AGGREGATE_WEIGHTED_MEAN and GRADE_AGGREGATE_EXTRACREDIT_MEAN was only
handled prior to this patch. GRADE_AGGREGATE_SUM and GRADE_AGGREGATE_WEIGHTED_MEAN2 also
behave similar and should be handled same way
2013-12-16 09:59:46 +08:00
Andrew Davis c8d061208d MDL-43188 core_message:reimplemented the beep on new message functionality from 1.9 2013-12-16 09:41:20 +08:00
Marina Glancy 5df656cadd Merge branch 'MDL-37972-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-12-16 12:29:19 +11:00
Sam Hemelryk 6a68b92cff Merge branch 'MDL-40096-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-12-16 13:50:44 +13:00
Sam Hemelryk 1ce52ce8db Merge branch 'MDL-40436-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-12-16 11:30:14 +13:00
Sam Hemelryk 7d07632f7a Merge branch 'w51_MDL-42931_m24_env27' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-12-16 11:17:19 +13:00
Sam Hemelryk 34965b0d31 Merge branch 'MDL-42085-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-12-16 11:11:05 +13:00
AMOS bot 7105ca55cb Automatically generated installer lang files 2013-12-14 00:45:09 +00:00
Frederic Massart 0d3e293c5c MDL-35032 mod_book: 1.9 backup restore convertis files to book area 2013-12-13 10:26:26 +01:00
Petr Škoda f4776ae40a MDL-42931 set new requirements for 2.7 2013-12-13 14:08:21 +08:00
Sam Hemelryk c9a3d370c4 weekly release 2.4.7+ 2013-12-13 16:59:18 +13:00
Sam Hemelryk ebe7179a88 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-12-13 16:59:16 +13:00
AMOS bot aec655131b Automatically generated installer lang files 2013-12-13 00:42:16 +00:00
Frederic Massart 0291a8b492 MDL-40436 block_course_list: Fix bad context resolution
We were trying to get the course context of a remote course
from a completely unrelated ID. It would sometimes work if the
ID was matching the one of a local course. In other places
we are not trying to find a context for the remote course, we
simply use the $PAGE context in format_string. So the usage
of the context has been removed here too.
2013-12-12 09:09:29 +01:00
Jerome Mouneyrac fca50b95ef MDL-42085 Enrol: Always apply enrolment duration.
Before the fix, the startdates and duration fields were integrated to HTML code only
when the user clicked on the collapsible region to see them.
It was wrong because their values were not sent by the form
if ever the user didn't expand this Enrolment options region.
2013-12-12 16:08:06 +08:00
Damyon Wiese 5506f0482c MDL-43250 Assign: separate groups mode fix
When in separate groups mode, only get graders in a group that is in the course module grouping.

Conflicts:

	mod/assign/locallib.php
	mod/assign/tests/locallib_test.php
2013-12-12 13:33:10 +08:00
Jason Fowler 410fff85d0 MDL-34321 Assignment2.2 - Fixing submission count 2013-12-12 10:36:07 +08:00
Eloy Lafuente (stronk7) 9a5af14929 MDL-31410 paypal: fix problem on notifications
This commit fixes a PHP warning about using a
unititialised variable and also the problems when
notifications are enabled and there is not yet a
teacher in the course, defaulting to admin for student
notifications and preventing teacher notifications to happen.
2013-12-12 02:03:41 +01:00
Eloy Lafuente (stronk7) a847569195 Merge branch 'w50_MDL-31410_m24_paypalipn' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-12-12 01:17:53 +01:00
Marina Glancy 7cbba9b175 MDL-43218 blog: prepare the blog navigation only when needed 2013-12-11 15:38:07 +13:00
Simon Coggins c21708e5e4 MDL-43218 navigation: Remove link to blogs when they are disabled 2013-12-11 15:38:01 +13:00
Sam Hemelryk 133870d759 Merge branch 'wip-MDL-43279-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-12-11 10:57:46 +13:00
Eloy Lafuente (stronk7) 690c28e94a Merge branch '24STABLE-wip-MDL-43135' of https://github.com/jennymgray/moodle into MOODLE_24_STABLE 2013-12-10 19:47:21 +01:00
Jenny Gray 82882a9034 MDL-43135 Guest Enrol: new language string for with key icon
AMOS BEGIN
CPY [pluginname,enrol_guest], [guestaccess_withpassword,enrol_guest]
CPY [pluginname,enrol_guest], [guestaccess_withoutpassword,enrol_guest]
AMOS END
2013-12-10 11:13:52 +00:00
rwijaya 172321d7d8 MDL-42104: trap tab focus within dialog modal,
for filepicker and filemanager
2013-12-10 15:48:48 +08:00
Sam Chaffee bf139ab2c2 MDL-37972 Assignment: fixing settings link for upload single submissions 2013-12-10 14:09:15 +08:00
Dan Poltawski bea3c273a3 MDL-43306 restore: fix grade item sortorder restoration
Previously, restore was blindly inserting the old sort order into the
database, causing duplicate sortorders which lead to unpredicatble
sorting results.

Now we will use the api function to add it after the original sortorder,
this means if a duplicate exists in the original location, this item
will appear after it.
2013-12-10 12:33:52 +08:00
Marina Glancy 143c8e7489 Merge branch 'm24_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-12-10 14:48:25 +11:00
Marina Glancy 10f476e3a5 Merge branch 'MDL-43131_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-12-10 14:13:30 +11:00
Jason Fowler de1982ca05 MDL-25473 mediaplayer - prevent embedded videos from looping 2013-12-10 10:42:41 +08:00
Marina Glancy 79205746bc MDL-43279 block_blog_recent: fixed undefined property notice 2013-12-10 09:30:41 +11:00
Sam Hemelryk 71e7d2552b Merge branch 'm24_MDL-43019' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-12-10 08:28:35 +13:00
Eloy Lafuente (stronk7) 2c4120360a Merge branch 'MDL-40003-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-12-09 16:24:53 +01:00
Sam Chaffee 780a21f62a MDL-40003 mod_assign: Fixed submission comments not being restored 2013-12-09 11:04:02 +01:00
Damyon Wiese 9b378f3dc5 MDL-40096 assign: Prevent js error because uniqid() is not unique.
Use html_writer::random_id instead because it incorporates a static counter.
2013-12-09 10:27:34 +08:00
Marina Glancy ada23f968a Merge branch 'MDL-39618-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-12-09 11:03:30 +11:00
Petr Škoda 1da6855d1c MDL-31410 always send 200 in PayPal IPN response and hide all errors 2013-12-06 10:06:20 +08:00
Matteo Scaramuccia 3f007ca625 MDL-43082 Themes IE 9 Compatibility View doesn't support SVG. 2013-12-05 16:03:19 +01:00
Tim Hunt 71660782eb MDL-43131 qbank: Fix show question text when first viewing.
When you followed the link to the question bank, the checkbox for the
"Show question text in the question list" option correctly reflected the
user's preference, but what was actually shown in the question bank did
not.
2013-12-05 11:13:50 +00:00
Sam Hemelryk 8c5ca6531b MDL-39575 install: better handling of database creation error.
Implemented better handling of DML exceptions.
Added translation for cannotcreatedb exception.
2013-12-05 16:20:00 +08:00
Dan Poltawski 98f4a31ce0 weekly release 2.4.7+ 2013-12-05 15:09:59 +08:00
Dan Poltawski 9aeef50434 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-12-05 15:09:56 +08:00
Dan Poltawski a6a85dc49b Merge branch 'MDL-43068_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-12-05 09:34:04 +08:00
Dan Marsden f2858a669a MDL-43019 SCORM: always use iframe instead of object - backported from 2.6 - fixes issue with IE 11 SCORM packages not loading 2013-12-05 13:15:04 +13:00
Tim Hunt 2c7a4204e7 MDL-43068 course&gradebook: fix use of new API in old branches. 2013-12-04 15:40:00 +00:00
AMOS bot 8ecbc00c77 Automatically generated installer lang files 2013-12-04 00:43:17 +00:00
Eloy Lafuente (stronk7) 45c03504ad Merge branch 'MDL-41446-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-12-03 23:56:02 +01:00
Mark Nelson e7698992b7 MDL-43142 mnet: fixed typo in variable passed to get_string 2013-12-03 23:42:04 +01:00
Mark Nelson 309481dde0 MDL-43140 mnet: display header after redirects to avoid warning 2013-12-03 23:26:11 +01:00
Eloy Lafuente (stronk7) 532a6ba83c Merge branch 'moodle24-mdl33971' of https://github.com/tlock/moodle into MOODLE_24_STABLE 2013-12-03 17:37:15 +01:00
James Pratt 5267a05191 MDL-43079 quiz statistics : fix stats graph when all grades zero 2013-12-03 17:07:22 +01:00
Damyon Wiese 7183b0f995 Merge branch 'wip-mdl-43048-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-12-03 11:44:28 +08:00
Damyon Wiese 16d88af2ab MDL-42904: Self enrol. Fix sloppy version numbers 2013-12-03 11:21:40 +08:00
Damyon Wiese cf569389ab Merge branch 'wip-mdl-42904-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-12-03 11:20:47 +08:00
Sam Hemelryk dc76ce70b2 Merge branch 'w48_MDL-41819_m24_maxinputvars' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-12-03 09:57:03 +13:00
Damyon Wiese 4818244d27 Merge branch 'm24_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-12-02 14:35:53 +08:00
Dan Poltawski 838a2120fb Merge branch 'wip-MDL-40191-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-12-02 11:19:49 +08:00
Dan Poltawski d8d43cdc18 Merge branch 'MDL-43068_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-12-02 11:11:12 +08:00
AMOS bot e623b9afcc Automatically generated installer lang files 2013-12-02 00:42:58 +00:00
Petr Škoda db217f006c MDL-41819 try to work around max_input_vars restriction 2013-12-02 08:30:47 +08:00
Marina Glancy 60aae880a4 MDL-40191 navigation: do not throw an error if activity is not visible
navigationlib is not the place to check it, let the page itself decide what to do in this case
2013-12-02 10:50:20 +11:00
David Mudrák 22bf788f6b MDL-40191 MDLSITE-2455 Do not throw coding exception when the activity is not found
Under certain conditions, coding exception is thrown when fetching items from
the navigation bar. The patch prevents them. See more details in the tracker.
2013-12-02 10:50:20 +11:00
Sam Hemelryk 7842d36f71 MDL-43033 cache: added stats logging to set_many methods 2013-12-02 09:29:32 +13:00
Sam Hemelryk fc9a82669f MDL-43033 pix: backport warning icon 2013-12-02 09:29:32 +13:00
Sam Hemelryk e88938d9cc MDL-43033 cache: fixed display of definition stores in admin interface 2013-12-02 09:29:31 +13:00
Sam Hemelryk d7b0846147 MDL-43033 cache: added a warning icon for mappings
We now show a warning icon with an explanatory alt if the user
has mapped a store as a mode default that doesn't not fulfill the
requirements of every known definition.
2013-12-02 09:29:31 +13:00
Sam Hemelryk 95b732848e MDL-43033 cache: fixed mode map event invalidation scenario 2013-12-02 09:29:31 +13:00
Sam Hemelryk afab006332 MDL-43033 cache: added stats logging to get_many methods 2013-12-02 09:29:31 +13:00
Matteo Scaramuccia 71d414b090 MDL-43039 Libraries "The session partition is full." false positive. 2013-11-30 14:32:24 +01:00
Dan Poltawski 828aff67d9 weekly release 2.4.7+ 2013-11-29 12:52:44 +08:00
Dan Poltawski 83f506da1e Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-11-29 12:52:42 +08:00
Tim Hunt 553672355c MDL-43068 course&gradebook: show/hide cm & CONTROLS_GRADE_VISIBILITY
Making a quiz visible on the course page, of via the settings form,
could cause the grade item to become visible in the gradebook, even
though the quiz supports FEATURE_CONTROLS_GRADE_VISIBILITY to ensure
that when the grades are hidden in the quiz settings, they do not appear
in the gradebook.

Now, if a module supports FEATURE_CONTROLS_GRADE_VISIBILITY, then
set_coursemodule_visible calls the _grade_item_update callback to update
the grade item(s).

In addition, there was a bug when saving the quiz form, where it used
the value of $cm->visible from the database, which was wrong if the
value of cm->visible had just been changed on the setting form.
2013-11-28 10:03:56 +00:00
AMOS bot eaccc920db Automatically generated installer lang files 2013-11-28 09:12:45 +00:00
Tim Lock 416d7a94be MDL-33971: When viewing course log entries for Quiz View Summary a number is displayed not the quiz name 2013-11-28 07:50:42 +10:30
Rajesh Taneja 70f62d8944 MDL-43048 block_tags: Initalised content->text for tags block 2013-11-27 14:38:07 +08:00
Dan Poltawski c96069566a Merge branch 'wip-mdl-41635-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-11-27 11:14:52 +08:00
Rajesh Taneja da568835a5 MDL-41635 Report: Added string to action link for display 2013-11-27 09:56:34 +08:00
Tim Lock 9bd1ba9ee6 MDL-42998: Fix user selection search options autoselectunique. 2013-11-27 09:09:52 +08:00
AMOS bot f0cfc08699 Automatically generated installer lang files 2013-11-27 00:48:27 +00:00
Eloy Lafuente (stronk7) 62daeecc11 Merge branch 'm24_MDL-43045' of git://github.com/totara/moodle into MOODLE_24_STABLE 2013-11-26 21:30:46 +01:00
Dan Poltawski 7d784e4ade Merge branch 'MDL-43000_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-11-26 15:06:41 +08:00
Dan Poltawski e5ca507c6e Merge branch 'wip-mdl-41635-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-11-26 10:25:05 +08:00
Sam Hemelryk 10123d02f6 Merge branch 'MDL-43005-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-11-26 08:41:48 +13:00
Simon Coggins 3476a15b0f MDL-43045 report: Fix missing role name in security overview report 2013-11-26 08:24:09 +13:00
Damyon Wiese 689c45e54e Merge branch 'wip-MDL-41257-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2013-11-25 13:47:10 +08:00
Dan Poltawski 117c147757 Merge branch 'w48_MDL-37016_m24_sloppymysql' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-11-25 13:41:00 +08:00
Damyon Wiese 45d9d6d710 Merge branch 'wip-mdl-42924-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-11-25 13:17:13 +08:00
Dan Poltawski 717612c7aa Merge branch 'MDL-42547_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-11-25 10:37:40 +08:00
Rajesh Taneja ccdfa44df0 MDL-42904 self_enrol: Set customint1 if it's null 2013-11-25 10:10:48 +08:00
Eloy Lafuente (stronk7) 0ecaebd487 Merge branch 'wip-MDL-29071-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-11-24 16:51:37 +01:00
Petr Škoda 709752225c MDL-37016 fix sloppy mysql nulls in event.uuid 2013-11-24 15:13:27 +08:00
Tim Hunt 70127f1f3c MDL-43000 shortanswer qtype: handle patterns with many *s
Teachers were typing patterns like
********************************<em>****************************</em>
which translates into a pattern like .*.*.*.*, which is very inefficient
to try to match, althought it is equivalent ot a single .*. At a certain
point preg was just giving up.

Since people actually do this, we should simplify the regex by treating
runs of * like a single *.
2013-11-22 11:34:38 +00:00
Eloy Lafuente (stronk7) a61d4eff50 weekly release 2.4.7+ 2013-11-21 19:33:30 +01:00
Eloy Lafuente (stronk7) 9c3bfbfa3f Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-11-21 19:33:25 +01:00
Ankit Agarwal 9e46c17505 MDL-43005 blogs: Fix issues with blog tags 2013-11-21 13:39:43 +08:00
Marina Glancy 6cf0f60c7d MDL-29071 ddl: unittest for objects name length 2013-11-21 12:41:03 +11:00
Marina Glancy f0a9fb36a3 MDL-29071 ddl: make sure object name never exceeds max length
Many thanks to Ray Bon for finding the problem
2013-11-21 12:40:58 +11:00
Mark Nelson 8fb24d2b43 MDL-42547 tool_uploaduser: trim values before uploading users 2013-11-20 00:38:14 -08:00
FilipBenco 7da998aee8 MDL-41635 Reports: Added missing string in loglive reports
Under course administration navigation log live doesn't appear
or appear with empty string (in some themes), this is happening
because text passed is empty.
2013-11-20 11:29:23 +08:00
Marina Glancy c577657600 Merge branch 'MDL-42767-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-11-20 13:24:29 +11:00
Michael Milette 4dba407997 MDL-41257 calendar: Day and Upcoming-Events view not processed through text_filters() function
This fix adds text filtering to the Calendar Day view and Upcoming Events view, specifically the event name and event description.

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
2013-11-20 10:18:20 +08:00
Rajesh Taneja 183c7cb3f5 MDL-42924 Administration: use normalize_component to extract plugin name and type 2013-11-19 12:02:16 +08:00
Sam Hemelryk 5ba78ea1ff MDL-42060 block_course_list: fixed sorting of mycourses 2013-11-19 10:42:20 +08:00
Dan Poltawski b6ebf8d770 Merge branch 'MDL-42181_24' of git://github.com/mkassaei/moodle into MOODLE_24_STABLE 2013-11-19 10:07:09 +08:00
Damyon Wiese 199e6445f8 Merge branch 'm24_MDL-40223' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-11-19 09:51:53 +08:00
AMOS bot 3cf10869b6 Automatically generated installer lang files 2013-11-19 00:40:30 +00:00
Dan Marsden 2e0a4ca447 MDL-40223 SCORM: pass limit into function instead of hardcoding to allow cross-db 2013-11-19 13:31:33 +13:00
Sam Hemelryk 12bba6cc09 Merge branch 'MDL-41316-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-11-19 12:27:45 +13:00
Sam Hemelryk c53ee31d46 Merge branch 'MDL-42863_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-11-19 12:03:14 +13:00
Sam Hemelryk 7bfd342445 Merge branch 'MDL-42865_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-11-19 11:50:23 +13:00
Sam Hemelryk 7d181fd82d Merge branch 'MDL-42853-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-11-19 10:07:49 +13:00
Ankit Agarwal 34f1a739f1 MDL-42767 notes: Delete notes on a course delete 2013-11-18 16:09:16 +08:00
Dan Poltawski f7a061c2c1 Merge branch 'MDL-42880b_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-11-18 15:38:50 +08:00
Damyon Wiese 67c0ced049 Merge branch 'm24_MDL-41695' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-11-18 15:21:37 +08:00
Dan Marsden 0b0e98d794 MDL-41695 SCORM: allow unlimited decimal places in CMIDecimal 2013-11-18 10:30:15 +13:00
Dan Marsden e0a4008f4e MDL-40223 SCORM: update scorm->launch param after restore - also check that scorm->launch is valid. 2013-11-18 09:54:39 +13:00
Tim Hunt cade07b451 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 19:20:20 +00:00
M Kassaei 00d737bbe8 MDL-42181 quiz nav: highight all buttons when all Qs on one page 2013-11-15 16:33:45 +00:00
Tim Hunt 24e3e96a78 MDL-42865 Make XMLDB foreign key check more robust.
Otherwise, installing one bad add-on can completely break this report.
2013-11-15 14:57:30 +00:00
Tim Hunt 6c6ae7361c MDL-42863 make capabilities overview more fault-tolerant. 2013-11-15 14:57:18 +00:00
Eloy Lafuente (stronk7) 9f887be6a6 weekly release 2.4.7+ 2013-11-15 11:14:49 +01:00
Eloy Lafuente (stronk7) c250a0d330 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-11-15 11:14:44 +01:00
Frederic Massart 546a27cb50 MDL-42912 mod_glossary: Fix typo and call to core_text 2013-11-15 09:43:44 +01:00
Eloy Lafuente (stronk7) edab808254 Merge branch 'wip-MDL-42912-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-11-15 02:07:01 +01:00
Marina Glancy 3d4c212f85 MDL-42912 glossary: oracle-compatibility of SQL queries 2013-11-15 11:54:44 +11:00
Frederic Massart 48488ae1d7 MDL-42853 theme: Fix incorrect CSS select and place right rules 2013-11-14 09:46:53 +08:00
AMOS bot dd031e7462 Automatically generated installer lang files 2013-11-14 00:45:23 +00:00
Damyon Wiese 28177a0a07 Merge branch 'MDL-42598_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-11-13 14:35:20 +08:00
Damyon Wiese 2847f9c8fc Merge branch 'MDL-33536-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-11-13 13:12:19 +08:00
Ankit Agarwal a761cef6df MDL-41316 tool_spamcleaner: AS keyword is not allowed in sql qeries for table alias as Oracle doesn't support it 2013-11-13 11:32:18 +08:00
Damyon Wiese 3699331396 MDL-33536 Navigation: Add missing require_once for safety. 2013-11-13 10:05:37 +08:00
AMOS bot 1ef6b2298e Automatically generated installer lang files 2013-11-13 00:47:35 +00:00
Eloy Lafuente (stronk7) f77c1d2098 Merge branch 'MDL-42839-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-11-13 01:10:39 +01:00
Marina Glancy 61a9dd5cd9 Merge branch 'MDL-38574_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-11-13 11:06:38 +11:00
Eloy Lafuente (stronk7) e39e0243b2 Merge branch 'wip_24_mdl-42723' of https://github.com/iarenaza/moodle into MOODLE_24_STABLE 2013-11-13 00:53:23 +01:00
Eloy Lafuente (stronk7) ef2a27eac1 Merge branch 'wip-MDL-42672-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-11-12 20:07:22 +01:00
sam marshall 903c5bf341 MDL-42839 MUC: Memcache server configuration too sensitive to whitespace 2013-11-12 12:40:09 +00:00
Marina Glancy 32ef8734a9 Merge branch 'MDL-42540_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-11-12 14:50:08 +11:00
Damyon Wiese e87d98d541 Merge branch '42806-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-11-12 10:05:18 +08:00
AMOS bot eba496e2ae Automatically generated installer lang files 2013-11-12 00:53:15 +00:00
Eloy Lafuente (stronk7) 715cd44d3a Merge branch 'MDL-40481_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-11-12 00:41:46 +01:00
Tim Hunt 50a946f5bb MDL-42598 quiz variant randomisation not random enough.
A student would get the same question variants (for example for a
calculated question) on their first attempt at both copies of a
duplicated quiz.
2013-11-11 14:15:36 +00:00
Tim Hunt 50e9f0e048 MDL-42540 quiz manual grading should have setType 2013-11-11 14:15:25 +00:00
Tim Hunt bf2324ef15 MDL-40481 quiz responses report needs cols need text_sorting 2013-11-11 14:15:14 +00:00
Tim Hunt 53d3cd568c MDL-38574 qtype chooser: quick fix to make it fit on-screen.
MDL-32729 will provide a better fix for this, but we may as well apply
this quick fix on stable branches.
2013-11-11 14:15:02 +00:00
Marina Glancy 49202ec3e6 NOBUG: convert tabs to whitespaces 2013-11-11 21:27:08 +11:00
Marina Glancy 42d72f3297 Merge branch 'MDL-42043-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-11-11 21:11:29 +11:00
Sam Hemelryk be56d390b7 MDL-42806 block_mentees: can only be docked if it has a valid title set. 2013-11-11 17:23:51 +08:00
Frederic Massart 2f5768b983 MDL-42043 theme: Use $theme instead of $OUTPUT for pix_url()
Conflicts:

	theme/afterburner/lib.php
2013-11-11 13:20:19 +08:00
Renaat Debleu 65930a0593 MDL-42795 course: fixed param course in sql
course_sections has course field and not courseid, hence replaced it with course.
2013-11-11 10:49:39 +08:00
Eloy Lafuente (stronk7) 560c1c8ea3 Moodle release 2.4.7 2013-11-10 01:58:40 +01:00
Damyon Wiese 7922f118db weekly release 2.4.6+ 2013-11-08 12:51:03 +08:00
Damyon Wiese f8872ff3e8 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-11-08 12:50:59 +08:00
AMOS bot d4edd6c99f Automatically generated installer lang files 2013-11-08 00:43:09 +00:00
Damyon Wiese 301e79acae Merge branch 'MDL-42668-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-11-07 16:11:30 +08:00
Frederic Massart baad460c91 MDL-42668 portfolio_boxnet: Disable the portfolio when non-HTTPS 2013-11-07 14:40:22 +08:00
Frederic Massart c3cf690cee MDL-42668 portfolio_boxnet: Disable the portfolio during upgrade 2013-11-07 14:40:22 +08:00
Frederic Massart 6cc4b72fb9 MDL-42668 portfolio_boxnet: Notify the admins about the upgrade process
Conflicts:

	portfolio/boxnet/version.php
2013-11-07 14:40:19 +08:00
Frederic Massart d311f9cc75 MDL-42668 portfolio_boxnet: Migration to APIv2
Conflicts:

	lib/boxlib.php
	portfolio/boxnet/lib.php
2013-11-07 14:39:44 +08:00
Marina Glancy bc6f61fe9f Merge branch 'MDL-42697-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-11-07 16:31:39 +11:00
Dan Poltawski b1455d0d74 Merge branch 'MDL-42666-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-11-07 11:44:53 +08:00
Frederic Massart 01a2722f32 MDL-42666 repository_boxnet: New lang strings rather than replace 2013-11-07 11:13:22 +08:00
Damyon Wiese 711f77e4ca Merge branch 'MDL-42605-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-11-07 11:05:32 +08:00
Frederic Massart 615e2caf67 MDL-42666 repository_boxnet: Improved output during migration 2013-11-07 11:01:01 +08:00
Dan Poltawski cad44b4778 Merge branch 'MDL-42728-en_fix_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-11-07 09:37:14 +08:00
Frederic Massart c3cefce21c MDL-42666 repository_boxnet: Avoid re-download of sync'd references 2013-11-06 15:03:07 +08:00
Frederic Massart 393133707a MDL-42666 repository_boxnet: Downloading a file follows locations 2013-11-06 14:05:00 +08:00
Frederic Massart 0fb12db343 MDL-42666 repository_boxnet: Fix undefined variable usage 2013-11-06 14:05:00 +08:00
Frederic Massart b1e4d7afc8 MDL-42666 repository_boxnet: Using the right reference 2013-11-06 14:04:59 +08:00
Frederic Massart eca84ae277 MDL-42666 repository_boxnet: Convert all the references asap
This has been done in case the script fails during the processing
and needs to be re-run. Now all the references are converted as soon
as we can, where as before they could have ended up being re-downloaded.
2013-11-06 14:04:59 +08:00
Frederic Massart c578a134fa MDL-42666 repository_boxnet: Warn on HTTPS requirement when non HTTPS 2013-11-06 14:04:59 +08:00
Frederic Massart 53661a6767 MDL-42666 repository_boxnet: Alert the admins of the migration process
Conflicts:

	repository/boxnet/version.php

Conflicts:

	repository/boxnet/version.php
2013-11-06 14:04:55 +08:00
Frederic Massart 3d115053d2 MDL-42666 repository_boxnet: Revoke access token when logging out 2013-11-06 14:03:43 +08:00
Frederic Massart 27db0b4376 MDL-42666 oauthlib: Getter methods for accesstoken, client id and secret 2013-11-06 14:03:43 +08:00
Frederic Massart 45c79022ac MDL-42666 repository_boxnet: Remove hardcoded date for APIv1 end of life 2013-11-06 14:03:42 +08:00
Frederic Massart e15c728434 MDL-42666 repository_boxnet: Disabling file references 2013-11-06 14:03:42 +08:00
Frederic Massart 2c1fc0e086 MDL-42666 repository_boxnet: Advise the user to run the migration tool 2013-11-06 14:03:41 +08:00
Frederic Massart 35662296e5 MDL-42666 repository_boxnet: Tool to launch the migration 2013-11-06 14:03:41 +08:00
Frederic Massart f5c99c5144 MDL-42666 repository_boxnet: Function to convert APIv1 references to true copies 2013-11-06 14:03:41 +08:00
Frederic Massart 82efa6c9f2 MDL-42666 repository_boxnet: Convert repository to APIv2
The support for downloading images when they are references
from Box.net have been dropped in this script as the new
API does not support references. Unfortunately the old
references thumbnails will not be updated any more.

Conflicts:

	lib/upgrade.txt
	repository/boxnet/lib.php

Conflicts:

	lib/upgrade.txt
	repository/boxnet/lib.php
2013-11-06 14:03:24 +08:00
Petr Škoda e02256507c MDL-38743 add private cache headers 2013-11-06 13:58:15 +08:00
Marina Glancy 794f42d81d Merge branch 'MDL-42640-24' of https://github.com/colin-umn/moodle into MOODLE_24_STABLE 2013-11-06 16:32:39 +11:00
Andrew Nicols add479a88e MDL-42697 Theme: Fix overflow on docked blocks 2013-11-06 12:02:41 +08:00
Damyon Wiese 429d0d711b MDL-39800 tags: Fix tags/upgrade.txt version number in backport 2013-11-06 10:45:22 +08:00
Jenny Gray 47b2416012 MDL-39800 tags: moved cloud sorting to print function 2013-11-06 10:43:27 +08:00
Jenny Gray a01bd41865 MDL-39800 tags: Applied weight and ordering fix on all more page options
Also:
Fixed weight and ordering on more page show=all
Fixed weight and ordering on more page show=my
rationalised tag_print_cloud lines now identical
2013-11-06 10:43:27 +08:00
Jenny Gray 555ad195a0 MDL-39800 tags: resolved weighting in block content 2013-11-06 10:43:27 +08:00
Marina Glancy 62b41d8dda MDL-42672 blocks: warnings on /mod/xxx/index.php for frontpage course 2013-11-06 12:32:17 +11:00
Mary Evans 1ba20f5594 MDL-40244 forms: added setType() for groupinfo in forum and wiki 2013-11-06 12:25:46 +11:00
Helen Foster d0890a7791 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:54:37 +01:00
Iñaki Arenaza bcad5fa2de MDL-42723: Hide and handle LDAP error when user not in context being checked
MDL-41304 only fixed the case when 'Search subcontext' is enabled. We need to
fix the case when it's not enabled too.

While silencing errors with an @ should be avoided if possible, there's no
other way to prevent the warnings in this case.
2013-11-05 17:13:16 +01:00
Damyon Wiese b7a1f71911 Merge branch 'wip-MDL-38228-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-11-05 21:49:12 +08:00
Dan Poltawski 7fd34aa0e6 Merge branch 'MDL-42613_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-11-05 16:46:36 +08:00
Marina Glancy a78bb0cc83 Merge branch 'MDL-40267-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-11-05 17:45:38 +11:00
Aaron Barnes 2acdf0af6b MDL-42476 report_progress: don't browser sniff for SVG support
Use feature detection, its more robust and better practice.
2013-11-05 11:24:38 +08:00
Marina Glancy ba5ecbc72a MDL-38228 upgrade: Rewrite script that fixes corrupt course modules to sequence relation 2013-11-05 14:15:17 +11:00
Colin Campbell 4bb2eaa7d0 MDL-42640 quiz: Fix restore of backup without overduehandling setting
Use default quiz overduehandling setting when restoring a
backup from older Moodle version that does not have a quiz
overduehandling setting.
2013-11-04 20:56:32 -06:00
Ray Morris 55e3c2cd82 MDL-42265 make Browse Users list scrollable for smaller screens 2013-11-05 10:51:27 +08:00
Dan Poltawski d320d0b285 MDL-40267 forms: fix utf8 string length rules 2013-11-05 10:19:22 +08:00
Eloy Lafuente (stronk7) 9424bcb66e MDL-40267 forms: added some tests for the range rule 2013-11-05 10:10:51 +08:00
Dan Poltawski 08a8eb917e Merge branch 'wip-MDL-42270_M24_2' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE 2013-11-04 22:54:20 +08:00
Dan Poltawski df78a7902b Merge branch 'MDL-42548_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-11-04 22:35:09 +08:00
Dan Poltawski 43fa28331e Merge branch 'MDL-42453_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-11-04 22:17:22 +08:00
Dan Poltawski c512b7cc65 MDL-42533 conditionlib: Add clarifying comments 2013-11-04 22:04:30 +08:00
Dan Poltawski 8a7078b28b Merge branch 'MDL-42533-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-11-04 21:55:40 +08:00
Dan Poltawski dcb6e4169b Merge branch '42350-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-11-04 17:21:32 +08:00
Dan Poltawski 8cd148efe0 Merge branch 'MDL-42551_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-11-04 16:22:50 +08:00
Marina Glancy e2fb6ffa24 Merge branch 'MDL-42604-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-11-04 19:17:08 +11:00
Sam Hemelryk 71a5c487ce MDL-42350 mod_assign: fixed display of submission button 2013-11-04 15:59:24 +08:00
Dan Poltawski 23ea3287ea Merge branch 'MDL-42111_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-11-04 15:31:37 +08:00
Damyon Wiese a3e6f40dbe Merge branch 'MDL-34654-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-11-04 15:23:11 +08:00
Dan Poltawski 42cc95c245 Merge branch 'MDL-42494-workshop-exception_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-11-04 14:52:24 +08:00
Marina Glancy 9ea075bb32 Merge branch 'MDL-42429_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-11-04 17:28:34 +11:00
Marina Glancy 08839bbcb8 Merge branch 'MDL-42566_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-11-04 17:23:31 +11:00
Marina Glancy abfdce235b Merge branch 'MDL-42465_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-11-04 16:58:26 +11:00
Frederic Massart 70427c648e MDL-41807 repository_filesystem: Prevent access to parent directories 2013-11-04 13:30:58 +08:00
Damyon Wiese 5287178537 Merge branch 'MDL-42489-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-11-04 13:16:23 +08:00
Marina Glancy abaaa8cdae Merge branch 'MDL-42617_24' of git://github.com/jleyva/moodle into MOODLE_24_STABLE 2013-11-04 16:15:13 +11:00
Marina Glancy 9312fbe16e Merge branch 'MDL-38664_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-11-04 15:19:00 +11:00
Dan Poltawski d120a7baf2 Merge branch 'MDL-40515_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE 2013-11-04 12:10:58 +08:00
Damyon Wiese fb494ae9c8 Merge branch 'MDL-35146_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-11-04 12:05:22 +08:00
Petr Škoda 09f2963373 MDL-41941 clean message text 2013-11-04 11:38:14 +08:00
Tim Hunt 6917b452bf MDL-41820 XSS in the quiz responses report.
Thanks to Michael Hess for finding this bug and reporting it to us.
2013-11-04 11:10:30 +08:00
Damyon Wiese 919efdf632 Merge branch 'MDL-42663_24' of git://github.com/dmonllao/moodle into MOODLE_24_STABLE 2013-11-04 10:50:09 +08:00
Marina Glancy b3e58b7d0b Merge branch 'MDL-42664-performance_measuring_filter_manager_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-11-04 13:18:39 +11:00
Damyon Wiese 4844fc124c Merge branch 'MDL-38850_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-11-04 09:41:10 +08:00
Damyon Wiese d98f1751e8 Merge branch 'wip-MDL-28463-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-11-01 22:53:01 +08:00
David Monllao 9ab44b3f99 MDL-42663 mod_lesson: Move definitions to show_clock()
Seems that the required data is not always set
before timer.js is included.
2013-11-01 16:39:36 +08:00
Mark Nelson 6c32a2f003 MDL-42429 mod_lesson: removed unnecessary conditional check 2013-11-01 16:32:25 +08:00
David Mudrák f23a63b545 MDL-42664 Fix the filter_manager instantiation
For legacy reasons, the $CFG->perfdebug uses values 7 for disabled and 15 for
enabled. Because of this typo, Moodle has always created instance of the slower
performance_measuring_filter_manager instead of the standard filter_manager,
regardless the perfdebug setting.
2013-11-01 09:24:10 +01:00
Dan Poltawski 6758c0fa99 weekly release 2.4.6+ 2013-11-01 15:47:45 +08:00
Dan Poltawski eef875e0c1 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-11-01 15:47:42 +08:00
Sam Hemelryk 150735fbdb MDL-42619 block_community: delete course redirect bug fix 2013-11-01 10:16:02 +08:00
Marina Glancy accfa102fe Merge branch 'MDL-41624_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-10-31 22:20:20 +11:00
Juan Leyva e5663dfd70 MDL-42617 Add support for frozen fields in searchableselector form elements 2013-10-31 11:49:14 +01:00
Marina Glancy 91d309074f Merge branch 'MDL-40971_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-10-31 21:17:28 +11:00
Sam Hemelryk 5b09d5e8cf MDL-33536 navigation: hide hidden categories from the navbar
Conflicts:
	lib/navigationlib.php
2013-10-31 17:13:44 +08:00
Mark Nelson 9a3f511056 MDL-42566 mod_data: introduced check to ensure the picture supplied is valid 2013-10-31 17:10:46 +08:00
Michael Aherne de4d45ce8e MDL-42517 testing Changed events test to use assertDebuggingCalled() 2013-10-31 13:25:36 +08:00
Frederic Massart 2d22a9d474 MDL-42605 portfolio_flickr: Do not auto select a set to export to 2013-10-31 10:32:23 +08:00
Frederic Massart c64eea0a51 MDL-42605 portfolio_flickr: Photos can be added to a set on export 2013-10-31 10:32:22 +08:00
Jean-Michel Vedrine 0e099cc444 MDL-41624 DragMath crashes Firefox 2013-10-30 18:25:02 +01:00
Mark Nelson fda6ef7a1f MDL-42613 core_group: removed unnecessary table row when there is no group description or picture 2013-10-30 17:59:36 +08:00
Damyon Wiese 7b8dba0b52 Merge branch 'MDL-38734-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-10-30 17:21:30 +08:00
Sam Hemelryk c3673c5531 Merge branch 'MDL-42574-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-10-30 13:44:39 +08:00
Ankit Agarwal 1efa930202 MDL-42604 scorm: Fix division by zero warnings in error logs 2013-10-30 11:01:04 +08:00
Damyon Wiese 87c3a9fd9f Merge branch 'wip-MDL-41337-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-10-30 10:54:13 +08:00
Sam Hemelryk 1f26c7053a Merge branch 'MDL-42542-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-10-30 08:38:47 +08:00
Mary Evans fff86d45c1 MDL-40971 grade: Fixes missing setType() and $PAGE->layout for Outcomes/import which results in errors in 2.5 Clean theme 2013-10-30 00:15:59 +00:00
Marina Glancy 54a0a16b53 MDL-41337 files: Fixed bug with accidental delete of the root directory 2013-10-29 20:30:26 +11:00
John Beedell 8cb63784e5 MDL-41473 book: Book html zip import, incorrect url produced for internal linking to other chapters 2013-10-29 14:27:38 +08:00
Damyon Wiese 9ac938636f Merge branch 'MDL-40470-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-10-29 13:55:28 +08:00
Andrew Nicols 3bdbe1b08b MDL-40470 JavaScript: Correct issue when checking select change in Firefox 2013-10-29 10:43:06 +08:00
Marina Glancy eaccd0d486 MDL-28463 conditionlib: 10 minutes lifetime of cached grades 2013-10-29 13:21:12 +11:00
Dan Poltawski 0bc9604212 Merge branch 'MDL-22669-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-10-28 16:31:38 +08:00
Ankit Agarwal 17a0f7350f MDL-42574 blocks: Fix strict standards warning in community block 2013-10-28 15:43:09 +08:00
Mark Nielsen 0ed5fa3b88 MDL-38419: External tool - when force SSL checked, URLs get corrupted 2013-10-28 12:35:19 +08:00
Mark Nelson 34b3aa4d49 MDL-35146 mod_wiki: fixed variable typo and altered code to conform to Moodle guidelines 2013-10-28 12:34:37 +08:00
Anton Fletcher 5f22097114 MDL-35146 mod_wiki: fixed issue where pages for deleted groups caused an error on restore 2013-10-28 12:34:37 +08:00
Damyon Wiese 43fed596e5 Merge branch 'wip-mdl-30812-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-10-28 12:10:09 +08:00
Dan Poltawski acb1bf6fac Merge branch 'wip-mdl-42491-m24' of git://github.com/deraadt/moodle into MOODLE_24_STABLE 2013-10-28 11:33:36 +08:00
Prateek Sachan 6a748d5e8b MDL-38850: Fixed Horizontal bar issue in lesson 2013-10-28 11:09:42 +08:00
Damyon Wiese d0a9524463 Merge branch 'MDL-36818-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-10-28 10:59:16 +08:00
AMOS bot 42e7fb5e49 Automatically generated installer lang files 2013-10-28 00:46:46 +00:00
Eloy Lafuente (stronk7) 5c550aaafc MDL-42551 timezone info: updated to 2013h 2013-10-26 17:15:21 +02:00
Tim Hunt ea6e1851e9 MDL-42548 quiz review: don't show grade for non-finished attempts.
Now we show the attempt state separately, so there is no need to show
Grade: Attempt still in progress - especially since we were showing that
for abandoned and overdue attempts which is just wrong.
2013-10-25 20:11:26 +01:00
Gareth J Barnard bd0d739550 MDL-42270 course: Section name too big message. 2013-10-25 16:40:31 +01:00
Eloy Lafuente (stronk7) 75d8d06ffb weekly release 2.4.6+ 2013-10-25 13:03:31 +02:00
Eloy Lafuente (stronk7) 8c92e24434 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-10-25 13:03:27 +02:00
Frederic Massart cbd0157d66 MDL-42542 portfolio: Fix handlerfile in portfolio event handler 2013-10-25 16:02:21 +08:00
Frederic Massart c9bcb47d54 MDL-42533 conditionlib: Field name is translated for students 2013-10-25 09:52:02 +08:00
Michael de Raadt c58f3ed7ff MDL-42491 libraries: add exception for IE11 (and hopefully later versions) 2013-10-25 09:00:19 +08:00
Eloy Lafuente (stronk7) 3b34d79d36 Merge branch 'MDL-42377_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-10-25 01:13:08 +02:00
Dan Poltawski 8f19a957e2 Merge branch 'MDL-42338_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-10-24 16:29:19 +08:00
Marina Glancy 94cc2c769c Merge branch 'MDL-35402_editor_rules_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE 2013-10-24 15:31:12 +11:00
rwijaya 4f718dc60c MDL-42338 lti_mod: convert hardcoded string. 2013-10-24 10:34:20 +08:00
sam marshall d1b0786a51 MDL-34654 Glossary: ampersand breaks auto-linking 2013-10-23 16:22:25 +01:00
David Mudrák 1cdd43b12b MDL-42494 Fix workshop coding exception if all assessments have zero weight
If all assessments for the given submission have zero weight, the grading
evaluation plugin "Comparison with the best assessment" is unable to decide on
the average assessment as it ignores those with zero weight. In such rare case,
it makes sense to set the grading grade to null and prevent the coding
exception.
2013-10-23 11:51:37 +02:00
Damyon Wiese b807cc6334 Merge branch 'MDL-42210_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE 2013-10-23 14:19:42 +08:00
Ankit Agarwal 8cbfc9614a MDL-42489 backup: use correct exception class in automated backups 2013-10-23 13:56:08 +08:00
Damyon Wiese 9de894db2d Merge branch 'w43_MDL-42208_m24_authunmask' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-10-23 13:42:26 +08:00
Dan Poltawski 7a2db63954 Merge branch 'MDL-40531_24' of https://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-10-23 12:36:38 +08:00
Ankit Agarwal 8a3894de89 MDL-42427 backup: Fix undefined errors during automated backups 2013-10-23 12:10:14 +08:00
Damyon Wiese 60ca7d5b07 MDL-41339 Tags - use uppercase for SQL keywords (AS) 2013-10-23 11:58:48 +08:00
Damyon Wiese 697ecc6db1 Merge branch '24STABLE-wip-mdl-41339' of https://github.com/jennymgray/moodle into MOODLE_24_STABLE 2013-10-23 11:55:33 +08:00
Marina Glancy e2536570a3 Merge branch 'w43_MDL-37813_m24_filterall' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-10-23 10:18:47 +11:00
Dan Poltawski af90211efd Merge branch 'MDL-42112-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-10-22 16:45:17 +08:00
Mark Nelson 78855a6c7b MDL-42465 mod_chat: instantiated message object before declaring properties 2013-10-22 16:12:20 +08:00
Dan Poltawski 1640389bcf Merge branch 'MDL-29441-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-10-22 13:21:27 +08:00
Marina Glancy a70c9434d7 Merge branch 'MDL-26170_rss_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-10-22 15:04:25 +11:00
Andrew Davis 441b8d6e69 MDL-26170 RSS: fixed RSS cache clearing when items are deleted 2013-10-22 10:59:03 +07:00
Rajesh Taneja de61d99ad1 MDL-31405 Assignment: removed type in time shift reset status
Assignment reset shifts time for all assignments and not specific to
assignment type, hence removed type string from reset status
2013-10-22 11:54:23 +08:00
Marina Glancy f311ba2714 Merge branch 'MDL-24380-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-10-22 14:35:09 +11:00
Marina Glancy 06032cd928 Merge branch 'MDL-42239-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-10-22 14:09:05 +11:00
Ankit Agarwal d05a5b126c MDL-42239 calendar: Fix missing ids issue with mouseover panels 2013-10-22 10:46:02 +08:00
Jerome Mouneyrac 45e4351ade MDL-24380 Chat: autoscroll help popup incorrect and doesn't display fully (it only concerns the alternative chat methods) 2013-10-22 10:45:27 +08:00
Dan Poltawski 2811b3d262 Merge branch 'MDL-42201_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-10-22 10:30:43 +08:00
Rajesh Taneja 0cb2846998 MDL-34612 Restore: Gracefully handle empty file contenthash while restoring 2013-10-22 09:49:01 +08:00
Rajesh Taneja 4db1863687 MDL-34612 Restore: Gracefully handle empty section title while restoring 2013-10-22 09:49:01 +08:00
AMOS bot 4a256d6e8e Automatically generated installer lang files 2013-10-22 00:45:44 +00:00
Mary Evans 44666a2d31 MDL-42453 theme_base: Fixed Error in base/style/admin.css that breaks CSS validator. 2013-10-21 15:39:28 +01:00
Dan Poltawski a122d95343 Merge branch 'MDL-34209-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-10-21 13:58:40 +08:00
rwijaya af11bd26b6 MDL-38664 Lesson mod: code improvement for lesson re-attempt page 2013-10-21 13:54:28 +08:00
Joseph Rézeau b8aa36a063 MDL-38664 Lesson mod: fixed re-attempt unseen page 2013-10-21 13:54:16 +08:00
Jody Steele a10d621fc5 MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission 2013-10-21 16:51:33 +11:00
Marina Glancy a322a0ab53 Merge branch 'w43_MDL-42386_m24_etag' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-10-21 16:00:53 +11:00
Mark Nelson 969d8f0e3f MDL-42377 backup: fixed incorrect debugging message 2013-10-21 11:55:30 +08:00
Mark Nelson 36cfbfe841 MDL-42201 backup: introduced new automatic backup state 2013-10-21 11:49:07 +08:00
Andrew Nicols 314cc22a28 MDL-34209 JavaScript: Simplify section drag/drop to fix reordering issues 2013-10-21 11:42:43 +08:00
Dan Poltawski bd1fae5fc0 Merge branch 'MDL-26244_url_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-10-21 11:25:27 +08:00
rwijaya ac23be5d24 MDL-42111 TinyMCE media preview: fix video preview display for TinyMCE media.
Effected themes: boxxie, clean, brick, formal_white and splash.
2013-10-21 11:12:45 +08:00
Dan Poltawski 6e72e0a6aa MDL-31405 assign: avoid uncessary get_string call 2013-10-21 11:02:45 +08:00
Dan Poltawski 57bafe6ebc Merge branch 'wip-mdl-31405-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-10-21 10:59:00 +08:00
Andreas Grabs 4ae00d74bc MDL-42210 mod_feedback - convert tabs to space 2013-10-20 10:04:10 +02:00
Michael Milette 60293b276a MDL-42210-Feedback-Input-Labels
Adds labels to the input fields in the Feedback module including: multichoice, multichoicerated, numeric, textarea and textfield.
2013-10-20 10:04:08 +02:00
Charles Severance 4673a6a8fc MDL-40531 mod_lti: Various 1.1/1.1.1 fixes.
Conflicts:
	mod/lti/service.php
2013-10-19 03:04:59 +02:00
Sam Chaffee ce5a85c354 MDL-40531 mod_lti: Changed namespace in XML to IMS LTI compliant 2013-10-19 03:04:47 +02:00
AMOS bot ff952aa064 Automatically generated installer lang files 2013-10-19 00:47:36 +00:00
Petr Škoda 675fa4b813 MDL-37813 remove missing filters when configuring string filters and fix filter uninstall 2013-10-18 15:59:22 +02:00
Petr Škoda 73b0524202 MDL-42208 prevent autocompletion in auth configs 2013-10-18 15:09:17 +02:00
Petr Škoda 58c57f94d6 MDL-42386 fix invalid etag comparison
Credit goes to Eloy Lafuente, thanks!
2013-10-18 14:49:49 +02:00
Dan Poltawski b6ced2f7e4 weekly release 2.4.6+ 2013-10-18 16:16:43 +08:00
Dan Poltawski 6123c76bc7 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-10-18 16:16:34 +08:00
Tony Levi 8beb495df4 MDL-38734: Automated backup failure causing all course to fail 2013-10-18 15:05:00 +08:00
Damyon Wiese 90b46f39a4 Merge branch 'MDL-41554-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-10-18 13:27:19 +08:00
Dan Poltawski 1f3a85aa54 MDL-41554 rss: Move to more robust test url
tinyurl was sometimes failing (was bad to use them anyway)
2013-10-18 12:47:44 +08:00
Dan Poltawski 98e4f24ff6 Merge branch 'MDL-42421_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-10-18 12:15:43 +08:00
Damyon Wiese 48763c4d21 MDL-42112 tablelib: Generate the correct number of cols for empty rows
(And a test for it).
2013-10-18 11:56:06 +08:00
Damyon Wiese d91225aae4 MDL-42112 Tablelib: Add unit tests (some) 2013-10-18 11:56:03 +08:00
Mark Nelson a5436ae8ce MDL-42421 auth: removed incorrect statement in upgrade.txt 2013-10-18 11:38:56 +08:00
Jenny Gray 7a9000b1ff MDL-41339 Tags: Added unique tag instance id to tag_get_tags functions
Avoids php warnings on creating new tags
2013-10-17 14:03:30 +01:00
Damyon Wiese 85d47590cc Merge branch 'MDL-42065_24' of https://github.com/sam-moodle/moodle into MOODLE_24_STABLE 2013-10-16 15:48:19 +08:00
Damyon Wiese 8789750cc5 Merge branch 'MDL-37528-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-10-16 11:16:45 +08:00
Andrew Davis b15478526a MDL-26244 mod_date:added some logic show or hide the file picker button based on repository availability 2013-10-16 08:33:39 +07:00
Eloy Lafuente (stronk7) 8786deb033 MDL-37877 backup: fix incorrect backported code. 2013-10-16 00:32:00 +02:00
Davo Smith 59e8879130 MDL-35402 forms - prevent crash when multiple rules defined on an editor element 2013-10-15 14:34:40 +01:00
Damyon Wiese e81aa9e8e6 Merge branch 'MDL-37877-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-10-15 16:58:39 +08:00
Dan Poltawski 8a2e491ee7 Merge branch 'MDL-42209_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-10-15 14:43:21 +08:00
Ankit Agarwal 3a6857090e MDL-37877 backup: Fix issues with zipping of large files
Files bigger than 4GB is not supported at this point. Zip archiver doesn't know about it and always returns true. We need to verify if it is a valid file or not and delete if not
Also delete the backup file immediately if anything goes wrong anywhere in backup. We don't want to use up space
2013-10-15 13:18:46 +08:00
Marina Glancy d2ff78d173 Merge branch 'wip-MDL-42234-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2013-10-15 14:11:58 +11:00
Tim Hunt ef37c13e29 MDL-42309 typo: fix reponse -> response throughout Moodle. 2013-10-15 13:50:05 +11:00
Adrian Greeve a8d816982a MDL-42234 - Repositories: Fix undefined variable notice when no repositories are enabled. 2013-10-15 10:47:22 +08:00
Dan Poltawski ac7f6f4b96 Merge branch 'w42_MDL-42082_m24_authdbpass' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-10-14 14:36:29 +08:00
FilipBenco 6da08c0e2c MDL-42209 backup: fixed wrong icon being displayed when restoring course 2013-10-14 14:33:19 +08:00
Damyon Wiese f72e3fbbf2 MDL-34586 assignment - fix whitespace 2013-10-14 14:29:22 +08:00
Damyon Wiese 8afe4de645 Merge branch 'MDL-34586-24' of https://github.com/mackensen/moodle into MOODLE_24_STABLE 2013-10-14 14:29:14 +08:00
Dan Poltawski 1fc88334a6 Merge branch 'MDL-42232_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-10-14 14:24:17 +08:00
Damyon Wiese 7643bd4ca9 Merge branch 'MDL-34612-24' of https://github.com/mackensen/moodle into MOODLE_24_STABLE 2013-10-14 14:12:23 +08:00
Damyon Wiese 1b9f0beaf3 Merge branch 'MDL-41170-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-10-14 14:04:18 +08:00
Ankit Agarwal 993612b00e MDL-41170 events: Update upgrade.txt to reflect changes made in MDL-41170 2013-10-14 13:24:05 +08:00
Akinsaya Delamarre 4eb084f1a2 MDL-41170: Added user updated event triggers to password updating functions. 2013-10-14 13:22:15 +08:00
Dan Poltawski 34b3d144fe Merge branch 'MDL-41672-text-mail-links_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-10-14 12:12:17 +08:00
Thijs Kinkhorst c61decc816 MDL-36818 cas: improve SSL validation 2013-10-14 10:12:53 +08:00
Eloy Lafuente (stronk7) 5864eb6017 Merge branch 'wip-mdl-41843-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-10-14 00:15:29 +02:00
Eloy Lafuente (stronk7) d9131593c7 Merge branch 'MDL-37181_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-10-13 23:32:55 +02:00
Andrew Nicols 16e566b99f MDL-29441 Chat: Use a valid name for chat popup actions 2013-10-13 20:08:04 +08:00
Petr Škoda bd010f8854 MDL-42110 do not show auth_db password in plaintext 2013-10-12 13:49:54 +02:00
AMOS bot a364f61121 Automatically generated installer lang files 2013-10-12 00:43:51 +00:00
Tim Hunt cf2fb7579b MDL-42232 Multiple choice question choice alignment issue
The problem was with the alignment of:
* tables inside the choices.
* Lists inside the choices.
* The specific feedback, when it spanned mulitple lines.

The problem was introduced by MDL-39420.
2013-10-11 14:26:34 +01:00
Eloy Lafuente (stronk7) 945aa97617 weekly release 2.4.6+ 2013-10-11 13:20:55 +02:00
Rajesh Taneja ca4349c1ce MDL-31405 Assignment: Fixed date in reset to be called once
Conflicts:

	mod/assign/locallib.php
2013-10-11 08:59:02 +08:00
Jayesh Anandani 267b45e0a1 MDL-31405 Assignment reset issue solved 2013-10-11 08:58:29 +08:00
Andrew Nicols 4c53ec3355 MDL-37528 Libraries: Fix gesture + mouse issues with YUI
This addresses issues with devices which support both mouse and gesture
input devices whereby the presence of gesture support on the device causes
mouse interactions to be ignored.

This has the potential to cause issues with multiple events being triggered
for the same action, but we do not have this issue in core, and few
third-party plugins support drag and drop in such a way that this may be an
issue.

This is fixed in the latest version of YUI in a similar way, and the
addition of a new system to only trigger the event from the first action to
be triggered.
2013-10-10 17:14:02 +08:00
Marina Glancy 7bd19d562d Merge branch 'MDL-37153_24' of https://github.com/pauln/moodle into MOODLE_24_STABLE 2013-10-10 12:53:27 +11:00
Sam Hemelryk 49e3cda704 Merge branch 'wip-mdl-41744-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-10-10 14:39:24 +13:00
Sam Chaffee e8ec840f3c MDL-42065 core_grade: Modified some grade_item queries for improved performance
* Modified 2 queries in grade_item::depends_on to improve performance
* Added additional unit tests to cover those queries better
2013-10-09 12:34:29 -06:00
Alain Corbière 0c018318c6 MDL-41672 Fix html2text processing of multiple occurrences of the same URL 2013-10-09 15:49:21 +02:00
David Mudrák 3bd02768df MDL-41672 Add html2text unit test for multiple occurrences of the same URL 2013-10-09 15:49:12 +02:00
Dan Poltawski 39adfbde72 Merge branch 'w41_MDL-42054_m24_phpmailertesting_i' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-10-09 18:20:13 +08:00
Petr Škoda a42e313460 MDL-42054 fix incorrect email redirection in unit tests 2013-10-09 11:57:04 +02:00
Dan Poltawski d6b99cf123 Merge branch 'MDL-39776-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-10-09 16:54:30 +08:00
Dan Poltawski 77eb24f886 Merge branch 'm24_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-10-09 16:48:44 +08:00
Damyon Wiese d4609de200 Merge branch 'w41_MDL-42047_m24_cohortdel' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-10-09 14:44:25 +08:00
Mark Nelson 6c2d9137b3 MDL-37181 backup: stopped setting the status of unscheduled backups to skipped 2013-10-09 14:16:03 +08:00
Damyon Wiese 5dc182dd6e Merge branch 'wip-MDL-41967-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2013-10-09 13:12:41 +08:00
Jason Fowler 88e2d12038 MDL-39776 Javascript - enable formautosubmit from a select box on android 2013-10-09 11:39:11 +08:00
Charles Fulton b6a84b6fdd MDL-34612 forum: convert default format value during restore 2013-10-08 20:05:35 -07:00
Paul Nicholls 3e2821e6f5 MDL-37153 - assign: Obey grade display settings in submission status
The assignment submission status screen was ignoring the grade item's
display setting, showing scores even if it's set to display letters only.
2013-10-09 16:03:50 +13:00
Tim Lock d93610d4b0 MDL-41908 QuickForm: Fix PEAR Non-static method error 2013-10-09 10:27:30 +08:00
James Henestofel 34d55059cb MDL-42068 Filepicker course listing use setting courselistshortname to show shortname and fullname 2013-10-09 01:27:33 +02:00
Eloy Lafuente (stronk7) 6257097a3f Merge branch 'MDL-42069_24' of https://github.com/appalachianstate/moodle into MOODLE_24_STABLE 2013-10-08 21:27:27 +02:00
Charles Fulton cd35f43eac MDL-34586 assignment: convert default format value during restore 2013-10-08 09:48:56 -07:00
Rajesh Taneja 788105dd3d MDL-41843 IMS-LTI: Fixed exception namespace 2013-10-08 15:56:52 +08:00
Dongsheng Cai 80cee53996 MDL-41843 Uses OAuthException in moodle\mod\lti namespace 2013-10-08 15:56:52 +08:00
Damyon Wiese dd94734d9a Merge branch 'MDL-41520-MOODLE_24_STABLE-mod_lti-completion-view' of github.com:Trii/moodle into MOODLE_24_STABLE 2013-10-08 14:34:49 +08:00
Damyon Wiese 786538f74f Merge branch 'MDL-32570-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-10-08 13:46:42 +08:00
Dan Poltawski 925ec67b22 Merge branch 'MDL-38655_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE 2013-10-08 13:21:44 +08:00
Marina Glancy b159b57207 Merge branch 'MDL-25176_m24' of https://github.com/merrill-oakland/moodle into MOODLE_24_STABLE 2013-10-08 12:04:12 +11:00
Petr Škoda c01c608fdc MDL-41197 normalize ascii text conversion 2013-10-08 00:04:46 +02:00
Frederic Massart ca887bc9bc MDL-22669 course: Display section number for orphaned activities 2013-10-07 16:52:29 +08:00
Sam Hemelryk 2ff9ac5608 MDL-41197 fix unit tests 2013-10-07 14:16:25 +13:00
Matteo Scaramuccia f63fc5c41a MDL-40226 Files: Added the correct MIME Type for JNLP files.
JNLP stands for Java Network Launch Protocol, used to launch
Java Web Start applications. More details in:
http://docs.oracle.com/javase/tutorial/deployment/webstart/deploying.html
2013-10-06 16:45:16 +02:00
Joshua Johnston d276541169 MDL-41520 LTI: Does not track page views for completion 2013-10-04 09:47:14 -04:00
Fred Woolard 72b266d54e MDL-42069 mod_quiz add lastname sort for manual grading 2013-10-04 09:09:00 -04:00
Petr Škoda 8f3702ee1a MDL-42047 fix cohort method name error after deleting cohort 2013-10-04 11:33:23 +02:00
Petr Škoda 54b951fb5f MDL-41197 ignore all problems when converting texts 2013-10-04 11:13:00 +02:00
Sam Hemelryk 9844660858 weekly release 2.4.6+ 2013-10-04 15:43:43 +13:00
Sam Hemelryk d0012b72ad Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-10-04 15:43:38 +13:00
Rajesh Taneja 623b678c3e MDL-41744 Users: Convert key to value in bulk upload
Menu profile field expects value, during bulk upload if value is passed by form
then options key is passed. So converting key to value if passed though form
2013-10-03 10:18:55 +08:00
Sam Hemelryk 75f6d03855 Revert "MDL-33569 themes: Labels create extra margin below content."
This reverts commit 05c3b5dd2f.
2013-10-03 14:43:51 +13:00
Eric Merrill 236a2fca9b MDL-25176 forum Redirects for new discussions shouldn't use SESSION
Unset the session->fromdiscussion var, because we know that the correct
path will be computed later.
2013-10-01 21:19:17 -04:00
Tim Lock a7c5e2d24d MDL-41996: Don't show the Review Attempt link if no attempts exist. 2013-10-01 20:05:12 +02:00
Eloy Lafuente (stronk7) 4ae75c1847 Merge branch 'w40_MDL-41999_m24_userpw' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-10-01 15:59:24 +02:00
Marina Glancy d7788d69f6 Merge branch 'MDL-32592-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-10-01 20:49:41 +10:00
Marina Glancy a033a6b4c1 Merge branch 'MDL-39653-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-10-01 20:44:07 +10:00
Adrian Greeve 0626a71686 MDL-41967 - Gradebook: Fixed an sql syntax error for gradebook custom profile fields. 2013-10-01 18:00:41 +08:00
Dan Poltawski 756fbd91fd MDL-32570 enrol_imsenterprise: don't hardcode default category id 2013-10-01 11:52:46 +08:00
Sam Hemelryk 3b5c7727f2 MDL-41828 mod: fixed navbar when adding modules to a course 2013-10-01 13:34:01 +10:00
Sam Hemelryk e5b13b7fc0 MDL-41900 events: avoid new debug call within unit tests 2013-10-01 16:21:19 +13:00
Sam Hemelryk 49c29a3f46 Merge branch 'MDL-41995_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-10-01 14:49:55 +13:00
Sam Hemelryk 92fdea041d Merge branch 'MDL-41900-m24' of git://github.com/micaherne/moodle into MOODLE_24_STABLE 2013-10-01 14:35:27 +13:00
Sam Hemelryk a7fd949571 Merge branch 'MDL-41894-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-10-01 13:44:44 +13:00
AMOS bot 32d77062b4 Automatically generated installer lang files 2013-10-01 00:41:49 +00:00
Sam Hemelryk 92416730d1 Merge branch 'MDL-37973_m24' of https://github.com/merrill-oakland/moodle into MOODLE_24_STABLE 2013-10-01 09:53:19 +13:00
Eloy Lafuente (stronk7) 4b95721a26 Merge branch 'MDL-26408-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-09-30 16:01:55 +02:00
Marina Glancy 29d526b495 Merge branch 'MDL-41954-workshop-zero-variance_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-09-30 16:11:44 +10:00
Adam Olley 227d3fcbd3 MDL-40515: report_log: List activities in optgroups 2013-09-30 11:20:44 +09:30
Mary Evans 05c3b5dd2f MDL-33569 themes: Labels create extra margin below content.
Conflicts:

	theme/bootstrapbase/less/moodle/course.less
2013-09-28 16:15:12 +01:00
Petr Škoda cf55843d07 MDL-41999 do not use $USER->password directly 2013-09-27 10:55:12 +02:00
Marina Glancy c7c613b45b weekly release 2.4.6+ 2013-09-27 14:50:19 +10:00
Marina Glancy 06450ed398 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-09-27 14:49:38 +10:00
Dan Poltawski 3d986cf8cd MDL-39653 enrol_imsenterprise: only mail admins on change
The existing beavhiour was sending useless emails to admins and
generating warnings.

Thanks to Matthew Orlando for the suggested fix.
2013-09-27 12:23:37 +08:00
Adam Olley 6e3013be7c MDL-38655: mod_assign: Use correct ordering on cap checks for submission downloads 2013-09-27 12:45:47 +09:30
Mark Nelson 63b66cf276 MDL-41995 calendar: moved the location the page layout was set for the export page
This was done so that the blocks are shown when logged in and viewing this page.
2013-09-26 17:04:30 +08:00
Dan Poltawski aaf95d0161 MDL-32592 enrol_imsenterprise: fix error when category not defined
thanks to Henrik Thorn for the fix
2013-09-26 14:59:08 +08:00
Dan Poltawski 473aab4ffb MDL-26408 enrol_imsenterprise: fix invalid component 2013-09-26 12:21:42 +08:00
Petr Škoda 2504a9d2ec MDL-41223 do not store any form of login URL in $SESSION->wantsurl
Credit goes to Michael Milette, thanks.
2013-09-25 10:58:39 +10:00
Matt Petro a24c22cd12 MDL-41660 backup ims-cc: Use correct temp directory 2013-09-25 02:16:05 +02:00
David Mudrák 2ccad8f967 MDL-41954 Fix the grade for assessment calculation in the Workshop module
In a pretty rare case of zero variance of received assessments, the "distance"
of the evaluated assessment from the referential ("best") one was not increased
regardless it's actual value. This led to higher grades for assessments in
certain situations (see the tracker for a particular example).
2013-09-25 02:03:02 +02:00
Eloy Lafuente (stronk7) b152769f44 Merge branch '40903-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-09-25 02:00:47 +02:00
Sam Hemelryk 77b4970559 Merge branch 'MDL-41907_m24' of https://github.com/merrill-oakland/moodle into MOODLE_24_STABLE 2013-09-25 10:17:55 +12:00
Marina Glancy 8492c192af Merge branch 'MDL-41929_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-09-24 21:33:12 +10:00
Sam Hemelryk f621e8e3d8 MDL-40903 cached: fixed up versions 2013-09-24 21:13:22 +12:00
Sam Hemelryk 5a804c0f54 MDL-40903 cache: renamed persistcache to staticacceleration 2013-09-24 21:13:22 +12:00
Sam Hemelryk bfff058cc8 MDL-40903 cache: fixed up event invalidation 2013-09-24 21:13:22 +12:00
Marina Glancy 9e72a16e14 MDL-40903 cache: Unittests and small fixes for persistent application cache 2013-09-24 21:13:22 +12:00
Sam Hemelryk 90317c258b MDL-40903 cache: coding style tidyup pre-integration 2013-09-24 21:13:22 +12:00
Sam Hemelryk fcb5548c38 MDL-40903 cache: converted persistent into persistentdata
At the same time all cache instances were made persistent
2013-09-24 21:13:21 +12:00
Ankit Agarwal 654f0c0cf7 MDL-41894 feedback: Remove unused code, which is generating warnings 2013-09-24 15:08:33 +08:00
AMOS bot 402469ce8b Automatically generated installer lang files 2013-09-24 00:42:02 +00:00
Sam Hemelryk fb092979bf Merge branch 'MDL-36465-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-09-24 08:32:46 +12:00
Tim Hunt 768779972e MDL-41929 quiz statistics, overall stats not displayed. 2013-09-23 18:07:25 +01:00
Marina Glancy b0124c9703 Merge branch 'MDL-41833-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-09-23 19:18:05 +10:00
Andrew Nicols d2674929ba MDL-36465 Course JavaScript: Ensure that the zero section is not draggable 2013-09-23 09:19:11 +01:00
Marina Glancy 47ba8d481e Merge branch 'wip-MDL-41772-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2013-09-23 14:41:22 +10:00
AMOS bot 814054616f Automatically generated installer lang files 2013-09-21 00:42:40 +00:00
Sam Hemelryk 7bc37de925 weekly release 2.4.6+ 2013-09-20 14:42:53 +12:00
Sam Hemelryk 0f00c5c594 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-09-20 14:34:56 +12:00
Eric Merrill 4b8ed14f54 MDL-41907 Repositories: Maintain the sortorder of a file when overwriting it. 2013-09-19 18:47:42 -04:00
Eric Merrill 9840da227e MDL-37973 gradebook Return a maxgrade of '-' if grade type is TEXT
Including tests for correct return from
grade_edit_tree_column_range->get_item_cell()

This commit includes some special code just for 2.4 in the test
related to a bug in assign.
2013-09-19 11:28:40 -04:00
Michael Aherne 4948ac2e0c MDL-41900 events Log handler failures 2013-09-19 15:58:06 +01:00
AMOS bot 954b1b5504 Automatically generated installer lang files 2013-09-19 00:44:12 +00:00
AMOS bot 9e81532432 Automatically generated installer lang files 2013-09-18 00:45:34 +00:00
Eloy Lafuente (stronk7) 6726f0073e Merge branch 'MDL-41728-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-09-17 21:18:48 +02:00
Ankit Agarwal 5011fb91ff MDL-41833 feedback: Fix setType() warning when deleting a response in feedback 2013-09-17 15:30:07 +08:00
Eloy Lafuente (stronk7) 657beb8924 Merge branch 'MDL-41595_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-09-17 02:15:42 +02:00
Sam Hemelryk 1d5c188798 Merge branch 'MDL-38317-moodle24' of git://github.com/StudiUM/moodle into MOODLE_24_STABLE 2013-09-17 08:38:51 +12:00
Sam Hemelryk ac7cbc012e Merge branch 'MDL-38194-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-09-16 13:54:52 +12:00
AMOS bot 05f1cccc37 Automatically generated installer lang files 2013-09-16 00:40:28 +00:00
Sam Hemelryk 1081b8ec84 Merge branch 'm24_MDL-37524' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-09-16 10:38:25 +12:00
Sam Hemelryk af0a06b521 Merge branch 'wip-MDL-27684-MOODLE_24_STABLE' of git://github.com/satrun77/moodle into MOODLE_24_STABLE 2013-09-16 10:26:50 +12:00
Dan Marsden 9963b0b6a6 MDL-37524 SCORM: mode not calculated correctly. 2013-09-16 10:13:47 +12:00
Sam Hemelryk d7b20f1650 Merge branch 'MDL-29987_24' of https://github.com/bostelm/moodle into MOODLE_24_STABLE 2013-09-16 10:12:51 +12:00
Sam Hemelryk 694cb9b053 Merge branch 'MDL-41534-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-09-16 09:40:00 +12:00
AMOS bot 14dcbdb0f4 Automatically generated installer lang files 2013-09-15 00:39:09 +00:00
AMOS bot 38753adc60 Merge branch 'MOODLE_24_STABLE' into install_24_STABLE 2013-09-14 00:41:38 +00:00
sam marshall da7c844c30 MDL-38194 Files: Allow download of large backup files
The PHP readfile function does not work for files more than 2GB.
This commit provides a wrapper that can be used so that files less
than 2GB are sent with readfile, and files larger than 2GB are
sent manually.

The change applies to all uses of pluginfile.php, although in
reality, backup files are probably the only ones likely to be more
than two gigabytes.
2013-09-13 16:01:58 +01:00
Jean-Philippe Gaudreau 0f6d896e43 MDL-38317 grade import: Translation support for import mappings form. 2013-09-13 08:51:35 -04:00
Henning Bostelmann 0137a13d55 MDL-29987 File resource: fix problem with PDF display on mobile devices
Setting the default display option for PDF files from DISPLAY_EMBED to DISPLAY_OPEN
2013-09-13 10:28:41 +01:00
Adrian Greeve 254bf485f1 MDL-41772 - mod_data: Fixed database_module comments not being restored. 2013-09-13 15:35:32 +08:00
Damyon Wiese e81fce929a weekly release 2.4.6+ 2013-09-13 14:07:27 +08:00
Mohamed Alsharaf c1536ff1ef MDL-27684 repository: make require_login() throws exception instead of redirect 2013-09-13 16:06:51 +12:00
Damyon Wiese 43e1ed2cf3 MDL-37804 assign: Return proper notice when submissions closed.
MDL-38267 was returning the html page when it should have been adding to the list
of notices and returing false.

Conflicts:

	mod/assign/locallib.php
2013-09-12 10:38:45 +08:00
Damyon Wiese 46f15f03d2 MDL-41534 theme: Missed backporting a style to hide empty table rows 2013-09-12 09:27:02 +08:00
sam marshall 0cddce2c56 MDL-41728 Backup: Unnecessary use of in_array in base_plan
Remove unnecessary use of in_array which causes performance problems
when loading the plan for very large courses.
2013-09-11 14:38:37 +01:00
Dan Poltawski 18cbf0db95 Merge branch 'MDL-38267-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-09-11 12:00:15 +08:00
Sam Hemelryk 3b2c61fdb8 Merge branch 'MDL-41658_M24' of git://github.com/kordan/moodle into MOODLE_24_STABLE 2013-09-11 09:42:14 +12:00
Matthew Noorenberghe d64a0e9173 MDL-41634 - URL Download Repository doesn't warn when asked to download non-image files 2013-09-11 09:37:40 +12:00
Sam Hemelryk c88b113c1f Merge branch 'MDL-41528_MOODLE_24_STABLE' of https://github.com/nitzo/moodle into MOODLE_24_STABLE 2013-09-11 09:26:02 +12:00
Sam Hemelryk aa6699f4db Merge branch 'MDL-41630-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-09-11 09:20:27 +12:00
Rajesh Taneja 1e557db89d MDL-41590 Enrolments: If course is deleted, then use courseid for reference 2013-09-11 08:47:04 +12:00
Dan Poltawski 5e99c1f9a1 Merge branch 'MDL-40631-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-09-10 14:32:00 +08:00
Dan Poltawski 84197f41ca Merge branch '41189-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-09-10 14:12:30 +08:00
Damyon Wiese b604cb81e4 Merge branch 'wip-mdl-23335-m24' of https://github.com/deraadt/moodle into MOODLE_24_STABLE 2013-09-10 12:56:53 +08:00
Damyon Wiese 05f853e2db MDL-41497 auth_db: Fix typo in lang string. 2013-09-10 12:24:55 +08:00
Damyon Wiese a77864208e Merge branch 'MDL-41497-24' of https://github.com/willylee/moodle into MOODLE_24_STABLE 2013-09-10 12:23:17 +08:00
Dan Poltawski 4b3521ec69 Merge branch 'MDL-28561_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-09-10 12:05:10 +08:00
Damyon Wiese 294673628e Merge branch 'MDL-41451_24' of https://github.com/pauln/moodle into MOODLE_24_STABLE 2013-09-10 11:58:41 +08:00
Damyon Wiese 081e303415 Merge branch 'MDL-41626-moodle24' of github.com:StudiUM/moodle into MOODLE_24_STABLE 2013-09-10 09:30:14 +08:00
Sam Hemelryk b14d0e4713 Merge branch 'MDL-41600_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE 2013-09-10 13:11:21 +12:00
AMOS bot d2dc75fb4e Automatically generated installer lang files 2013-09-10 00:41:04 +00:00
Adam Olley 7c95cf02af MDL-41600: qformat_blackboard_six Fix test_import_match fail w/ddmatch
With qtype_ddmatch installed, the unit tests for qformat_blackboard_six
fail as they generate ddmatch questions instead of match ones. This
patch checks for ddmatch and changes the test to expect that instead if
its installed.
2013-09-10 09:16:29 +09:30
Sam Hemelryk a7f3f08722 MDL-32862 backup: fixed missing global 2013-09-10 10:40:11 +12:00
Sam Hemelryk 5db72d63c5 Merge branch 'wip-MDL-32862-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2013-09-10 09:38:23 +12:00
Sam Hemelryk d58d0239db Merge branch 'MDL-29378-survey-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-09-10 09:35:50 +12:00
Dan Poltawski e9ea8e9b63 Merge branch 'MDL-41254-m24' of git://github.com/micaherne/moodle into MOODLE_24_STABLE 2013-09-09 18:04:48 +08:00
David Mudrák e523503fb8 MDL-29378 Fix the recent string modification
But accident, I have modified the string 'collesaintro' in the previous patch.
The correct string to be amended is 'collesapintro'.
2013-09-09 11:22:14 +02:00
Dan Poltawski 4da2fefa4d Merge branch 'MDL-37804_24' of github.com:recreate/moodle into MOODLE_24_STABLE 2013-09-09 17:13:49 +08:00
Mary Evans 0f85e6ba0b MDL-41595 mod_book: Book mod does not add TOC to default region 2013-09-09 09:52:43 +01:00
Dan Poltawski 8baa0cab98 Merge branch 'MDL-41163-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-09-09 15:39:58 +08:00
Damyon Wiese 5a730d0a80 Merge branch 'wip-MDL-41517-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-09-09 12:11:10 +08:00
Damyon Wiese 5a36d6292d Merge branch 'm24_MDL-31232' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-09-09 11:13:27 +08:00
Sam Hemelryk b7a4701d1f MDL-41417 course: fixed idnumbertaken string 2013-09-09 12:15:59 +12:00
Paul Nicholls 6cb665f18c MDL-41451 - formslib: use create_function instead of inline function
As per MDL-39432, closure-style inline functions can result in fatal
errors when using eAccelerator and thus should be avoided.
2013-09-09 11:41:17 +12:00
Sam Hemelryk eae5890112 Merge branch 'MDL-38794_24' of https://github.com/prateeksachan/moodle into MOODLE_24_STABLE 2013-09-09 11:12:11 +12:00
Sam Hemelryk fd9ecb595f Merge branch 'MDL-41417_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-09-09 10:50:56 +12:00
Sam Hemelryk 1fdc20cbdb Merge branch 'MDL-29378-survey-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-09-09 10:48:49 +12:00
Sam Hemelryk 1830fc428c MDL-41189 fixed overflow issue with filepicker thumbnail 2013-09-09 08:24:40 +12:00
kordan c53069c60a MDL-41658 theme_formal_white: text in input select is now never centered (fixed at central level) 2013-09-08 21:08:09 +02:00
AMOS bot 97a0c05d46 Automatically generated installer lang files 2013-09-08 00:43:12 +00:00
AMOS bot 700e92b8d4 Merge branch 'MOODLE_24_STABLE' into install_24_STABLE 2013-09-08 00:43:12 +00:00
Eloy Lafuente (stronk7) 28980dbee6 Moodle release 2.4.6 2013-09-07 14:25:39 +02:00
Dan Poltawski 39616d39c4 MDL-41623 rss: clean output rss content 2013-09-07 10:42:02 +08:00
Eloy Lafuente (stronk7) 178af4770e MDL-41623 ensure all links are valid urls
For 23 and 24 we are modifying the default Sanitizer. Note that
for 24 and upwards we are doing the same with our extended
Sanitizer. So this is just an interim hack for those old versions.
2013-09-07 04:06:08 +02:00
sam marshall 2d124e8f4e MDL-41446 Completion: Incorrectly marks complete when grade data present with no actual grade 2013-09-06 13:03:28 +01:00
Mark Nelson eb57e9e60b MDL-41417 course: allow the use of duplicated idnumbers if they existed before fix 2013-09-06 15:24:43 +08:00
Francis Devine 5f8e23c1a9 MDL-41417 course: prevent duplicate idnumbers being used when updating a course 2013-09-06 15:24:19 +08:00
Adrian Greeve 7ed78289b5 MDL-32862 - Backup: Rewriting resource_old links on backup. 2013-09-06 14:49:08 +08:00
Frederic Massart 77458d700b MDL-41630 oauth: Throw exception instead of dying on error 2013-09-06 14:18:29 +08:00
Paul Nicholls 52b617673c MDL-41451 - Large forms are truncated by max_input_vars
By parsing php://input in chunks, we can bypass max_input_vars for
forms which do not use the "multipart/form-data" enctype.  This can
be (and is) safely skipped if there are fewer than max_input_vars
fields submitted as part of $_POST.
2013-09-06 14:57:03 +12:00
AMOS bot efcbed9b73 Merge branch 'MOODLE_24_STABLE' into install_24_STABLE 2013-09-06 00:47:50 +00:00
Nitzan Bar 2dd8a44c20 MDL-41528 enrol/ldap course default settings when no course template is selected 2013-09-06 02:14:20 +03:00
Jean-Philippe Gaudreau 3b8005fae7 MDL-41626 cas auth: Setting the right url for the multi-authentication page 2013-09-05 16:48:14 -04:00
sam marshall 097abcc59c MDL-41163 Restore: Large course restore timeout on schema page 2013-09-05 17:17:42 +01:00
Dan Poltawski fe38aff3a7 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-09-05 14:43:39 +08:00
Dan Poltawski e78a2d0e44 weekly release 2.4.5+ 2013-09-05 13:35:45 +08:00
David Mudrák f257805573 MDL-29378 Code cleanup in the Survey module
While working on the issue, I spotted these two places that were worth of
fixing. The first one is a trivial reminiscence of a previous refactoring,
after which both branches of the if() statement became equal.

The second one is actually a typo as in theory it could generate unexpected
input fields with the name like qPP1. Luckily this never happened due to the
way how survey questions are hardcoded (there are no questions with the type 2
that would require two answers to their subquestions).
2013-09-05 00:09:59 +02:00
David Mudrák 2e5d19ddfc MDL-29378 Fix the form display in the Survey/COLLES P+A module
In MDL-7501, we stopped using rowspanning cells in the form table due to
accessibility. That had introduced a regression so in the COLLES P+A survey,
all the rows were displayed with the same background colour. This patch returns
the previous behaviour that each couple of items can be distinguished by the
background colour.

Also, there is no need to display "I prefer that" and "I found that" as a small
text any more. It had made sense in rowspanning layout but not after MDL-7501
was fixed.

And finally, as all items are enumerated now sequentially, there are actually
48 lines, each couple covering one question in two variants. I think it's
correct to reflect this in the description of the form so the text was slightly
amended.
2013-09-05 00:09:59 +02:00
David Mudrák 708a1cec00 MDL-29378 Fix regression in the Survey/COLLES P+A module
This basically reverts the commit 5196df589b that
I believe was a result of misunderstanding of how question type field is
(ab)used in the Survey module. As it took significant time to get familiar with
the overall logic of questions and their processing in the module, I left my
findings in added inline comments. The point is that it is $question->type that
matters. Types of questions listed as subquestions in the multi field is
irrelevant in that case (and all have it set to 1 IIRC).

This patch re-enables the "COLLES (Preferred and Actual)" survey type that did
not work at all due to regression.
2013-09-05 00:09:59 +02:00
Damyon Wiese 3caeaa448e MDL-41259 ldap: Move on to the next course when create_course fails 2013-09-04 16:16:15 +08:00
Damyon Wiese 3e230a757c MDL-41259 enrol_ldap: Fix for backport branch
Use error_log instead of the newer progress trace.
2013-09-04 12:48:42 +08:00
Damyon Wiese c8b1ecedc7 Merge branch 'MDL-41485-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-09-04 12:26:39 +08:00
Damyon Wiese 4520f30def MDL-41179 assign: Ensure a submission record exists for lock/unlock
Can't change the function params because it is changed in master already.
This will create a draft submission when a student is prevented from submitting
but that is a minor sideeffect and doesn't happen in master.
2013-09-04 11:03:36 +08:00
Dan Poltawski d1af85a398 Merge branch 'wip-mdl-41418-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-09-04 10:38:34 +08:00
Eloy Lafuente (stronk7) 75cf024576 Merge branch 'MDL-41568-en_fix-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-09-03 15:11:22 +02:00
Helen Foster b5f9a3b0e3 MDL-41568 Merge English strings from the en_fix language pack 2013-09-03 12:56:04 +02:00
Mary Evans 53165cbc05 MDL-28561 blocks_rss_client: Fixes lines between RSS feed items are not showing in all themes. 2013-09-03 10:23:55 +01:00
Damyon Wiese 13ad8def1b Merge branch 'MDL-41348_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-09-03 16:10:13 +08:00
Tim Lock f246359c29 MDL-41304: Hide and handle LDAP error when user not in context being checked 2013-09-03 16:05:58 +08:00
Aparup Banerjee 3bc786adb1 MDL-37564 linked dependant plugin component text to plugins DB 2013-09-03 14:57:41 +08:00
Damyon Wiese e75bd18064 Merge branch 'MDL-33472-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-09-03 14:38:52 +08:00
Damyon Wiese 7a35f9f9fc Merge branch 'm24_MDL-29218_plugin_init_not_blocking_when_false' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-09-03 14:29:37 +08:00
Damyon Wiese 6026b9157d Merge branch 'MDL-32690_restoreMissingAssignment_24' of https://github.com/moodlerooms/moodle into MOODLE_24_STABLE 2013-09-03 14:16:38 +08:00
Michael de Raadt 557b8de4cf MDL-23335 mod_forum: allow multi-lang filtering of shortened messages
MDL-23335 mod_forum: Correct ordering of filtering and shortening
2013-09-03 13:36:04 +08:00
Dan Poltawski da337c3f39 Merge branch 'w36_MDL-41255_m24_changepw' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-09-03 12:59:04 +08:00
Dan Poltawski ef103c84bb Merge branch 'MDL-41428-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-09-03 12:31:12 +08:00
Marina Glancy f68ebb8282 MDL-41517 Do not call fix_course_sortorder unnecessarily
Thanks to Thomas Worthington
2013-09-03 13:55:04 +10:00
Dan Poltawski d65c2e5d44 Merge branch 'wip-MDL-41179-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-09-03 11:49:07 +08:00
Dan Poltawski 03b992e43b Merge branch 'wip-MDL-41317-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-09-03 10:40:41 +08:00
Dan Poltawski e8bc65a85e Merge branch 'MDL-40214_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-09-03 10:07:08 +08:00
Matteo Scaramuccia c7aac02925 MDL-29218 Repository: fixed a typo in the PHPDoc 2013-09-02 23:26:51 +02:00
Matteo Scaramuccia 832a19829b MDL-29218 Repository: $pname, get rid of all the useless code
More details in the Tracker.
2013-09-02 23:26:49 +02:00
Matteo Scaramuccia d0ddf08dc0 MDL-29218 Repository: Hide the repo if repository::plugin_init returns false 2013-09-02 23:26:48 +02:00
prateeksachan 30d3f1d220 MDL-38267 assign: No Submit button after cut-off date
Conflicts:

	mod/assign/locallib.php
	mod/assign/tests/locallib_test.php
2013-09-02 22:49:42 +08:00
Damyon Wiese a7f94caa2e MDL-40631: Prevent students from submitting empty assignments.
Conflicts:

	mod/assign/locallib.php
	mod/assign/tests/locallib_test.php
2013-09-02 22:02:50 +08:00
Michael Aherne aadac9873b MDL-41254 backup Raise time and memory limit in precheck. 2013-09-02 14:06:44 +01:00
Dan Poltawski ed016dd8fc Merge branch 'MDL-41149-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-09-02 17:25:46 +08:00
Dan Poltawski afe1dde0c8 Merge branch 'MDL-35925-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-09-02 15:24:33 +08:00
Nitzan Bar 1fdb431dfe MDL-41259 when duplicate course shortname exists an exception is thrown and sync is aborted 2013-09-02 15:09:06 +08:00
Dan Poltawski 5a407be1d4 Merge branch 'MDL-36093-moodle24' of github.com:StudiUM/moodle into MOODLE_24_STABLE 2013-09-02 14:11:05 +08:00
Dan Poltawski 8793ba310d MDL-40676 tests: fix null byte test. 2013-09-02 13:59:26 +08:00
Petr Škoda 74d458916b MDL-40676 ignore null bytes 2013-09-02 12:28:15 +08:00
Dan Poltawski 370f95edf0 Merge branch 'MDL-41175_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-09-02 11:53:00 +08:00
Dan Poltawski 79dc70d99c Merge branch 'MDL-41328-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-09-02 11:45:08 +08:00
Andrew Nicols 4b23a6fa05 MDL-41328 Editor: Work around another iOS issue with TinyMCE
We apply this only on touchend and not touchstart or touchmove. The
location is not guaranteed until the end of the gesture, and there's no
need to keep applying focus on every move.
2013-09-02 09:41:55 +08:00
Petr Škoda 7a3b3ac4d2 MDL-41255 fix incorrect redirection logic when changing password
Credit goes to Michael Milette.
2013-08-31 11:43:27 +02:00
AMOS bot 85ed2ec89b Merge branch 'MOODLE_24_STABLE' into install_24_STABLE 2013-08-31 00:43:57 +00:00
Willy Lee 4a3728ee50 MDL-41497 auth_db: Added help text for using odbc dsn names instead 2013-08-30 10:25:48 -05:00
Willy Lee c959f27415 MDL-41497 enrol_database: Added help text for using odbc dsn names instead 2013-08-30 09:03:41 -05:00
Ankit Agarwal 2bcfd98eab MDL-41485 calendar: Replace value of action buttons on managesubscription page with int 2013-08-30 17:24:34 +08:00
Dan Marsden e727d2aa2a MDL-31232 SCORM: Wrap suspend_data even when no spaces in value. 2013-08-30 20:37:09 +12:00
Damyon Wiese 6cef890fbc weekly release 2.4.5+ 2013-08-30 09:39:54 +08:00
AMOS bot afd76d0c5d Automatically generated installer lang files 2013-08-30 00:41:50 +00:00
Mark Nielsen 0fc55f1d0a MDL-32690: Restore 1.9 backup into 2.X fails on missing assignment type
Solution is as follows:
* Allow unsupported subplugins to convert from Moodle1 to Moodle2
* On Moodle2 restore hide unsupported subplugins
* Graceful error message in assignment of unsupported subplugins
2013-08-29 08:48:39 -07:00
Jean-Philippe Gaudreau 83f27b6cca MDL-36093 grade export: Fix HTML special characters printed litteraly. 2013-08-28 09:16:34 -04:00
Tim Hunt 530e43776b MDL-41348 question code depends on filelib.
I think this used to work because mod/forum/lib.php used to be included
everywhere, and in turn included lib/formslib.php. We should declare the
dependencey explicitly.
2013-08-28 11:18:25 +01:00
Damyon Wiese 8e4c96c519 MDL-41249 assign: Fix incorrect gradingform restore step
The mapping in the previous patch was wrong - mod assign uses
the area "submissions" but the itemid is the grade->id not the submission->id.
2013-08-28 16:33:32 +08:00
Colin Campbell 7e8638914f MDL-40214 mod_assign: Fixed issue with custom scale being lost during restore. 2013-08-28 10:49:29 +08:00
Marina Glancy 36d31f8081 MDL-41317 Set correct context to send bulk message page 2013-08-28 11:07:37 +10:00
Eloy Lafuente (stronk7) d8669d5bef Merge branch 'MDL-41387_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-08-27 21:00:52 +02:00
Eloy Lafuente (stronk7) ee3433a44b Merge branch 'm24_MDL-41410_Move_Comment_To_Appropriate_Place' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-08-27 19:46:32 +02:00
Dan Poltawski 7d64b40db1 Merge branch 'MDL-41366_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-08-27 18:09:54 +08:00
Damyon Wiese 08d19eaeb9 Merge branch 'MDL-41401-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-08-27 15:08:43 +08:00
Dan Poltawski e3559db951 MDL-38765 quiz: fix incorrect comment 2013-08-27 13:59:24 +08:00
Dan Poltawski 4c37aadb32 Merge branch 'MDL-38765_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-08-27 13:53:09 +08:00
Damyon Wiese e4e6173568 Merge branch 'MDL-40877-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-08-27 12:50:04 +08:00
Damyon Wiese 58605be7f2 Merge branch 'MDL-40447_M24' of https://github.com/nadavkav/moodle into MOODLE_24_STABLE 2013-08-27 12:29:59 +08:00
Nadav Kavalerchik 9684aab5a2 MDL-37211 Backup: Migrate hard-coded strings to language string for the table header labels on the restore page 2013-08-27 11:58:04 +08:00
Dan Poltawski 4acc7c0106 Merge branch 'wip-MDL-41222-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE
Conflicts:
	lib/modinfolib.php
2013-08-27 11:08:14 +08:00
Frederic Massart 279f7582a4 MDL-41428 repository_coursefiles: Missing white space in name 2013-08-27 10:31:18 +08:00
Marina Glancy f8758dc3d3 MDL-41179 is_user_access_restricted_by_capability() must look at specified user and not current 2013-08-27 09:50:46 +10:00
Dan Poltawski 0f567efc8f Merge branch 'MDL-41291-24' of git://github.com/mr-russ/moodle into MOODLE_24_STABLE 2013-08-26 18:07:11 +08:00
Damyon Wiese 727c220c7a MDL-41213 filepicker: Version bump for css changes 2013-08-26 16:22:08 +08:00
Damyon Wiese 33fec82b0a Merge branch '41213-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-08-26 16:20:47 +08:00
Rajesh Taneja ba55a0f6c9 MDL-41418 Administration: Page context should be set before setting page title 2013-08-26 15:27:14 +08:00
Dan Poltawski ea6deb7e09 Merge branch 'MDL-35930_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-08-26 14:56:45 +08:00
Dan Poltawski 433bba6b2f Merge branch 'MDL-36126_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-08-26 14:25:42 +08:00
Mark Nelson 0534f2dd9b MDL-36126 backup: ensure the backup_logs message does not exceed the maximum allowed length in the DB 2013-08-26 20:40:46 +08:00
Damyon Wiese 1e27536646 Merge branch 'mdl24_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https://github.com/brki/moodle into MOODLE_24_STABLE 2013-08-26 13:51:21 +08:00
Dan Poltawski cd118a23e7 Merge branch 'MDL-41249-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-08-26 13:11:19 +08:00
Damyon Wiese 4e66dc96b3 Merge branch 'wip-MDL-41106-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-08-26 09:44:17 +08:00
Damyon Wiese 81ff8adcc5 MDL-36803 tinymce: Version bump for js changes 2013-08-26 09:34:15 +08:00
Damyon Wiese 527b36b905 Merge branch 'MDL-36803-m24' of https://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-08-26 09:33:41 +08:00
Russell Smith ab2d7d4f3d MDL-41291 cache: Use fread to avoid race conditions 2013-08-26 10:51:23 +10:00
Sam Hemelryk 426e9c79ac MDL-41106 cache: several fixes for the session cache.
This issue makes several fixes for the session loader and the session store.
 * maxsize argument now works for session caches.
 * fixed performance hole when interation occurs frequently.
 * fixed cache purge bug occuring when multiple caches are defined before being used.
 * improved lastaccess handling.

Big thanks to Marina who contributed the following commits:
 * Always make sure the elements in cache are sorted so we need to remove only elements in the beginning of array
 * Remove expired elements from session store to free memory
 * Minor bug fixes
2013-08-26 09:49:57 +12:00
Sam Hemelryk 2254ea48a9 MDL-41213 filepicker: corrected outline of selected file dialogue 2013-08-26 08:37:12 +12:00
Mary Evans 1be71b3131 MDL-41175 themes: Add/remove group members page broken on small screens. 2013-08-25 17:26:14 +01:00
Damyon Wiese 7064882041 MDL-41149 assign: Group submission updates emailed to wrong person
grade_item_update was altering the userid in the submission record
instead of cloning it. This meant only the last member of a group
recieved all notifications meant for other students in the group.
2013-08-25 22:18:36 +08:00
Damyon Wiese 56f24fadd4 MDL-41249 assign: Restore step missing gradingform mapping
Thanks to Matthieu Raggett for the report and the solution.
2013-08-25 21:25:49 +08:00
Matteo Scaramuccia 91b9fb3749 MDL-41410 Caching: move comment to the appropriate place.
MDL-38162 fixes the issue about testing the connection to the memcached
daemon, which means testing once the connection to the pool of servers
and not to each of the servers while being added to the pool.
It misses to move the comment to that code too.
2013-08-25 14:17:53 +02:00
AMOS bot a8416f35c5 Merge branch 'MOODLE_24_STABLE' into install_24_STABLE 2013-08-24 00:59:07 +00:00
Dan Poltawski 95899cab2f MDL-41401 backup: fix misnamed test method 2013-08-23 15:10:45 +08:00
Dan Poltawski 0d435a3d7c MDL-33472 google plugins: move helper functions to upgradelib.php
upgrade.php is reserved for the upgrade steps only. See also
MDL-34103
2013-08-23 11:34:18 +08:00
Damyon Wiese abb767192f weekly release 2.4.5+ 2013-08-23 10:33:40 +08:00
Mark Nelson f0a60c5f2f MDL-41387 tags: changed character case in string used when deleting a course 2013-08-22 17:40:12 +08:00
Dan Poltawski ee262fa7f5 Revert "MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod/assign , Rubrics editor)"
This reverts commit 42fabe1e87.
2013-08-22 17:36:39 +08:00
Damyon Wiese c951ff9d39 Merge branch 'wip-MDL-41196-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-08-22 11:23:17 +08:00
Dan Poltawski 17f8a9f75f Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-08-22 11:18:10 +08:00
Jason Fowler 1b883b8c20 MDL-30839 Accessibility - Focusing on error on submit 2013-08-22 10:53:18 +08:00
Sam Hemelryk fc4f36be11 MDL-41196 phpmailer: fixed unit test detection 2013-08-22 14:46:42 +12:00
Dan Poltawski 5689cb3a27 Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-08-22 10:15:59 +08:00
Jason Fowler 6050809347 MDL-30839 Fixing extra line breaks in error msg 2013-08-22 09:10:19 +08:00
Tim Hunt f08bce9a54 MDL-40996 & MDL-41162 quiz: fix html_writer::div use in 2.4. 2013-08-22 08:26:01 +12:00
Tim Hunt 67051eb403 MDL-41366 qbehaviour_informationitem fix name capitalisation. 2013-08-21 12:30:06 +01:00
Tim Hunt 6dc4e89073 MDL-38765 quiz view: fix duplicate message.
The "No more attempts are allowed" message was being shown twice. I
checked back, and it has been like that since before the quiz was
converted to use a renderer. Still, it looks horrible, so changing it.
2013-08-21 10:24:32 +01:00
Dan Poltawski 5f6877ddee MDL-41191 mod_forum: avoid DISTINCT on TEXT columns
It is not supported by all db engines
2013-08-21 15:48:09 +08:00
Dan Poltawski 381f53e27e Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-08-21 15:18:03 +08:00
Jason Fowler 466fb01621 MDL-30839 Fixing extra line breaks in error msg 2013-08-21 15:01:59 +08:00
Frederic Massart a8f5f4b6e2 MDL-40877 repository_url: Use textlib functions instead of mb_strlen() 2013-08-21 14:00:40 +08:00
Dan Poltawski af5e39e1b6 Merge branch 'wip-MDL-36690-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-08-21 11:36:40 +08:00
Marina Glancy 661d4816df MDL-36690 Do not cache objects inside course.modinfo as they may fail to serialize
convert moodle_url (all other fields are numbers or strings) to string before caching and then back to moodle_url when restoring.
Otherwise serialized modinfo can contain \0 byte which cause problems in Postgres DB
2013-08-21 13:13:35 +10:00
Dan Poltawski 184309fa55 Merge branch 'wip-MDL-32191-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-08-21 10:45:07 +08:00
AMOS bot 26af11ece6 Automatically generated installer lang files 2013-08-21 00:43:41 +00:00
Sam Hemelryk 4bc9eec96f Merge branch 'MDL-41162_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-08-21 12:12:43 +12:00
Sam Hemelryk 1eb3364a9e MDL-41157 calendar: added unit test def to phpunit.xml.dist 2013-08-21 11:20:23 +12:00
Sam Hemelryk fef821d726 Merge branch 'm24_MDL-41144' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-08-21 10:59:34 +12:00
Andrew Nicols 334827b61e MDL-36803 TinyMCE: Fix TinyMCE following touch events on iOS browsers 2013-08-20 23:56:01 +01:00
Sam Hemelryk 69127087c9 Merge branch 'MDL-41157-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-08-21 10:33:30 +12:00
Sam Hemelryk b43863f6a9 Merge branch 'MDL-41196-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-08-21 09:29:31 +12:00
Damyon Wiese 86cef7fbca Merge branch 'MDL-41191-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-08-20 16:18:36 +08:00
Damyon Wiese b1cd2f8248 Merge branch 'w33_MDL-41112_m24_cachedist' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-08-20 15:21:43 +08:00
Jason Fowler 80e86364f4 MDL-35925 - File picker - Adding aria attributes to assist in accessibility 2013-08-20 14:23:23 +08:00
Damyon Wiese 59c487a7f3 Merge branch 'MDL-27595-2_24' of https://github.com/bostelm/moodle into MOODLE_24_STABLE 2013-08-20 13:53:52 +08:00
Damyon Wiese 18c49b1420 Merge branch 'MDL-41036_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-08-20 13:02:26 +08:00
Damyon Wiese d161d6bbe9 Merge branch 'MDL-41122_2.4' of git://github.com/kastashov/moodle into MOODLE_24_STABLE 2013-08-20 12:30:43 +08:00
Dan Poltawski 981ca84aef Merge branch 'MDL-38203_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-08-20 11:36:00 +08:00
Nadav Kavalerchik e8efd1fbe2 MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod/assign , Rubrics editor) 2013-08-20 11:08:25 +08:00
AMOS bot 796819b631 Automatically generated installer lang files 2013-08-20 00:42:28 +00:00
Marina Glancy a62d50ffb8 MDL-41222 Remove unnecessary course cache rebuild 2013-08-20 10:21:12 +10:00
Dan Poltawski 4b350436cd Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-08-19 17:51:28 +08:00
Damyon Wiese 7452709d69 Merge branch 'm24_MDL-39572' of https://github.com/totara/moodle into MOODLE_24_STABLE 2013-08-19 15:44:17 +08:00
Damyon Wiese 07173cac05 Revert "MDL-41106 cache: several fixes for the session cache."
This reverts commit 4973a0cb41.
This reverts commit e3d9d02381.
This reverts commit b4aba7cac2.
2013-08-19 15:34:00 +08:00
Dan Poltawski ab97bc0a1e Merge branch 'MDL-40893-24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE 2013-08-19 14:50:18 +08:00
Damyon Wiese 79b958a4a7 Merge branch 'wip-MDL-41106-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-08-19 13:51:42 +08:00
Damyon Wiese c93707771f Merge branch 'wip-MDL-36789-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-08-19 13:16:39 +08:00
Jason Fowler 790b3da848 MDL-30839 Accessibility, Forms - Improve accessibility or error messages 2013-08-19 09:56:16 +08:00
AMOS bot da51402724 Automatically generated installer lang files 2013-08-19 00:42:38 +00:00
Sam Hemelryk 4973a0cb41 MDL-41106 cache: tidied up several elements 2013-08-19 11:31:37 +12:00
Marina Glancy e3d9d02381 MDL-41106 Cleaning up expired elements in session cache store
- Always make sure the elements in cache are sorted so we need to remove only elements in the beginning of array
- Remove expired elements from session store to free memory
- Minor bug fixes

Conflicts:
	cache/stores/session/lib.php
	cache/stores/session/tests/session_test.php
2013-08-19 11:31:11 +12:00
Andrew Nicols 3822616ba6 MDL-41196 Unit Tests: Add a phpmailer message sink 2013-08-18 16:17:35 +01:00
Nadav Kavalerchik db7d0186ee MDL-40447 Administration: Fix translation: "Profile" should be "Profile Fields" on advanced (more...) user filter form 2013-08-17 23:42:35 +03:00
Frederic Massart d0720e784e MDL-40877 core_text: Added UTF-8 safe strrchr method 2013-08-16 14:20:31 +08:00
Rossiani Wijaya c68f17dfc5 MDL-35930 filepicker filemanaer: make announcement on page change when selecting view files options 2013-08-16 12:14:22 +08:00
AMOS bot 202d7e6ad3 Automatically generated installer lang files 2013-08-16 00:42:58 +00:00
Russell Smith 5821a7c5f1 MDL-40893 backup: cache question answers for performance
To constrain memory we only cache a single question's answers.
A quiz must display this many answers, so it will not result
in undue memory pressure.

We now match on the full answer text rather than the first 255
characters.  This removes the risk of matching questions with the
same start.
2013-08-16 10:06:59 +10:00
Sam Hemelryk b4aba7cac2 MDL-41106 cache: several fixes for the session cache.
This issue makes several fixes for the session loader and the session store.
* maxsize argument now works for session caches.
* fixed performance hole when interation occurs frequently.
* fixed cache purge bug occuring when multiple caches are defined before being used.
* improved lastaccess handling.
2013-08-16 11:59:31 +12:00
Simon Coggins a6bc89e4d2 MDL-39572: Fix sql_order_by_text() to use length argument correctly 2013-08-16 11:28:47 +12:00
Simon Coggins f6868f9c9d MDL-39572: Fix existing tests and add more to demonstrate issue with sql_order_by_text() 2013-08-16 11:28:46 +12:00
Dan Marsden 1fc4e2b414 MDL-41144 enrol_flatfile: ignore deleted users 2013-08-16 09:33:12 +12:00
Dan Marsden 2f64dd6dc8 MDL-37393 SCORM: Fix existing AICC scoes to use correct parent/child relationships 2013-08-16 09:29:58 +12:00
Matteo Scaramuccia 9372820a6e MDL-37393 SCORM: Fixed PHP Strict Standards errors with AICC packages 2013-08-16 09:29:58 +12:00
Jonathon Fowler f2237bd7dc MDL-32191 navigation: Add keys to module and block settings nav nodes 2013-08-16 09:18:50 +12:00
Tim Hunt b014bb8b4c MDL-38203 multianswer qtype: feedback pop-up should be constrained.
So that, when there is a lot of feedback, it is all visible.
2013-08-15 14:16:32 +01:00
Marina Glancy b9f0a2b869 MDL-36789 Quick course cache integrity check for deleted modules 2013-08-15 21:47:50 +10:00
Tim Hunt 8fbb62c9bc MDL-41162 quiz view page: invalid HTML.
We were sometimes outputting nested p tags. Change the outer one to a
div.
2013-08-15 12:41:31 +01:00
Tim Hunt e859dfdfb8 MDL-41036 Question category info should use HTML editor
This is a minimal fix. All this code could do with a clean-up, but at
the moment, it works, so I am not going to touch it.
2013-08-15 11:58:05 +01:00
Henning Bostelmann 0efd7e9d2e MDL-27595 backup: allow course import with warnings
Proceed with import if warnings are found, but display the warnings afterwards
2013-08-15 11:22:19 +01:00
Dan Poltawski 14e8af6687 weekly release 2.4.5+ 2013-08-15 16:43:23 +08:00
Dan Poltawski 0bfeff4c5e Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-08-15 16:40:29 +08:00
Rossiani Wijaya a60b7797cd MDL-41200 Filepicker: Reduce the string length to fit the dialog size nicely. 2013-08-15 10:50:57 +08:00
Rossiani Wijaya 72e810ca24 MDL-41200 filepicker: change header string to select.
Add length limitation for header, so it fits nicely in mobile devices
2013-08-15 10:48:46 +08:00
AMOS bot c7b085daa0 Automatically generated installer lang files 2013-08-15 00:54:44 +00:00
Dan Poltawski 5fa41023da Merge branch 'MDL-39507_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-08-14 21:58:14 +08:00
Dan Poltawski 376ba9f726 MDL-41191 enrol: unit tests for enrol_get_shared_courses 2013-08-14 21:40:36 +08:00
Tim Hunt 12cc56072a MDL-39507 Question HTML export: fix image handling.
Some code got committed to stable branches that relied on a new API that
was in master only. This fixes it to use the old API.
2013-08-14 11:04:10 +01:00
Dan Poltawski 9ec19c21d2 MDL-41157 calendar: add unit tests for calendar_get_course_cached 2013-08-14 11:06:20 +08:00
Brian King 07b248886d MDL-29004 Wiki: display images in printer-friendly view 2013-08-13 10:10:06 +02:00
Dan Poltawski d835ad6935 MDL-39507 qtype_essay: hacky fix for unit tests
This is just to get the tests passing for integration purposes. Tim
may want to do a robust fix and revert this.
2013-08-13 10:47:46 +08:00
Dan Poltawski 2e91dfc66c Merge branch 'MDL-39507_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-08-13 09:53:31 +08:00
Sam Hemelryk c7f4deecbd Merge branch 'MDL-41045-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-08-13 10:19:05 +12:00
Sam Hemelryk 0047905f91 Merge branch 'MDL-39691_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-08-13 09:40:59 +12:00
Sam Hemelryk 452ff25284 Merge branch 'MDL-41091_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-08-13 09:38:20 +12:00
sam marshall 1a9dc90313 MDL-41050 Progress bar: Width parameter does not work 2013-08-13 09:29:26 +12:00
Sam Hemelryk 3155dcf541 Merge branch 'MDL-41033_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-08-13 09:21:40 +12:00
Sam Hemelryk 06737a22ea Merge branch 'MDL-40996_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-08-13 09:07:49 +12:00
Sam Hemelryk c5dd64f1e9 Merge branch 'MDL-30895-24' of https://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-08-13 08:45:13 +12:00
Sam Hemelryk abafd9a81b NOBUG: fixed whitespace 2013-08-13 08:41:41 +12:00
Sam Hemelryk c41a6dfcd3 Merge branch 'MDL-35931-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-08-13 08:37:59 +12:00
Sam Hemelryk 869a5896d0 Merge branch 'MDL-35919-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-08-13 08:35:23 +12:00
Sam Hemelryk f568a40ac7 Merge branch 'MDL-35934_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-08-13 08:31:59 +12:00
Tim Hunt 06a42cff90 MDL-39507 questions: fix pluginfile URLs before format_text.
This commit build's on Jean-Michel's work, tidying up a few lose ends.
2013-08-12 13:13:54 +01:00
Jean-Michel Vedrine cda91161df MDL-39507 questions: fix pluginfile URLs before format_text. 2013-08-12 10:36:40 +01:00
Dan Poltawski aa39783515 Merge branch 'MDL-27655_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-08-12 16:42:07 +08:00
Dan Poltawski f26c65003d Merge branch 'MDL-30001_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-08-12 16:13:29 +08:00
Dan Poltawski 2b4dbc30ee Merge branch 'wip-mdl-38344-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-08-12 13:52:49 +08:00
Jason Fowler cdc4b4647d MDL-35919 - Activity Chooser - Adding Aria attributes to improve accessibility 2013-08-12 13:28:03 +08:00
Rossiani Wijaya c6a86e6686 MDL-35934 Filemanager: change the set attribute to use setAttribute() instead of YUI set(). 2013-08-12 12:49:52 +08:00
Kirill Astashov 6796b5630c MDL-41122: Trim on RSS body to prevent Remote RSS block from failing on valid feeds 2013-08-12 12:37:22 +09:30
Jean-Michel Vedrine bfa8f562f7 MDL-39691 Lesson - Email graded essays not working 2013-08-11 08:09:09 +02:00
Jean-Michel Vedrine 390cb87e76 MDL-30001 WEBCT Import does not work for 2.0 2013-08-11 08:06:13 +02:00
Petr Škoda 22ecd9658c MDL-41112 fix theme and js caching info in config-dist.php 2013-08-10 23:49:30 +02:00
Rajesh Taneja ad7577e144 MDL-38344 Calendar: converted name field in event table to text
There is no limitation on length of event name in RFC-2445, so changing type
for name from char to text.
2013-08-09 13:20:41 +08:00
Rossiani Wijaya 498cc62c33 MDL-41033 Filepicker: add ARIA attributes for selecting file in a modal 2013-08-09 10:55:06 +08:00
Rossiani Wijaya ce09c74ab1 MDL-35934 filemanager: Add new string for edit 2013-08-09 10:02:39 +08:00
Rossiani Wijaya 9aa1fe0f77 MDL-35934 Filemanager: update set focus attribute.
Also limit the display string for the dialog header to fit nicely on mobile devices
2013-08-09 10:02:39 +08:00
Rossiani Wijaya 51c14ac9d3 MDL-35934 Filemanager: add aria attributes for editing file/folder.
Add unique reference ids

Conflicts:

	files/renderer.php
	mod/data/field/file/field.class.php
	mod/data/field/picture/field.class.php
2013-08-09 10:02:38 +08:00
Tim Hunt 053617fcb6 MDL-41091 questions: fix get_all_submitted_qt_vars for unit testing. 2013-08-08 14:43:28 +01:00
Jerome Mouneyrac 74f48cfa05 MDL-30895 switch from dl tag to table in the accessible chat 2013-08-08 17:50:58 +08:00
Tim Hunt 1d2247bed6 MDL-40996 quiz show user pic should also show name.
This was a regression introduced by MDL-20636 two years ago!
2013-08-08 09:57:57 +01:00
Tim Hunt 5039961852 MDL-31487 fix FEATURE_CONTROLS_GRADE_VISIBILITY for quiz.
This is a followup to MDL-18301. That fix missed the following points:

1. On the edit categories and items screens, all items had an eye-con to
control the visibility, even if the visibility was controlled by the
module.

2. Changing the visibility of a grade category change the visibility of
all items within it, even if the visibility was controlled by the
module.

3. The quiz ingored $cm->visible when controlling whether its grade item
was visible.
2013-08-08 09:56:53 +01:00
Tim Hunt be09a8982b MDL-27655 improve purge all caches.
If you click the link in the page footer, then it will reliably
redirect you back to the page you were on after purging the caches.

If you go to the purge all caches page in the admin menu, it shows you a
purge button, with no cancel button. Clicking the button purges the
caches and takes you back to the page with the button.
2013-08-08 09:56:32 +01:00
Sam Hemelryk ea3f5b5d95 weekly release 2.4.5+ 2013-08-08 16:25:49 +12:00
Sam Hemelryk a6e4a83d99 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-08-08 16:19:42 +12:00
Jason Fowler ae14fe3bb6 MDL-35931 Accessibility - adding focus change when repository is selected 2013-08-08 11:30:39 +08:00
sam marshall 1a60cd4e5c MDL-41045 course_add_cm_to_section should not test for sections unless necessary 2013-08-07 17:20:59 +01:00
Mark Nelson 9e532d0ca3 MDL-40662 block_course_overview: added addinstance capability string 2013-08-07 15:20:07 +12:00
AMOS bot 00410c03d7 Automatically generated installer lang files 2013-08-07 00:43:02 +00:00
Sam Hemelryk b6a2a20236 Merge branch 'MDL-40086-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-08-07 10:36:55 +12:00
Frederic Massart 2980ec2eea MDL-40086 file: Correct ordering of subdirectories
Thanks to Mohamed Alsharaf for the proposed solution.
2013-08-06 13:55:08 +08:00
Sam Hemelryk b19a900a9b Merge branch 'MDL-34989-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-08-06 17:51:06 +12:00
Ruslan Kabalin 5878abf8c6 MDL-40947: Fix segmentation fault issue in get_fast_modinfo. 2013-08-06 17:42:19 +12:00
Marina Glancy b4b50810d4 Merge branch 'MDL-31226-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE 2013-08-06 14:40:45 +10:00
Mark Nelson eea2c47d6f MDL-27953 auth: documented the newly introduced function can_be_manually_set() in upgrade.txt 2013-08-06 15:48:19 +12:00
Mark Nielsen 164cc5f0e9 MDL-40870: Icon alt text in External Tool admin settings all read Accept 2013-08-06 14:48:47 +12:00
Sam Hemelryk 504dc60048 Merge branch 'MDL-40662_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-08-06 14:39:15 +12:00
Mark Nielsen 052f235f24 MDL-39090: Duplicate parameters in LTI launches
Removed endpoint query string params from body
to prevent param duplication.
2013-08-06 10:24:48 +12:00
Sam Hemelryk ecd106d68d Merge branch 'MDL-27953_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-08-06 10:08:39 +12:00
Sam Hemelryk 1498e85483 Merge branch 'w32_MDL-40889_m24_jsminify' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-08-06 09:54:48 +12:00
Marina Glancy ebb5c53b51 Merge branch 'MDL-36011-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-08-05 17:17:33 +10:00
Marina Glancy 93334057de Merge branch 'MDL-30852-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-08-05 13:53:35 +10:00
Shane Elliott 685ed22b13 MDL-40684 Fix conditional field name for custom user fields 2013-08-05 15:51:30 +12:00
Sam Hemelryk 86ebf30fcf Merge branch 'MDL-35922-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-08-05 15:31:59 +12:00
Damyon Wiese 2c6fe0c698 MDL-30852 grade report: More coding guideline cleanups. 2013-08-05 11:24:06 +08:00
Damyon Wiese da6fc6fe17 MDL-30852 grade: Coding style fix for user report. 2013-08-05 11:24:06 +08:00
Steve Bader 8460efc65b MDL-30852 grade report: Add aria attributes
Converted to git branch by Damyon
2013-08-05 11:24:05 +08:00
Damyon Wiese 7d6f0b8224 Merge branch 'MDL-34989-24' of git://github.com/damyon/moodle into MDL-34989-24 2013-08-05 10:44:06 +08:00
Sam Hemelryk 9d146cf08a Merge branch 'MDL-35927_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-08-05 14:38:31 +12:00
Marina Glancy ac23d64400 Merge branch 'MDL-35981-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-08-05 12:21:56 +10:00
Damyon Wiese 1c4b87211d MDL-35981 comments: Fix for keyboard control of "add a comment" 2013-08-05 09:51:52 +08:00
Damyon Wiese 461bac938a MDL-35981 comments: Add comment about keycodes for space and enter. 2013-08-05 09:50:59 +08:00
Damyon Wiese be58294484 MDL-35981 comments: Make delete comment keyboard accessible. 2013-08-05 09:50:58 +08:00
Marina Glancy a01c00333c MDL-34785 performance improvement with big list of courses 2013-08-05 10:16:18 +10:00
Ruslan Kabalin 05342e935c MDL-31226: quiz: Fix message for attempts built on previous.
At the moment, when attempt is built on the last one, "not yet answered"
message is shown, which confuses many people. This patch modifies the state to
"complete" for attempt based on previous and modifies the output string.

Many thanks to Tim Hunt for guiding me through quiz infrastructure and some code
suggestions.
2013-08-02 17:01:50 +01:00
Petr Škoda 093aeffbea MDL-40889 prevent 304 when minimising JS 2013-08-02 16:30:05 +02:00
Damyon Wiese 822f3e1178 MDL-36011 tablelib: Make column headers expand/collapse links accessible.
Conflicts:

	theme/base/style/core.css
	theme/bootstrapbase/less/moodle/core.less
	theme/bootstrapbase/style/moodle.css
2013-08-02 11:31:24 +08:00
AMOS bot d6a0927ba1 Automatically generated installer lang files 2013-08-02 00:38:33 +00:00
Sam Hemelryk a3d12f993a weekly release 2.4.5+ 2013-08-02 08:23:56 +12:00
Sam Hemelryk 0460f175d2 Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE 2013-08-02 08:12:13 +12:00
Rossiani Wijaya 5d2b57a822 MDL-35927 filepicker: add aria attribute to display modal error 2013-08-01 15:41:47 +08:00
Mark Nelson 95ddab5f31 MDL-40662 block_course_overview: added addinstance capability to remove debugging message due to system context being used on the 'Default My home page' 2013-08-01 12:51:18 +08:00
Jason Fowler 057def4fa5 MDL-35922 - Adding aria attributes to create-folder modal 2013-07-31 16:41:52 +08:00
Frederic Massart d2a0dce409 MDL-40615 Repository: Updated Amazon S3 library
Fixed insecure use of CURLOPT_SSL_VERIFYHOST
2013-07-30 09:05:09 +12:00
Mark Nelson 574abfafc6 MDL-27953 auth: allowed the LDAP plugin to be manually assigned to uploaded users 2013-07-29 17:08:53 +08:00
Dan Poltawski 65f2bb0984 Merge branch 'MDL-40867_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-29 15:25:08 +08:00
Charles Fulton b7ee8b96a9 MDL-40323 report_log: fix strict standards error 2013-07-29 14:00:45 +08:00
Dan Poltawski 49ca7310a3 Merge branch 'MDL-40857_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-29 13:56:57 +08:00
Dan Poltawski 29c8710bf5 Merge branch 'MDL-40775_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE 2013-07-29 13:35:23 +08:00
Dan Poltawski 397b5c063e Merge branch 'wip-MDL-29731-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-07-29 13:21:20 +08:00
Dan Poltawski 9a17f7d3cc Merge branch 'MDL-36399_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-29 12:40:29 +08:00
Dan Poltawski 929088ec57 Merge branch 'MDL-40863_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-29 10:10:09 +08:00
Damyon Wiese 336f2df35d MDL-34989 assign: Do not add a param to grading_disabled - cannot be backported.
Conflicts:

	mod/assign/locallib.php
2013-07-29 10:00:10 +08:00
Ashley Holman 214dd19aa2 MDL-34989 assign: Allow students to submit when grade is overriden
Also inform teachers when grading is disabled due to gradebook lock/override.

Conflicts:

	mod/assign/locallib.php
2013-07-29 09:59:43 +08:00
Sam Hemelryk 683fbbb8d7 Merge branch 'MDL-40878_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-29 12:54:07 +12:00
Sam Hemelryk 682f6d57cd Merge branch 'w31_MDL-40891_m24_mkdirrace' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-07-29 11:52:14 +12:00
Sam Hemelryk dacf5b62e8 Merge branch 'MDL-40727-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-07-29 11:48:15 +12:00
Sam Hemelryk aa713f26bd Merge branch 'MDL-40854_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-29 11:01:33 +12:00
Mark Nielsen 9da794f8aa MDL-40005: LTI module uses Apache specific function for retrieving request headers 2013-07-29 10:54:15 +12:00
AMOS bot b7c61a8b99 Automatically generated installer lang files 2013-07-28 00:42:31 +00:00
AMOS bot 0c3fe2f5f0 Merge branch 'MOODLE_24_STABLE' into install_24_STABLE 2013-07-27 00:43:13 +00:00
Petr Škoda bde942541e MDL-40891 prevent exceptions when creating directories in file store
Even if cache creation fails moodle should continue working.
2013-07-26 20:32:21 +02:00
Petr Škoda 1fed67296c MDL-40891 work around make_writable_directory() race condition
You will still get a "PHP Warning:  mkdir(): File exists" but that should not cause any problems on production sites.
2013-07-26 20:31:52 +02:00
Andreas Grabs 60c61daebe MDL-40775 mod_feedback - Undefined variable in feedback activity 2013-07-26 19:40:14 +02:00
Tim Hunt f30c9280d4 MDL-40854 fix mod/...:view capabilities
Prior to the fix, if you did not have a capability like mod/page:view,
then you woulds still see the link to the Page activity in the course
section, but when you clicked on it, you would run into a
require_capability error.

It is a principle that we never show users a link to a page they are not
allowed to access, therefore, when users do not have mod/...:view, they
should not see the link on the course page.

This patch implements this in the cm_info class, in a similar way to how
access restrictions by groups works.

It does not assume that the mod/...:view capability exists. If the
capability does not exist, then users are not prevented from seeing the
link.
2013-07-26 11:51:31 +01:00
Tim Hunt 82c3032d98 MDL-40857 External tool: fix incorrect moodle_url usage. 2013-07-26 11:41:39 +01:00
Tim Hunt 0d4706dd22 MDL-40857 External tool (LTI) capabilitiy names confusing.
I have improved the names in the language file so that they actually say
what they do (based on my reading of the code). I have also added
comments to access.php explaining each capability.

I have corrected a few of the RISK in access.php which were wrong.

I have changed a couple of the archetypes so that guests cannot launch
LTI activities, and editing teachers cannot do editing things.
2013-07-26 11:41:37 +01:00
Tim Hunt 205a3cd8a0 MDL-40867 fix misleading PHPdocs for _get_coursemodule_info 2013-07-26 10:13:29 +01:00
Tim Hunt da18133994 MDL-40867 External tools should launch pop-ups from the course page
Without this fix, if an LTI tool is set to open in a pop-up, then
clicking the link on the course page opens another almost blank page,
which then tries to open the pop-up, which is almost invariably caught
by your pop-up blocker.

With this fix, clicking the link on the course page opens the pop-up
directly, like for pop-up resources.
2013-07-26 10:13:11 +01:00
Tim Hunt 01a3633cc7 MDL-40863 feedback and LTI mods need get_extra_capabilities fn
Since moodle/site:accessallgroups is relevant to how them.
2013-07-26 10:12:53 +01:00
Tim Hunt 9bec0c088f MDL-36399 LTI editing tool config breaks on Oracle.
Note that this fix will fail if the tool URL is longer than 1333
characters.
2013-07-26 10:11:58 +01:00
Damyon Wiese cd08b5c878 weekly release 2.4.5+ 2013-07-26 11:29:20 +08:00
Marina Glancy 1cdbc04d86 MDL-29731 Bugs in recent activity when using separate groups 2013-07-24 21:52:09 +10:00
Damyon Wiese c8cada1552 MDL-40727 Cache: Fix file cache store on windows. 2013-07-24 17:11:30 +08:00
Nadav Kavalerchik ff77405577 MDL-39704 - Properly align and widen the chat bubbles in mod/chat, when in RTL mode 2013-07-23 23:23:48 +02:00
Eloy Lafuente (stronk7) 8b8bd17aac Merge branch 'w30_MDL-40679_m24_zlib' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-07-23 18:21:19 +02:00
Eloy Lafuente (stronk7) 9655e2e335 Merge branch 'MDL-40785_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-23 18:01:28 +02:00
Eloy Lafuente (stronk7) 4e60c378cf Merge branch 'wip-MDL-40700-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-07-23 13:58:46 +02:00
Dan Poltawski ff1fb4619b Merge branch 'MDL-20609_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-23 16:45:58 +08:00
Dan Poltawski 4523e6af16 Merge branch 'MDL-40480_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-23 16:38:48 +08:00
Jason Fowler 4f6f2013bf MDL-39748 - Grading Methods - Fixing input field widths for Rubrics 2013-07-23 14:25:06 +08:00
Dan Poltawski 9ed79d1801 MDL-40585 fix trailing whitespace 2013-07-23 13:35:16 +08:00
Dan Poltawski 066c7987b2 Merge branch 'MDL-40585_24' of git://github.com/mr-russ/moodle into MOODLE_24_STABLE 2013-07-23 13:35:07 +08:00
Dan Poltawski bb925bb8ba Merge branch 'MDL-40584_24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE 2013-07-23 12:38:39 +08:00
Sam Hemelryk 1f3be76708 Merge branch 'MDL-40680-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-07-23 14:12:35 +12:00
AMOS bot 5e0e88e5a3 Automatically generated installer lang files 2013-07-23 00:39:25 +00:00
Eloy Lafuente (stronk7) 9260f1bdd2 Merge branch 'MDL-40626-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-07-22 17:41:07 +02:00
Dan Poltawski 9dae491a94 Merge branch 'w30_MDL-38867_m24_gspell' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-07-22 17:01:58 +08:00
Damyon Wiese 8e3c3ac499 MDL-40260 Course overview: code tidy for previous commit
Moving this check inside the following if makes it clear which code
branch it applies to.
2013-07-22 16:16:41 +08:00
Damyon Wiese 4cf35a316e Merge branch 'm24_MDL-40260' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-07-22 16:16:27 +08:00
Damyon Wiese a04662aad4 Merge branch 'wip-MDL-40174-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-07-22 16:04:40 +08:00
Dan Poltawski c60752f45c Merge branch 'wip-MDL-37333_M24' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE 2013-07-22 10:31:56 +08:00
Sam Hemelryk a62e342c3d MDL-40174 navigation: don't remove active root nodes without children 2013-07-22 10:49:13 +12:00
Sam Hemelryk ad739cd700 MDL-40700 cache: memcache and memcached stores now allow alphanumext prefixes 2013-07-22 10:41:51 +12:00
Chris Wharton 5886e039ec MDL-40700 cache: Validate memcache key prefix field 2013-07-22 10:41:50 +12:00
Petr Škoda bc6bf8d1e6 MDL-40679 mark zlib extension as recommended 2013-07-20 21:20:40 +02:00
Tim Hunt 0d62d8196e MDL-40785 question instances report: ignore subquestions
We should not count subquestions of cloze questions (parent != 0) but we
do want to count random questions (parent = id).
2013-07-19 15:17:00 +01:00
Tim Hunt 7544d10492 MDL-40480 tablelib: specify charset in XHMTL downloads.
Thanks to Jürgen Zimmer for the suggestion.
2013-07-19 11:46:05 +01:00
Tim Hunt 50a4b42ed7 MDL-20609 quiz tables: improve layout for long cell contents.
By allowing more wrapping.
2013-07-19 11:45:27 +01:00
Petr Škoda 7831560995 MDL-38867 remove Google spell checking option 2013-07-19 09:32:35 +02:00
Tim Lock 58940c96c4 MDL-40626 gradebook: Prevent incorrect override with multiline feedback
The quick grading option doesn't allow mutliline editing.
2013-07-19 12:01:55 +08:00
Damyon Wiese 1a449aa5e7 weekly release 2.4.5+ 2013-07-19 09:50:19 +08:00
Damyon Wiese 855b35604d Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-07-19 09:24:02 +08:00
Damyon Wiese 20ea7f2f79 MDL-35851 lesson: Handle importing questions into an empty lesson.
Also - make sure the page we are updating belongs to the lesson.
2013-07-18 16:52:46 +08:00
Gareth J Barnard 2d2b3c39b3 MDL-37333 theme: Fix 'Clear theme caches' redirect. 2013-07-17 17:35:22 +01:00
Damyon Wiese 9f837ac934 MDL-35851 Lesson: Check/fix the page order every time the pages are loaded 2013-07-17 13:04:54 +08:00
Marina Glancy 89478f00cd Merge branch 'MDL-40701-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-07-17 12:47:43 +10:00
Dan Poltawski e66647085e MDL-40701 mod_assignment: fix refresh events
It was getting the cm event with the wrong id and calling
deprecated functions
2013-07-17 10:31:39 +08:00
Eloy Lafuente (stronk7) d76bba6e24 Merge branch 'w29_MDL-40611_m24_accesslibtest' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-07-17 00:32:44 +02:00
Eloy Lafuente (stronk7) d8bbfdfbe0 Merge branch 'MDL-40536-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-07-17 00:26:57 +02:00
Petr Škoda 405d2962d2 MDL-40423 fix creation of new install.xml in subplugins 2013-07-16 21:56:40 +02:00
Damyon Wiese 4474895d37 Merge branch 'wip-MDL-40621-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-07-16 21:31:52 +08:00
Eloy Lafuente (stronk7) d9debeb038 Merge branch 'MDL-40555-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
Conflicts:
	cache/stores/static/lib.php
2013-07-16 09:55:34 +02:00
Marina Glancy 18cf2255f0 Merge branch 'MDL-35851-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-07-16 16:12:40 +10:00
Damyon Wiese ccf721640c MDL-35851 lesson: removed expensive upgrade step.
Just deal with the bad data when displaying the lesson instead.

Conflicts:

	mod/lesson/db/upgrade.php

Conflicts:

	mod/lesson/db/upgrade.php
	mod/lesson/version.php
2013-07-16 14:08:08 +08:00
Damyon Wiese a2de489c3e Merge branch 'MDL-40195_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE 2013-07-16 13:29:19 +08:00
Damyon Wiese 994d7ebdc3 Merge branch 'w29_MDL-40558_m24_guestdelete' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-07-16 11:29:28 +08:00
Matt Debus bc583cacfd MDL-40524: mod_wiki: Display comments in order 2013-07-16 11:26:42 +08:00
Damyon Wiese a7228f586b Merge branch 'MDL-40538_24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE 2013-07-16 10:26:56 +08:00
Rossiani Wijaya 9f124aa5ad MDL-35851 Lesson module: fix page order id for import questions. Add upgrade script to fix lesson pages corrupted links
Conflicts:

	mod/lesson/db/upgrade.php
	mod/lesson/version.php
2013-07-16 10:07:46 +08:00
Dan Poltawski f620ae6c11 MDL-40680 store_memcached: fix serialiser options
* Use correct lang string for SERIALIZER_IGBINARY
* Use PARAM_INT for the parameter
2013-07-16 09:39:16 +08:00
Sam Hemelryk 5cae1b013f MDL-40555 cache: implemented unit tests for default search functionality 2013-07-16 08:36:19 +08:00
Frederic Massart 76edea3d61 MDL-40555 cache: Static store is searchable 2013-07-16 08:35:08 +08:00
Russell Smith 558f2de1b9 MDL-40584 backup: Query db once per category in precheck
The cache is function local and testing against a large database
indicates 10k questions is a large category.  Restore already
uses MEMORY_EXTRA and that will have enough space for the couple
of megabtyes a local sql hash will introduce.
2013-07-16 08:04:16 +10:00
Eloy Lafuente (stronk7) 174405bd5d Merge branch 'wip-MDL-38747-MOODLE_24_STABLE' of https://github.com/satrun77/moodle into MOODLE_24_STABLE 2013-07-15 17:07:05 +02:00
Russell Smith 1bdb3dcd2b MDL-40585 backup: cache XML parent paths
For $this->groupedpaths, using a key is faster as there is
no need to do in_array searches.

Parent cache allows dirname calls to be substantially reduced.
2048 was chosen as a cache size as this class operates on chunks
of the restore at a time, 8k questions produces a parent cache of
about 500 paths and uses 300K of memory.  Scaling up to 2048 will
use about 1.2M of RAM for really large restores.  This is acceptable
for the 48% function call reduction and the 10% runtime improvement
seen.
2013-07-15 19:23:13 +10:00
Damyon Wiese 643786623e MDL-39563: Change to use $CFG consistently 2013-07-15 15:06:30 +08:00
Damyon Wiese ae5e95af2d Merge branch 'MDL-39563-24' of git://github.com/jleyva/moodle into MOODLE_24_STABLE 2013-07-15 15:06:08 +08:00
Marina Glancy 35dc874292 Merge branch 'MDL-40633_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-15 14:45:22 +10:00
Marina Glancy c291dd69ea Merge branch 'wip-MDL-39062-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-07-15 12:53:02 +10:00
Daniel Myers 4fae47dedc MDL-40260 block_course_overview: prevent MNET courses from being dimmed 2013-07-15 13:55:57 +12:00
AMOS bot 688c3bffbd Automatically generated installer lang files 2013-07-15 00:44:27 +00:00
Sam Hemelryk 6026121e10 MDL-39062 cache: version bump to update definitions 2013-07-15 12:02:23 +12:00
Sam Hemelryk 762789f5d7 MDL-39062 cache: persist keys now set properly 2013-07-15 12:02:01 +12:00
Petr Škoda f25af6571f MDL-40611 fix context cache size expectation 2013-07-13 15:40:26 +02:00
Tim Hunt e4f1467a75 MDL-40633 filter_urltolink breaking some image links.
This was a regression caused by MDL-22390. HTML like
<img src="http://www.example.com/logo.gif" />
was being broken.
2013-07-12 11:43:47 +01:00
Petr Škoda ddc6c118c6 MDL-40558 skip admins and guest when deleting incomplete users 2013-07-12 12:38:26 +02:00
Petr Škoda 12de66b2bf MDL-40569 fix empty CSS files after cache purging 2013-07-12 12:35:19 +02:00
Dan Poltawski 514132f8a8 MDL-40536 course/externallib fix incorrect variable
Fixes test_import_course_invalid_deletecontent_option() from the
previous commit.
2013-07-12 16:40:59 +08:00
Dan Poltawski c181c6137d MDL-40536 course: unit tests for course_external::import_course
Basic import operations and a specific test case which identifies
a bug.
2013-07-12 16:40:59 +08:00
Mohamed Alsharaf 3bf3451872 MDL-38747 blocks: course format options numsections is required to display the block 2013-07-12 20:27:24 +12:00
Damyon Wiese 2c66b71ab4 weekly release 2.4.5+ 2013-07-12 09:51:49 +08:00
Damyon Wiese 95455fc76a Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-07-12 09:42:53 +08:00
AMOS bot 658c7b8a7a Automatically generated installer lang files 2013-07-12 00:46:02 +00:00
Juan Leyva ee2316f022 MDL-39563 Fixing mobilecssurl is not being returned in WebService phpunit tests 2013-07-11 16:28:42 +02:00
Marina Glancy dd0f944141 MDL-40621 fixed small bug in function editor_tinymce_plugin::fix_row() 2013-07-11 16:45:48 +10:00
Marina Glancy 537d8f8a58 Merge branch 'MDL-38366-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-07-10 16:26:59 +10:00
Frederic Massart 2a2d53bd97 MDL-38366 repository_filesystem: Prevent use of empty subdir 2013-07-10 13:49:38 +08:00
Marina Glancy 114c924d94 Merge branch 'm24_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-07-10 12:03:57 +10:00
Raymond Wijaya 622425d2fb MDL-40093 mod/assign: Remove count of drafts in offline assignment's grading summary screen 2013-07-10 11:36:53 +10:00
Russell Smith 2215cc347a MDL-40538 caching: Use isset for performance
isset is much faster than array_key_exists. For caches we need to
ensure as much performance as possible. To all null to continue to
be stored and provide correct results, non ttl also now saves in
$this->store[$key][0].  As isset($this->store[$key]) will return
true in all cases.

time() as found in cache::now() can be slow on some platforms and
we shouldn't bother checking it unless needed. It also stops non-ttl
caches paying the ttl price.

Unit tests were adjusted to ensure null is still handled correctly
when we are only using isset.
2013-07-10 10:42:51 +10:00
Marina Glancy ed79029f0e Merge branch 'MDL-40441_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-10 10:03:44 +10:00
Sam Hemelryk 286232d695 Merge branch 'w28_MDL-40450_m24_tinymcebuttons' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-07-10 11:01:48 +12:00
Sam Hemelryk 97d98e9920 Merge branch 'MDL-40527_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-10 10:30:29 +12:00
Sam Hemelryk 3b0c725de1 Merge branch 'm24_MDL-40512' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-07-10 10:09:49 +12:00
Damyon Wiese 4dcd073864 Merge branch 'MDL-39420_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-09 22:44:21 +08:00
Damyon Wiese 800c5757c3 Merge branch 'MDL-36479_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-09 22:27:59 +08:00
Tim Hunt 4cc817aa33 MDL-39420 multichoice: fix layout of multi-line choices. 2013-07-09 11:57:07 +01:00
Tim Hunt 41ffd24e82 MDL-40441 fix obscure notice in the quiz.
This can only happen if you have both a user with both a real attempt
and a preview, and then edit the quiz settings.

Also clean up this code a bit.
2013-07-09 10:45:33 +01:00
Damyon Wiese 1f304be72c Merge branch 'MDL-40443_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-09 15:16:32 +08:00
Jamie Pratt 304343830b MDL-40176 mock_submit method for testing
Conflicts:

	lib/formslib.php
2013-07-09 15:09:56 +08:00
Damyon Wiese d3dc9a334c Merge branch 'MDL-40499_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-07-09 13:27:05 +08:00
prateeksachan bb6cacb913 MDL-40386: Fix for updating timemodified field in book_chapters 2013-07-09 12:35:18 +08:00
Jamie Pratt 4eff6ed9fe MDL-40388 Reset globals after each unit test 2013-07-09 11:56:53 +08:00
Tony Levi 954ba4bce4 MDL-40035: Avoid rebuild_course_cache always for empty course 2013-07-09 13:55:46 +10:00
Damyon Wiese b7aac8b6d1 Merge branch 'MDL-40318_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-09 11:13:23 +08:00
Marina Glancy be9cd2ff26 Merge branch 'MDL-40434_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-07-09 11:33:20 +10:00
Tim Lock b719bf20b4 MDL-40436: auth_ldap: Fixed warning when adding new LDAP users 2013-07-08 23:02:22 +08:00
Adam Olley d79c15550f MDL-40195: mod_assign: Display grades when quickgrading to 2 decimal places 2013-07-08 20:07:12 +09:30
Damyon Wiese 92cfad95c8 Merge branch 'MDL-38314-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-07-08 16:40:39 +08:00
Frederic Massart f4f853f8cd MDL-38314 repository: Removed >= 2.5 code logic 2013-07-08 16:40:21 +08:00
Damyon Wiese 51cefce972 Merge branch 'MDL-38314-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
Conflicts:
	version.php
2013-07-08 15:16:42 +08:00
Petr Škoda f0be68a15e MDL-40450 update links to TinyMCE 3.x docs 2013-07-07 16:12:29 +02:00
Matteo Scaramuccia c8d8b400f9 MDL-39832 Files: Fixed ETag format according with RFC2616.
ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11:

      entity-tag = [ weak ] opaque-tag
      weak       = "W/"
      opaque-tag = quoted-string
2013-07-07 09:19:15 +02:00
Matteo Scaramuccia 6ef0160a64 MDL-39832 Files: Revert MDL-39688 commit, 7c742620d2
MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.
2013-07-07 09:19:14 +02:00
Eloy Lafuente (stronk7) 919251f295 Moodle release 2.4.5 2013-07-06 17:56:11 +02:00
Tim Hunt 712bcc3e09 MDL-40527 enrol meta: respect $CFG->courselistshortnames
Thanks to James Henestofel for working this out in MDL-37558. That issue
got complex, so I am just submitting this simple part of it for
integration.
2013-07-05 15:37:09 +01:00
Dan Marsden ed928e942c MDL-40512 SCORM: prevent undefined warning 2013-07-05 12:09:59 +12:00
Jean-Michel Vedrine a16ec93666 MDL-40499 Edit question from 1.9 backup breaks if images in subdirs 2013-07-04 15:07:46 +02:00
Tim Hunt 28c8189c7f MDL-40443 setType notice in quiz reports. 2013-07-04 12:34:55 +01:00
Tim Hunt c004ced96b MDL-40318 quiz intro comprising just an impage was not shown
Also, ensure that we don't output an empty box if there are no access
messages.
2013-07-04 12:34:21 +01:00
Tim Hunt ef84ab84bf MDL-36479 quiz regrade: use progress bar to prevent time-outs 2013-07-04 12:33:25 +01:00
Damyon Wiese b5906ea400 weekly release 2.4.4+ 2013-07-04 15:33:31 +08:00
Damyon Wiese 76e6fbd776 MDL-40308: Fix javascript for lti mod_form
It was toggling the state of the hidden input - not the checkbox.
2013-07-04 13:47:36 +08:00
Frederic Massart 7e51747ede MDL-38314 repository: Improving performance of upgrade script 2013-07-03 16:28:28 +08:00
Frederic Massart 22785530b9 MDL-38314 repository: Remove orphan repository instances 2013-07-03 16:28:25 +08:00
Frederic Massart d8732ee8b7 MDL-38314 repository: Delete repository instances on context deletion 2013-07-03 16:27:08 +08:00
Frederic Massart c11ea21997 MDL-38314 repository: Unit Tests for delete_all_for_context() 2013-07-03 16:27:08 +08:00
Michael Aherne 1619a06942 MDL-40275 core Improve documentation for block_base::has_config() 2013-07-02 21:53:17 +02:00
Eloy Lafuente (stronk7) bc6835b1d1 MDL-37516 Translate fieldnames on output only.
This reverts a change performed by the previous commit where user
fieldnames were being translated (and cached) when fetched,
causing the information to remain static later, not responding
to language switches (and perhaps leading to other problems if those
structures are used lated for DB / $USER comparisons.

With the commit, the translation happens on output, so no
potential interferences will happen and, also, the information
changes dynamically on lang switching.
2013-07-02 21:03:10 +02:00
sam marshall 122d59390f MDL-37516 Conditional activities: user field condition display fixes 2013-07-02 21:03:04 +02:00
Eloy Lafuente (stronk7) cb4beb2d2c Merge branch 'MDL-40439-en_fix_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-07-02 13:48:02 +02:00
Helen Foster c3f4867a41 MDL-40439 Merge English strings from the en_fix language pack 2013-07-02 11:51:45 +02:00
Tim Hunt ca6904b6c9 MDL-40434 calculatedmulti multiple-response questions not randomised 2013-07-02 08:24:01 +01:00
Damyon Wiese 955172a5a0 Merge branch 'wip-MDL-40353-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-07-02 14:29:28 +08:00
Dan Poltawski d1e2ee9eec Merge branch 'MDL-40297_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-07-02 13:43:57 +08:00
Andreas Grabs 5832a8f737 MDL-39570 mod_feedback - Missing privilege check 2013-07-02 13:35:49 +08:00
Dan Poltawski 1edad3fd90 Merge branch 'w27_MDL-40399_m24_msarrayshift' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-07-02 13:33:49 +08:00
Dan Marsden 01d2c82e1b MDL-39628 Chat: check mod/chat:chat capability when using daemon.
Thanks to Francois Gauthier for report/fix.
2013-07-02 12:20:25 +08:00
Jason Fowler 4b450df00d MDL-37818 - RSS - Prevent access to blocks while RSS context errors are displayed 2013-07-02 10:04:21 +08:00
Dan Poltawski e09fc9f3c1 Merge branch 'w27_MDL-40266_m24_arrayshift' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-07-02 09:55:33 +08:00
Eloy Lafuente (stronk7) ea0b123d07 Merge branch 'get_users_by_capability_fix_m24' of http://github.com/timgus/moodle into MOODLE_24_STABLE 2013-07-02 00:46:51 +02:00
Rossiani Wijaya 301d9518ed MDL-39546 Lesson module: removed duplicate to decode special characters 2013-07-02 09:36:06 +12:00
Rossiani Wijaya 3c108a95df MDL-39546 Lesson module: fixed matching question issues. 2013-07-02 09:35:52 +12:00
Eloy Lafuente (stronk7) 8ae15861de Merge branch 'w27_MDL-39754_m24_evn26' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-07-01 23:14:16 +02:00
Petr Škoda ec99b59381 MDL-39754 copy 2.5 requirements to Moodle 2.6
Optional features and warnings may be added later,
but we need at least required environment for 2.5.1

This includes database family cleanup and more realistic memory requirement.
2013-07-01 10:03:51 +02:00
Petr Škoda 1596dca3d0 MDL-40266 improve emulate_bound_params() for mssql driver
Looping over large numbers of items with array_shift() is expensive.
Reverse the array and fetch items from the top of the pile.

Credit goes to Martin Langhoff for original mysqli fix.
2013-07-01 08:53:28 +02:00
Petr Škoda ba8a53a4f9 MDL-40266 improve emulate_bound_params() for sqlsrv driver
Looping over large numbers of items with array_shift() is expensive.
Reverse the array and fetch items from the top of the pile.

Credit goes to Martin Langhoff for original mysqli fix.
2013-07-01 08:53:27 +02:00
Mark Nielsen 86e56e40bd MDL-40308: Privacy settings do not change
Update LTI mod form so checkboxes always submit their value.
2013-07-01 11:27:32 +08:00
Dan Poltawski 3db9731fb6 Merge branch 'wip-MDL-40344-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-07-01 11:22:20 +08:00
Sam Hemelryk 3d6b490b81 NOBUG: fixed whitespace 2013-07-01 13:24:50 +12:00
Martin Langhoff 2122af37b6 MDL-40266 improve emulate_bound_params() for mysqli
Looping over large numbers of items with array_shift() is expensive.
Reverse the array and fetch items from the top of the pile.
2013-06-30 18:40:18 +02:00
Eloy Lafuente (stronk7) c45ca47759 MDL-40297 whitespace, comments & var names cleanup 2013-06-30 16:49:13 +02:00
Dmytro Vorona d121290607 MDL-40297 Hide empty categories in my courses
This is a followup of MDL-38631 were was detected that
whith categories being displayed in my courses, some of
them, not having courses for the user, were still shown.

With this patch, any category in the tree, not having courses
is automatically hidden, any depth.
2013-06-30 16:49:08 +02:00
David Mudrák bdd014e2c2 MDL-35206 Fix the links list enumeration in the html2text library 2013-06-28 13:14:48 +02:00
Sam Hemelryk 7bcdac4882 MDL-40344 navigation: expandable branch id is now properly unique 2013-06-28 09:58:59 +12:00
Eloy Lafuente (stronk7) c982630a94 weekly release 2.4.4+ 2013-06-27 20:11:52 +02:00
Eloy Lafuente (stronk7) dc56547079 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-06-27 20:05:24 +02:00
Marina Glancy fe4bb9a3f6 MDL-40353 fixed wrong redirection on course group page 2013-06-27 13:50:43 +10:00
AMOS bot 96cf04159c Automatically generated installer lang files 2013-06-27 00:40:26 +00:00
Eloy Lafuente (stronk7) 1de08a0e60 Merge branch 'MDL-40264-m24-essay-zero' of git://github.com/ktemkin/moodle into MOODLE_24_STABLE 2013-06-24 21:23:34 +02:00
Eloy Lafuente (stronk7) 4207e4771a Merge branch 'MDL-34610_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-06-24 20:21:47 +02:00
Eloy Lafuente (stronk7) 81c7328717 Merge branch 'MDL-40255_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-06-24 19:26:32 +02:00
Matteo Scaramuccia da660f362b MDL-40200 Administration: Return the invalid user message and stop there
To avoid adding duplicate code, 'invalid user' and 'user deleted' checks
have been merged together.
2013-06-24 19:01:08 +02:00
Sam Chaffee 4417a705cf MDL-40258: Fixed invalid json string error in file-picker 2013-06-24 18:57:08 +02:00
Ankit Agarwal cc6641f040 MDL-40250 phpunit: Add unit tests for core_files_external::upload() 2013-06-24 18:10:04 +02:00
Jason Fowler 6e4059838c MDL-39044 - Course Completion - Replaceing strtolower with multibyte safe textlib::strtolower
Conflicts:
	blocks/completionstatus/details.php
2013-06-24 15:46:34 +12:00
Sam Hemelryk 211c473452 Merge branch 'MDL-39760-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE
Conflicts:
	mod/assign/locallib.php
2013-06-24 14:29:21 +12:00
Sam Hemelryk 9505fcffe4 Merge branch 'MDL-39280-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-06-24 14:08:47 +12:00
Sam Hemelryk 7759839612 MDL-38347 fixed whitespace 2013-06-24 11:29:34 +12:00
Sam Hemelryk 9cf6081027 Merge branch 'wip-MDL-38347-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-06-24 11:21:54 +12:00
Sam Hemelryk 6d4fe99033 Merge branch 'MDL-28124_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-06-24 10:29:06 +12:00
Amanda Doughty bf296d3cf3 MDL-38376 mod_assign: Feedback displayed when Grade set to hidden 2013-06-24 10:19:53 +12:00
Mary Evans 98159ddec2 MDL-40255 theme_boxxie/theme_formfactor: Added block-region class to layout files to enable dnd file uploader to work. 2013-06-22 21:26:20 +01:00
Marina Glancy 2c8e21ac35 MDL-38631 link categories in My courses only when needed 2013-06-22 16:21:30 +10:00
Dmytro Vorona 073a972375 MDL-38631 Fixed faulty add_category call, introduced in 758103 2013-06-22 16:21:29 +10:00
Tim Hunt 40818b7d48 MDL-34610 remove legacy IE CSS. It breaks form layout 2013-06-21 21:57:45 +01:00
Kyle Temkin b64526c715 MDL-40264 fix essay handling of zero-string response
Fixes an inappropriate behavior of the is_complete_response() function
for the Essay question type, which caused the string "0" to be
inappropriately marked as an incomplete response.

Also adds a set of unit tests for the Essay question type's
is_complete_response.
2013-06-21 03:28:59 -04:00
Dan Poltawski 8be321e3d9 weekly release 2.4.4+ 2013-06-21 13:29:18 +08:00
Tim Gus 134a6ddcf0 MDL-40259 - For SCORM reports limit fields returned from
get_users_by_capability to user ID to decrease memory utilization
2013-06-20 15:56:47 -04:00
Ruslan Kabalin 478cac84e1 MDL-39760: mod_assign: Add few more callback methods.
Adds lock, unlock and release_to_draft. All of them accept single parameter -
an assign_submission record.
2013-06-19 15:35:17 +01:00
Ruslan Kabalin c07c4324c7 MDL-39760: mod_assign: Make submit_for_grading accept submission as parameter. 2013-06-19 15:35:16 +01:00
Marina Glancy bebd6a6cef Merge branch 'MDL-40207-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-06-18 15:39:55 +10:00
Marina Glancy 272105604a Merge branch 'MDL-39650-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-06-18 14:13:10 +10:00
Ruslan Kabalin 8401eb9425 MDL-33546: course: Fix current week hightlighting after dragging the section 2013-06-18 13:04:43 +10:00
Marina Glancy 2e6cc99352 Merge branch 'MDL-40165-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-06-18 12:56:20 +10:00
Sam Hemelryk 23f186b5c8 Merge branch 'MDL-40036-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-06-18 13:58:48 +12:00
Marina Glancy af06f5def5 Merge branch 'MDL-38079_24' of git://github.com/mr-russ/moodle into MOODLE_24_STABLE 2013-06-18 11:14:52 +10:00
Sam Hemelryk 46c30b7e1b Merge branch 'wip-mdl-39863-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-06-18 11:19:22 +12:00
Sam Hemelryk c8802b6e6c Merge branch 'MDL-40109_24' of git://github.com/dmonllao/moodle into MOODLE_24_STABLE 2013-06-18 11:07:48 +12:00
Eloy Lafuente (stronk7) 392aa3ff35 Merge branch 'MDL-33562-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE
Conflicts:
	version.php
2013-06-18 00:46:59 +02:00
Sam Hemelryk 5008f4fffd Merge branch 'MDL-30132_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-06-18 10:26:27 +12:00
Sam Hemelryk 7b8783b751 Merge branch 'wip-MDL-40159-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-06-18 09:04:27 +12:00
Russell Smith 8fb30e9d1f MDL-38079 mod_feedback - Hide "add question to activity" button 2013-06-17 20:00:05 +10:00
Marina Glancy dfdea57b26 MDL-40159 Fixing bug with empty variable, regression from MDL-21097 2013-06-17 14:26:10 +10:00
Sam Hemelryk c4eab12234 Merge branch 'm24_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-06-17 16:09:52 +12:00
Sam Hemelryk 57efe7bdba Merge branch 'MDL-21933_24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE 2013-06-17 15:45:16 +12:00
Sam Hemelryk 11270c4b2d Merge branch 'wip-MDL-40091-MOODLE_24_STABLE' of git://github.com/satrun77/moodle into MOODLE_24_STABLE 2013-06-17 15:43:07 +12:00
Dan Poltawski f7c0e172c6 MDL-40207 simplepie: reduce false failures in unit tests
The simplepie tests time out too quickly due to a low connect timeout,
to fix this, I converted the unit tests to use a high timeout value.
2013-06-17 10:59:41 +08:00
Sam Hemelryk 79cb5006f9 Merge branch 'MDL-39761-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE 2013-06-17 14:26:13 +12:00
Sam Hemelryk bea68c50d6 MDL-40142 navigation: fixed chainable issue with navigation JS 2013-06-17 09:15:20 +12:00
Mary Evans 288ab0b16c MDL-28124 admin/tool/customlang: Changed page layout from 'standard' to 'report'. 2013-06-15 00:12:01 +01:00
Mohamed Alsharaf 4978c2ae05 MDL-40091 book: revision must be incremented after editing a chapter 2013-06-14 21:27:09 +12:00
Marina Glancy f5dd4b478c weekly release 2.4.4+ 2013-06-14 13:49:30 +10:00
Andrew Nicols bcdda24942 MDL-40165 Backup: Split out test classes into multiple files 2013-06-13 08:58:02 +01:00
Dan Poltawski 8c12e634ea Revert "MDL-39832 Files: Revert MDL-39688 commit, 7c742620d26bdba53e136fda293d33b5271ce241"
This reverts commit 6c227b64e2.
2013-06-13 13:57:32 +08:00
Dan Poltawski 433222d6c0 Revert "MDL-39832 Files: Fixed ETag format according with RFC2616."
This reverts commit 20043f4392.
2013-06-13 13:57:30 +08:00
Russell Smith d39e66a6cd MDL-21933 course: Allow users to search participants course permission
Capability checks are performed at the top of the page and do not need
to be completed again.

Search is an expected feature for users and it was confusion to only
appear after 3 pages.  This has been changed to enable search when
there are more records than are visible on the screen.  If users
are unable to use browser search, they will be able to use Moodle's
search.
2013-06-13 12:44:17 +10:00
Mary Evans bce7ef0bd5 MDL-30312 User: Changed page layout from mydashboard to mypublic in user/profile.php 2013-06-12 21:27:17 +01:00
Dan Poltawski 6e74e428af Merge branch 'MDL-39472-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-06-12 14:16:43 +08:00
Sam Hemelryk 0ad16081a2 Merge branch 'MDL-39964-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-06-12 09:02:27 +12:00
Sam Hemelryk 8fd47854a6 Merge branch 'MDL-25901-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-06-12 09:00:01 +12:00
Dan Poltawski e7d8c56098 Merge branch 'wip-MDL-40100-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-06-11 15:36:37 +08:00
Sam Hemelryk ffb486a996 Merge branch 'MDL-26925-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-06-11 17:31:24 +12:00
Sam Hemelryk 2a31efea1b Merge branch 'MDL-39505-migrate-file-backport_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-06-11 17:16:15 +12:00
Sam Hemelryk c1dfb624bf Merge branch 'MDL-22390_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-06-11 17:07:33 +12:00
Dan Poltawski 1ebac4eab3 Merge branch 'm24_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-06-11 12:54:48 +08:00
Rajesh Taneja c5250462f6 MDL-39863 Administration: Show confirmation/notice and don't redirect automatically 2013-06-11 10:24:53 +08:00
Marina Glancy 351f4729e2 Merge branch 'MDL-39412_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-06-11 12:02:01 +10:00
Sam Hemelryk b26a15ff67 Merge branch 'MDL-39454-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-06-11 12:26:42 +12:00
Matteo Scaramuccia f41aaa2551 MDL-40095 SCORM: Trivial comments tidy up 2013-06-10 21:05:05 +02:00
Matteo Scaramuccia dc44a83f83 MDL-40095 SCORM: Fixed DML error when saving with completion options locked
Regression caused by MDL-38315.
2013-06-10 21:04:54 +02:00
Dan Poltawski a3ad98f25d Merge branch 'MDL-39947_24' of https://github.com/aolley/moodle into MOODLE_24_STABLE 2013-06-10 16:20:45 +08:00
Dan Poltawski 9ab6e7d851 Merge branch 'm24_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-06-10 15:43:15 +08:00
Dan Poltawski 24e89189a7 Merge branch 'MDL-40018_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-06-10 15:00:32 +08:00
David Mudrák 48919dba12 MDL-40080 Remove unused strings from the core_hub subsystem 2013-06-10 14:42:10 +08:00
David Monllao 3f7511f022 MDL-40109 format_weeks: Removing extra space 2013-06-10 13:31:54 +08:00
Dan Poltawski e4737333eb Merge branch 'MDL-39667-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-06-10 12:51:44 +08:00
Dan Poltawski e9ec512875 Merge branch 'w24_MDL-28394_m24_enrolrestore' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-06-10 12:17:14 +08:00
Dan Poltawski 60a6533433 Merge branch 'm24_MDL-37968' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-06-10 12:10:15 +08:00
Sam Hemelryk 4fe8c2c799 Merge branch 'MDL-40009_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-06-10 15:54:52 +12:00
Sam Hemelryk 5dbb8b3909 Merge branch 'w24_MDL-39549_m24_cohortsearch' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-06-10 15:47:49 +12:00
Sam Hemelryk e7b6fc35bf Merge branch 'MDL-39971_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-06-10 15:09:28 +12:00
Sam Hemelryk 1db4d513a7 Merge branch 'w24_MDL-32480_m24_imscp' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-06-10 14:40:53 +12:00
Sam Hemelryk 4964633e3a Merge branch 'MDL-36090_log2_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-06-10 12:30:46 +12:00
Sam Hemelryk 5dc899f004 MDL-40100 cache: removed unneeded includes from add instance forms 2013-06-10 10:26:35 +12:00
Matteo Scaramuccia 8348ec06ea MDL-40002 Files: ETag value must be a quoted-string.
ETag value must be double quoted, http://tools.ietf.org/html/rfc2616#section-3.11.
More details about potential impacts in MDL-39832: shortly, at least when using
HTTP Partial GET Requests (HTTP Status: 206) plus X-Sendfile HTTP Header.
In this commit, the impact is to be RFC2616 compliant when using the ETag Header.
2013-06-09 10:19:03 +02:00
Tim Hunt d80b2c736e MDL-22390 autolink filter: handle URLs in brackets better.
This breaks some legitimate URLs like
http://en.wikipedia.org/wiki/Slash_(punctuation).
This is a necessary trade-off. Many other web systems do not handle that
case correctly either. The work-around it so escape the ) as %29.

This commit also improves the way the unit tests for this work.

It also fixes a couple of other tricky cases that were spotted in
the forums while this was being discussed. See the new test cases.
2013-06-08 16:55:00 +01:00
Petr Škoda 69d963254e MDL-39549 fix cohort search in course categories 2013-06-07 22:08:50 +02:00
Petr Škoda 24c954c181 MDL-28394 fix enrolment method restore logic
This patch fixes:
* missing enrolment methods after 1.9 backup restore - defaults are added
* enrolment methods are restored only when users option is enabled
* manual enrolment override option is disabled if users not available
2013-06-07 10:04:06 +02:00
Petr Škoda 1cf70434e2 MDL-32480 allow external https links in IMSCP too 2013-06-07 09:59:50 +02:00
Nicolas Dunand 0454409240 MDL-32480 fix display of IMS content packages with external links 2013-06-07 09:59:49 +02:00
Dan Marsden 13cea3d030 MDL-37968 course_overview: add dim class to hidden courses for teachers. 2013-06-07 14:40:01 +12:00
Matteo Scaramuccia 20043f4392 MDL-39832 Files: Fixed ETag format according with RFC2616.
ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11:

      entity-tag = [ weak ] opaque-tag
      weak       = "W/"
      opaque-tag = quoted-string
2013-06-06 23:09:46 +02:00
Matteo Scaramuccia 6c227b64e2 MDL-39832 Files: Revert MDL-39688 commit, 7c742620d2
MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.
2013-06-06 23:09:45 +02:00
Petr Škoda d4eb62d66b MDL-37780 fix 1.9 restore on windows 2013-06-06 12:26:29 +02:00
Dan Poltawski 031e2352da MDL-26925 User selector: Set label when no results
Thanks to Jonathon Fowler for the fix!
2013-06-06 14:09:59 +08:00
Frederic Massart 29c2cafaee MDL-40036 user: Respect capability to ignore user quota 2013-06-06 12:43:10 +08:00
Dan Poltawski 6c413970b7 weekly release 2.4.4+ 2013-06-06 12:00:38 +08:00
Dan Poltawski 60fcc78c1f Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-06-06 11:55:29 +08:00
Dan Poltawski 91f07e7e8b MDL-25901 rss: do not copyright html tag
They copyright field does not permit html, it should be plain text
2013-06-06 11:30:50 +08:00
Eloy Lafuente (stronk7) 520f292699 Merge branch 'wip-MDL-21097-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-06-05 10:36:31 +02:00
Marina Glancy 82f43805fe MDL-21097 Correctly check capabilities for frontpage editing mode 2013-06-05 18:07:43 +10:00
Dan Poltawski cbb612d2bf MDL-39964 report_progress: don't browser sniff for SVG support
Use feature detection, its more robust and better practice.
2013-06-05 15:40:55 +08:00
Dan Poltawski 64a21db766 Merge branch 'wip-MDL-21097-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-06-05 13:10:46 +08:00
Marina Glancy 84031db72b MDL-21097 corrected course editing roles 2013-06-05 14:25:13 +10:00
Andrew Davis 4dd5ce20ff MDL-36090 core_grade: added logging of overriding of student grades 2013-06-05 08:58:16 +08:00
Eloy Lafuente (stronk7) 960a321544 Merge branch 'mdl24-MDL-39409-auth-cas-use-moodle-web-proxy' of https://github.com/brki/moodle into MOODLE_24_STABLE 2013-06-05 02:46:40 +02:00
Eloy Lafuente (stronk7) 13c6a81607 Merge branch 'w23_MDL-39416_m24_pagelog' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-06-05 02:43:59 +02:00
Eloy Lafuente (stronk7) f078a515c7 Merge branch 'MDL-38731-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-06-05 02:31:04 +02:00
Eloy Lafuente (stronk7) 58d9daa435 Merge branch 'MDL-37332-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-06-05 02:27:41 +02:00
Eloy Lafuente (stronk7) 416b9b3803 Merge branch 'm24_MDL-38545_PHP_Strict_error' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-06-05 02:23:21 +02:00
Eloy Lafuente (stronk7) b0237a093f Merge branch 'wip-MDL-21097-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-06-05 01:43:25 +02:00
Mary Evans b9cdd1150e MDL-40018 theme_sky_high: Fixed footer in admin pages. 2013-06-05 00:20:56 +01:00
Mark Nelson 118242be26 MDL-40009 notes: corrected the form element names passed to setType 2013-06-04 18:08:50 +08:00
Dan Poltawski 7165b1586f Merge branch 'MDL-39945_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-06-04 15:54:12 +08:00
Dan Poltawski 09b91f0fff Merge branch 'MDL-39835_M24' of github.com:lazydaisy/moodle into MOODLE_24_STABLE 2013-06-04 14:45:09 +08:00
Dan Poltawski d000c1a380 Merge branch 'MDL-39536-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-06-04 13:20:56 +08:00
Frederic Massart e4ddfbe0f8 MDL-39536 completion: Unit tests for get_activities and has_activities 2013-06-04 12:57:53 +08:00
Frederic Massart 25f9cba3d2 MDL-39536 completion: Prevent DB call when fetching activities 2013-06-04 12:57:53 +08:00
David Mudrák b9e16a5137 MDL-39939 Fix the basic SCORM report plugin name 2013-06-04 12:27:51 +08:00
Dan Poltawski 4802b1ed8e Merge branch 'MDL-39317-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-06-04 11:26:45 +08:00
Dan Poltawski 0dc499ec7f Merge branch 'MDL-39743-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-06-04 11:03:55 +08:00
Dan Poltawski 4c8664099e Merge branch 'wip_24_mdl-34085' of https://github.com/iarenaza/moodle into MOODLE_24_STABLE 2013-06-04 10:43:18 +08:00
AMOS bot d86662e14e Automatically generated installer lang files 2013-06-04 00:46:36 +00:00
Marina Glancy fc97a877fd MDL-39801 navigation_node::remove does not allow to insert nodes afterwards 2013-06-04 02:03:31 +02:00
Marina Glancy d60d1d0db8 MDL-39801 navigation_node::remove fails if first child does not have a key 2013-06-04 02:03:24 +02:00
Eloy Lafuente (stronk7) 4746dc557a MDL-39764 style: phpdoc changed to inline comments 2013-06-04 01:44:20 +02:00
Eloy Lafuente (stronk7) b4a8c66cca Merge branch 'wip-MDL-39764_M24_3' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE 2013-06-04 01:44:11 +02:00
Gareth J Barnard b0997b27fc MDL-39764 course_format: Allow courses to have numsections > maxsections. 2013-06-03 23:57:52 +01:00
Eloy Lafuente (stronk7) d4ef1bbbcf MDL-39465 Show env. info instead of part twice. 2013-06-04 00:51:04 +02:00
Eloy Lafuente (stronk7) 771b35c6fe Merge branch 'w23_MDL-39465_m24_environment' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-06-04 00:01:16 +02:00
Eloy Lafuente (stronk7) 613b32bbb8 Merge branch 'MDL-39166-m24' of https://github.com/jfilip/moodle into MOODLE_24_STABLE 2013-06-03 23:55:41 +02:00
Eloy Lafuente (stronk7) 813db77aa2 Merge branch 'wip-MDL-39710-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-06-03 23:22:44 +02:00
Eloy Lafuente (stronk7) e4c30d9639 Merge branch 'MDL-39932_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE 2013-06-03 19:10:55 +02:00
Eloy Lafuente (stronk7) 954e384783 Merge branch 'MDL-39487_24' of https://github.com/IOC/moodle into MOODLE_24_STABLE 2013-06-03 19:03:38 +02:00
Petr Škoda d1bb51aaad MDL-39416 do not try to get detailed perflog info before PAGE int 2013-06-02 13:30:02 +02:00
Mary Evans 4db0ad5756 MDL-39835 theme_sky_high: Fix for footer to display correctly in higher resolutions. 2013-06-01 22:02:37 +01:00
Petr Škoda 29b18e6c68 MDL-39465 detect environment problems in tests
This should help explain why something else fails.
2013-05-31 22:04:02 +02:00
Tim Hunt 93cf55eb72 MDL-39971 each attempt builds on last broken for previews. 2013-05-31 20:33:38 +01:00
Marina Glancy 8069eac74b MDL-39710 Don't display rubric and guide preview unless option checked 2013-05-31 16:09:21 +10:00
Russell Boyatt 74d4a8e314 Fixing MDL-39710: setting to limit student access to rubric now checked. 2013-05-31 16:06:42 +10:00
Dan Poltawski 8228d7a653 MDL-38731 course: split course group settings header
Allow translators to translate the heading differently.

AMOS BEGIN
  CPY [groups,group],[groupsettingsheader,group]
AMOS END

Conflicts:
	course/edit_form.php
2013-05-31 12:14:19 +08:00
Dan Poltawski 9e5d7687e3 MDL-37332 portfolio: don't add double slashes
get_filepath() always returns trailing slash.

This breaks windows export - thanks to Jason Platts
2013-05-31 11:52:57 +08:00
Marina Glancy db13f65136 MDL-21097 Correctly check capabilities for course settings items
- Make sure that items in course settings (and frontpage settings) are shown depending on user capabilities
- Make sure user is able to turn editing on on the page even if he has only limited number of seciton/modules capabilities
2013-05-31 13:21:03 +10:00
Frederic Massart 734581a35e MDL-39650 form: Type can be set on repeated elements in a group 2013-05-31 11:05:08 +08:00
Dan Poltawski 20431aacf8 MDL-33562 lib: remove deleted user tokens 2013-05-31 10:28:29 +08:00
Dan Poltawski 27bab164f2 MDL-33562 lib: remove private keys when user deleted 2013-05-31 10:27:01 +08:00
AMOS bot 48dedbe914 Automatically generated installer lang files 2013-05-31 00:43:09 +00:00
Adam Olley 752fb7113d MDL-39947 mod_forum: Add safety check to variable assignment when counting unread posts 2013-05-31 09:50:35 +09:30
Andreas Grabs a33fc4907e MDL-39932 mod_feedback - Mapping Feedback when Course is Deleted - thx to David N. Johnson 2013-05-30 23:12:54 +02:00
Tim Hunt c0f5255cb9 MDL-39945 qtype multichoice was not comparing blank responses correctly. 2013-05-30 19:47:58 +01:00
Iñaki Arenaza aefa1b0e3e MDL-34085 Fix the backup options names in core_course_duplicate_course
Fix the option names to match those used by the backup subsystem.
2013-05-30 17:49:07 +02:00
Damyon Wiese ae61eea349 weekly release 2.4.4+ 2013-05-30 12:09:01 +08:00
Damyon Wiese b78cd7b0c9 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-05-30 11:27:20 +08:00
AMOS bot 8574fb6f41 Automatically generated installer lang files 2013-05-30 00:38:23 +00:00
William Tam 5f11ce035d MDL-37804 mod/assign: Students no longer able to submit files after due date with Prevent late submissions turned on. 2013-05-29 13:30:41 -07:00
Damyon Wiese 7bf288a640 MDL-39317 assign: Fix for submitted filter on grading table.
Some old upgraded assignments have no timecreated column so use
a different one to check for a valid submission.
2013-05-29 14:50:48 +08:00
Ashley Holman 24a3f392ba MDL-39743 assign: Fix missing capability check for "grant extension"
Conflicts:

	mod/assign/locallib.php
2013-05-29 12:08:40 +08:00
AMOS bot 7500249a74 Automatically generated installer lang files 2013-05-29 00:39:23 +00:00
Eloy Lafuente (stronk7) 847f1dd489 Merge branch 'w22_MDL-39676_m24_whereparam' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-05-28 15:34:13 +02:00
Jason Fowler fce7fd554c MDL-38347 - Calendar - Fixing arrow output on Android devices 2013-05-28 15:26:36 +08:00
Petr Škoda d04e51bd18 MDL-39802 ignore deleted users in meta enrolments 2013-05-28 10:05:15 +08:00
Petr Škoda 6134a1f844 MDL-39802 ignore deleted users in cohort enrolments 2013-05-28 10:05:11 +08:00
Petr Škoda 5ffd03ea74 MDL-39802 ignore deleted users in category enrolments 2013-05-28 10:05:08 +08:00
Damyon Wiese 4fffc06f65 Merge branch 'w22_MDL-39802_m24_deletedusers' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-05-28 09:55:50 +08:00
AMOS bot 48f747b8da Automatically generated installer lang files 2013-05-28 00:38:16 +00:00
Eloy Lafuente (stronk7) c8b05c3e83 Merge branch 'wip-MDL-39456-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-05-28 01:02:49 +02:00
Damyon Wiese 1deb9c4d18 Merge branch 'MDL-39640-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-05-27 16:16:45 +08:00
Dan Poltawski b3ae0c52bf Merge branch 'MDL-38239-moodle24' of git://github.com/StudiUM/moodle into MOODLE_24_STABLE 2013-05-27 14:13:52 +08:00
Dan Poltawski a67482cb0e Merge branch 'w22_MDL-39688_m24_etag' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-05-27 13:43:45 +08:00
Petr Škoda cd9dab04b9 MDL-38408 validate PayPal dates and costs always 2013-05-25 22:16:45 +02:00
Petr Škoda 829b842997 MDL-39676 improve get_role_users() unit tests 2013-05-25 10:13:26 +02:00
Petr Škoda 02338685a8 MDL-39676 fix get_role_users() parameter typo 2013-05-25 09:31:29 +02:00
Petr Škoda 7c742620d2 MDL-39688 do not set Etag when sending http ranges 2013-05-25 09:12:51 +02:00
Petr Škoda 7934b786a9 MDL-39802 fix sloppy user deleting and creating in imsenterprise plugin 2013-05-24 21:18:23 +02:00
Petr Škoda 43b13e92b8 MDL-39802 add cli script for fixing of all deleted users
Use this script if something just set the user.deleted flag instead of calling the delete_user() method.
2013-05-24 21:18:22 +02:00
Damyon Wiese bf2bee168a weekly release 2.4.4+ 2013-05-24 13:25:45 +08:00
Damyon Wiese 5c9ce5a281 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-05-24 13:11:49 +08:00
Sam Hemelryk 89ad278957 MDL-39456 cachestore_file: added reference to global $CFG
By holding onto a reference of the global $CFG object we
can be sure that it isn't destroyed before we are done
with it.
This allows for caches to be used within destructors for
purposes such as delayed writes.
2013-05-24 09:51:06 +12:00
Eloy Lafuente (stronk7) a3106cf3eb Merge branch 'wip-MDL-39177-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-05-23 16:00:16 +02:00
Marina Glancy 58c28d44e0 MDL-39177 make sure we don't remove existing directories when cleaning up unzip 2013-05-23 19:19:05 +10:00
Sam Hemelryk 1fdba7b992 MDL-39673 css: removed unused chunk array search
Cherry-picked from MDL-39326
2013-05-23 13:20:28 +08:00
Sam Hemelryk f8e60e04b9 MDL-39673 css: no passed the no svg key to chunking when required
Cherry-picked from MDL-39326
2013-05-23 13:20:28 +08:00
Sam Hemelryk 713b818c40 MDL-39673 css: implemented chunking of large sheets
Cherry-picked from MDL-38441
2013-05-23 13:20:06 +08:00
AMOS bot 038fd6e78f Automatically generated installer lang files 2013-05-22 08:26:05 +00:00
Eloy Lafuente (stronk7) 4453f3255f MDL-36482 Fix slipped error, thanks Petr! 2013-05-22 04:13:53 +02:00
Eloy Lafuente (stronk7) be06282e1b Merge branch 'wip-MDL-39177-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-05-22 02:19:40 +02:00
Gilles-Philippe Leblanc e60224a32a MDL-38239 gradebook: Importing grades from a .txt file with commas for decimals causes an error 2013-05-21 14:13:16 -04:00
Marina Glancy 0733e9883a MDL-39177 Updating userid when file is overwritten 2013-05-21 10:50:52 +10:00
Eloy Lafuente (stronk7) ec01b3201d Merge branch 'MDL-36482_24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE 2013-05-21 02:28:20 +02:00
Eloy Lafuente (stronk7) 5efc195a32 Merge branch 'MDL-26120_24' of https://github.com/jacks92/moodle into MOODLE_24_STABLE 2013-05-21 00:55:27 +02:00
Eloy Lafuente (stronk7) f0697b7088 Merge branch 'MDL-31209-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-05-20 19:05:31 +02:00
Ruslan Kabalin 8a06e21c2a MDL-39761: mod_assign: Always check submission plugin status and visibility. 2013-05-20 16:45:43 +01:00
Damyon Wiese 17bca7a2b9 MDL-39412 Prevent developer warnings on upgrade from 24 to master 2013-05-20 12:42:55 +01:00
Tim Hunt c22a0ad980 MDL-39412 disabling manual graded behaviour refinements
1. Change behaviour admin settings so you can only select enabled
behaviours.
2. During the upgrade, change admin settings that might be currently set
to manual graded, so that instead they are set to deferredfeedback (if
that is available. If not, we just take the first alphabetically.)
2013-05-20 12:42:15 +01:00
Tim Hunt 617947c0b7 MDL-39412 question behaviours: hide manual graded option
The ability to set all your quiz questions to require manual grading is
an interesting possibility, but practically almost useless.

If you set that accidentally, then you are badly stuck. There is no way
to fix it after the students have answered the quiz.

Therefore, we should set the config option to hide that option from the
UI. We do this for all Moodle sites as part of the upgrade, not just for
new installs.

If any admin wants to re-enable this, they can later.
2013-05-20 12:26:06 +01:00
Dan Poltawski fad64c0d6b Merge branch 'w18_MDL-39374_m24_folderlog' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-05-20 17:58:41 +08:00
Dan Poltawski 8fedda2fc4 Merge branch 'MDL-35859_idnumber_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-05-20 16:39:04 +08:00
Damyon Wiese b27636c4db Merge branch 'MDL-38498-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-05-20 16:13:15 +08:00
Frederic Massart 0db0bcd60b MDL-38498 repository: Unit tests for repository::check_capability()
Conflicts:

	repository/tests/repository_test.php
2013-05-20 16:03:11 +08:00
Dan Poltawski 133defa353 Merge branch 'MDL-27748_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-05-20 15:47:34 +08:00
Dan Poltawski de78a8b251 Merge branch 'MDL-39728_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-05-20 15:29:13 +08:00
Troy Lee 6b3ca4dd2c MDL-36020 overview/report: fix quiz regrade session lock 2013-05-20 12:42:47 +08:00
Damyon Wiese 512f5d9086 Merge branch 'MDL-39363-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-05-20 12:14:35 +08:00
Dan Poltawski dfd948b0f0 Merge branch 'MDL-39198_M24' of git://github.com/kordan/moodle into MOODLE_24_STABLE 2013-05-20 11:48:33 +08:00
Dan Poltawski 6336c04705 Merge branch 'MDL-38369-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-05-20 10:25:52 +08:00
Tim Hunt 0377e4fbc9 MDL-27748 question: grade options should be localised.
question_bank::fraction_options should use format_float to display
decimal pionts correctly.
2013-05-19 23:45:48 +01:00
Tim Hunt 18d5870e8b MDL-39728 List all the classes in question/type/questionbase.php
This should make it easier for people to understand the type hierarchy.
2013-05-18 09:25:17 +01:00
AMOS bot d55eadbc92 Automatically generated installer lang files 2013-05-18 00:41:35 +00:00
Damyon Wiese a1972f5717 Merge branch 'MDL-28250-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-05-17 11:49:08 +08:00
Petr Škoda 0571a6856d MDL-39678 fix YUI 20130515 vulnerability 2013-05-15 22:00:10 +02:00
Petr Škoda 3c61d125c4 MDL-39374 log only real folder edits
Credit goes to Florian Zillner, thanks.
2013-05-15 21:37:25 +02:00
Dan Poltawski 8fec03bc81 MDL-28250 license: upgrade old versions of cc-nc
The url was incorectly defined in previous versions
2013-05-15 11:24:53 +01:00
Wojciech Galiszek ef5ec161ee MDL-28250 license: Correct cc-nc url 2013-05-15 11:22:56 +01:00
AMOS bot 167c498cc8 Automatically generated installer lang files 2013-05-15 00:39:22 +00:00
Frederic Massart 235aa1b1d1 MDL-39667 repository: Correct check for uniqueness of the name 2013-05-14 16:29:20 +08:00
Jerome Mouneyrac 4205983fad MDL-31209 web service error message: Indication about the service not containg the web service function is confusing 2013-05-14 15:44:32 +08:00
Marina Glancy 0408edbb13 MDL-39177 More comments about confusing files.source field 2013-05-14 17:05:40 +10:00
Marina Glancy fb69297c66 MDL-39177 Ensure files are overwritten correctly on unzip 2013-05-14 17:05:40 +10:00
Marina Glancy 3557f63112 MDL-39177 Perform all checks on draftfile area before saving the files 2013-05-14 17:05:40 +10:00
Marina Glancy bb597bbc1a MDL-39177 Remove code duplication 2013-05-14 17:05:39 +10:00
Marina Glancy 73e7cca3c2 MDL-39177 Update file in filearea only if original is present
Now when file was deleted in filemanager and new file with the same file was uploaded the references will be converted to copies exactly like UI warns in filemanager.
Also do not delete original information from draftfiles.
2013-05-14 17:05:39 +10:00
Marina Glancy 949a68d987 MDL-39177 Discard file origin when moving/renaming a file in filemanager
Created one function that handles file update to be used from both JS and nonJS filepicker
2013-05-14 17:05:39 +10:00
Marina Glancy 7a73b806c3 MDL-39177 Original info is not preserved when overwriting a file in filemanager
original file location is used by filemanager to indicate that file is a source of reference and file the list of referencing files
2013-05-14 17:05:39 +10:00
Marina Glancy eb30de6812 MDL-39177 File reference is not updated when overwriting the file 2013-05-14 17:05:38 +10:00
Marina Glancy 313b6da1b2 MDL-33719 When overwriting a file the filemanager is not refreshed 2013-05-14 17:04:34 +10:00
AMOS bot bcd8c30b45 Automatically generated installer lang files 2013-05-14 00:37:45 +00:00
Eloy Lafuente (stronk7) e038687c55 Moodle release 2.4.4 2013-05-13 12:38:41 +02:00
Eloy Lafuente (stronk7) fd6e84c5be Merge branch 'MDL-39642-en_fix-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-05-13 11:54:01 +02:00
Frederic Massart fbe50c0945 MDL-39640 repository: Prevent notice when editing an instance 2013-05-13 17:31:29 +08:00
Helen Foster 98f8613822 MDL-39642 Merge English strings from the en_fix language pack 2013-05-13 10:06:39 +02:00
Ankit Agarwal a87523d86e MDL-39363 scorm: Accept 0 as a valid score 2013-05-13 11:49:12 +08:00
Andrew Davis f34634eaf3 MDL-35859 core_grade:fixed an optional parameter call to use the array version 2013-05-13 09:53:24 +08:00
Eloy Lafuente (stronk7) 573534c441 weekly release 2.4.3+ 2013-05-10 17:34:22 +02:00
Eloy Lafuente (stronk7) 82a69ceaa0 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-05-10 17:17:57 +02:00
Eloy Lafuente (stronk7) d6d685fd71 Merge branch 'MDL-39518-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-05-10 13:17:44 +02:00
Damyon Wiese ec2d67fd80 MDL-39518: Change hardcoded string MOOCH to Moodle.net 2013-05-10 14:28:02 +08:00
Sam Hemelryk e09afa5184 Merge branch 'MDL-39602-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-05-10 16:40:59 +12:00
Sam Hemelryk a32772051f Merge branch 'MDL-39488_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-05-10 16:30:52 +12:00
Damyon Wiese aa6d532b45 MDL-39602 cache: Move the includes for default stores
Putting them inside the function get_default_stores ensures
that they will be included from anywhere that calls get_default_stores.

Conflicts:

	cache/locallib.php
2013-05-10 11:55:35 +08:00
Rossiani Wijaya 5c635f6c62 MDL-39488: Lesson Module: Fixed the potential variable overwritting for answers 2013-05-10 11:16:34 +08:00
Damyon Wiese b97e174acf Merge branch 'MDL-39535_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-05-10 10:32:19 +08:00
Frederic Massart 84d356f73c MDL-39280 form: Multiple select support disabledIf with multiple values 2013-05-10 09:36:45 +08:00
Eloy Lafuente (stronk7) eb2080240a Merge branch 'MDL-38885-24-int' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-05-10 03:17:19 +02:00
Eloy Lafuente (stronk7) d5420db934 Merge branch 'MDL-29758_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-05-10 02:54:06 +02:00
Frederic Massart d39925c792 MDL-38885 form: Fix comments and stricter unit test 2013-05-10 08:36:19 +08:00
Eloy Lafuente (stronk7) 7f92387c85 Merge branch 'MDL-39488_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-05-09 15:49:24 +02:00
Kordan 6642c7d756 MDL-39198 theme_formal_white: resized and relocated the "Add..." drop down menu of the "Add a block" pseudo block 2013-05-09 14:02:54 +02:00
Jean-Michel Vedrine da4bd770f2 MDL-29758 make Cloze question feedback display more informative
as it was in Moodle 1.9
2013-05-09 08:56:33 +02:00
Frederic Massart 9d02febe9b MDL-38885 form: Unit tests for data cleaning 2013-05-09 14:08:08 +08:00
Frederic Massart feeb14b941 MDL-38885 form: Recursively clean parameters based on right type 2013-05-09 14:06:14 +08:00
Damyon Wiese 8d7f911c96 Merge branch 'wip-MDL-39436-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-05-09 11:32:47 +08:00
Marina Glancy 17a5b5a094 MDL-39436 fixing RTL in filemanager - contextmenu icon 2013-05-09 12:46:08 +10:00
Damyon Wiese 93c5c3b02c MDL-38289: Custom profile fields - added unit test
Added a unit test to cover the case when you are fetching a custom
profile field but you are not logged in.
2013-05-09 10:29:21 +08:00
Damyon Wiese 3f999f8120 Merge branch 'MDL-38289-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-05-09 10:26:07 +08:00
AMOS bot 5f5ff2b680 Automatically generated installer lang files 2013-05-09 00:37:29 +00:00
Jerome Mouneyrac 1d79b726d7 MDL-37822 fix checkboxes that were always set to on by default 2013-05-09 02:08:11 +02:00
Jerome Mouneyrac fd469033fa MDL-37822 move the default code above the set_config to not make the code less confusing 2013-05-09 02:08:11 +02:00
Jerome Mouneyrac 54a3ce69e9 MDL-37822 Moodle send site information to a hub even though it's unchecked 2013-05-09 02:08:11 +02:00
Russell Smith cd8f8a8cb5 MDL-36482 activities block: Allow mod display without intro's 2013-05-09 09:59:41 +10:00
Eloy Lafuente (stronk7) ec00601863 Merge branch 'MDL-38487_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-05-09 00:54:54 +02:00
Jayesh Anandani c2fd66ab6e MDL-26120_24 mod_forum: use correct object 2013-05-08 23:50:58 +05:30
Juan Leyva 3cba96e344 MDL-39563 Fixing mobilecssurl is not being returned in WebService get_siteinfo 2013-05-08 12:08:06 +02:00
sam marshall e5bc3e3dde MDL-39472 MUC: Optimise cache::get_from_persist_cache 2013-05-08 10:17:58 +01:00
Damyon Wiese 781383a946 Merge branch 'MDL-31193-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-05-08 15:23:24 +08:00
Rossiani Wijaya ce4af8c4fe MDL-39488 Lesson Module: Improve code performance 2013-05-08 13:52:13 +08:00
Rossiani Wijaya a6b0fc1c93 MDL-39488 Lesson Module: Fixed PHP error matching question,
if one or more options have not been selected.
2013-05-08 13:52:13 +08:00
Joseph Rézeau eff38644cf MDL-39488 Lesson Module: Fix for "Match question throws PHP error if one or more options have not been selected "
Signed-off-by: Joseph Rézeau <moodle@rezeau.org>
2013-05-08 13:52:04 +08:00
Damyon Wiese cf0d08f661 Merge branch 'MDL-37552-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-05-08 12:43:52 +08:00
Andrew Davis 4b280ca679 MDL-37475 core_grade:fixed the handling of show totals 2013-05-08 10:35:17 +12:00
Eloy Lafuente (stronk7) b5e41dac94 Merge branch 'MDL-39452-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-05-07 22:06:27 +02:00
Mark Nielsen 0572012ef3 MDL-32301: Allow instructor custom parameters for LTI tools 2013-05-07 21:59:25 +02:00
Eloy Lafuente (stronk7) 1a77c6c263 Merge branch 'MDL-34275-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-05-07 19:14:58 +02:00
Dan Poltawski 54061d7cbf Merge branch 'MDL-36223-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-05-07 15:28:33 +01:00
Dan Poltawski 217eeccb26 Merge branch 'wip-MDL-39436-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-05-07 15:13:18 +01:00
Rajesh Taneja b6f8473cdb MDL-37245 Blog: Fixed comments. 2013-05-07 14:58:06 +01:00
Rajesh Taneja 5fde58a593 MDL-37245 Blog: Added permission check for blog comments 2013-05-07 14:58:06 +01:00
Dan Poltawski b15eea6009 Merge branch 'MDL-38500-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-05-07 11:54:24 +01:00
sam marshall 1df3b0ae24 MDL-39448 MUC: Memcache configurable key names 2013-05-07 11:44:11 +01:00
Jerome Mouneyrac 20c171f284 MDL-37552 external_format_text: missing require_once filelib.php (shared credits to Adam Fredericks for report and patch proposal) 2013-05-07 17:57:19 +08:00
Rex Lorenzo 5899b85fd6 MDL-34275 - Use default copyright license when restoring files 2013-05-07 09:10:30 +01:00
Damyon Wiese 06340a114f Merge branch 'MDL-31713_override_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-05-07 15:31:03 +08:00
Mark Nelson 7b178abfbb MDL-39535 grade: only display grade errors once 2013-05-07 15:15:07 +08:00
Andrew Davis 501afed36a MDL-31713 core_grade: added updating of grade min and max to update_final_grade() 2013-05-07 12:25:08 +08:00
Frederic Massart ac9d18dfa4 MDL-38289 condition: Do not fetch profile fields when not logged in 2013-05-07 10:19:27 +08:00
Maria Torres 242ef4590f MDL-39169: Now the question's tags are added in backup/restore options 2013-05-06 15:42:21 +01:00
Damyon Wiese 31dda933e6 Merge branch 'MDL-38315-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-05-06 22:19:55 +08:00
Damyon Wiese 9479d76a14 Merge branch 'MDL-38480_m24' of git://github.com/andreabix/moodle into MOODLE_24_STABLE 2013-05-06 21:56:05 +08:00
Dan Poltawski 8d0835e64b Merge branch 'MDL-39446_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-05-06 14:48:15 +01:00
Dan Poltawski fc7f2b1a2f Merge branch 'MDL-39473-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-05-06 14:33:02 +01:00
Dan Poltawski b73f62ef9b Merge branch 'MDL-39491-workshop-media_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-05-06 13:11:58 +01:00
Dan Poltawski 0ddf951c15 MDL-39470 cache: added missing component to get_string call 2013-05-06 12:41:44 +01:00
Damyon Wiese f23877abfb MDL-38443 Assignment: Missing permissions check on downloadall submissions 2013-05-06 10:20:49 +01:00
Damyon Wiese a20eeda845 Merge branch 'MDL-39445_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-05-06 15:17:13 +08:00
AMOS bot 0426c0dfac Automatically generated installer lang files 2013-05-06 00:40:36 +00:00
Dan Poltawski 56463941a8 Merge branch 'brokencalc_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-05-05 11:30:31 +01:00
David Mudrák fb1cb65868 MDL-39491 Fix order of Workshop submission text processing
The order of format_text() and file_rewrite_pluginfile_urls() is
important to make filters work correctly.
2013-05-03 11:51:43 +02:00
Albert Gasset 2fc7799975 MDL-39487 mod/assign: fixed ID number of grade item changing 2013-05-03 11:08:19 +02:00
Jerome Mouneyrac ef2a243345 MDL-31193 display the correct and translated token valid until date 2013-05-03 14:14:38 +08:00
Marina Glancy d927075f0c MDL-39436 fixing RTL in filemanager 2013-05-03 11:32:44 +10:00
sam marshall 0f491109ca MDL-39472 MUC: Improve parse_key performance 2013-05-02 16:00:09 +01:00
Tim Hunt 319fc5cb74 MDL-39450 course formats: add static cache to get_format_or_default
This function gets called hundreds of times on every page, often with
exactly the same input, so I added a static cache.
2013-05-02 15:48:21 +01:00
Tim Hunt d8da3c0f5b MDL-39446 calculated qtype: make answer formula input bigger
This makes it easier for teachers editing questions.
2013-05-02 15:47:54 +01:00
Tim Hunt 2ec2d00dc8 MDL-39445 get_plugin_list clean_param use is slow
get_plugin_list was calling clean_param($pluginname, PARAM_PLUGIN) a
lot (600+ times per page), and that is much slower than you would guess.
A specific function for this case, (which we then also use from
clean_param) is a performance win.
2013-05-02 15:47:28 +01:00
Tim Hunt c1288cd726 MDL-38487 qtype match restore: problem with blank ids.
As it happens, this field is useless, and has been removed from the DB
in 2.5. Therefore, we only need a work-around for stable branches.
2013-05-02 15:46:58 +01:00
Dan Poltawski 43ded6701d weekly release 2.4.3+ 2013-05-02 14:37:50 +01:00
Dan Poltawski bffe667ae0 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-05-02 14:32:19 +01:00
sam marshall 02d61e0481 MDL-39454 Accesslib: is_siteadmin is a bit slow 2013-05-02 10:47:21 +01:00
Damyon Wiese ccd8763ce2 Merge branch 'MDL-30775-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE
Conflicts:
	course/externallib.php
2013-05-02 16:21:55 +08:00
Damyon Wiese 4d69adc760 MDL-36223 Assign: User outline report grade display
Use str_long_grade for user outline report because it handles scales and
no grade.

Thanks to Jean-Daniel Descoteaux for suggesting this fix.
2013-05-02 15:46:27 +08:00
Frederic Massart a67e827913 MDL-38369 repository: Remove output before redirect 2013-05-02 12:03:56 +08:00
Andrew Davis 0f60e9fe53 MDL-32913 core_grade:made it more obvious when the gradebook is broken due to a broken calculation 2013-05-02 09:23:43 +08:00
AMOS bot f1c2a058ad Automatically generated installer lang files 2013-05-02 00:38:14 +00:00
sam marshall 442406d3ec MDL-39452 Library: html_writer::attribute unnecessary is_array check 2013-05-01 17:01:32 +01:00
Eloy Lafuente (stronk7) eb244d3b87 Merge branch 'MDL-39444_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-05-01 16:55:25 +02:00
Tim Hunt 0dc15de222 MDL-39444 get_string: remove unnecessary clean_param
This clean_param was added as part of MDL-22015. It is a good idea when
developer debug is turned on, but it showed up as a surprisingly
expensive cost in our profiling.

This change:

1. Removes the check during string_extist. This will not change
behaviour, the method returns false if the string does not exist.

2. In get_string, it only does the check if debugging is set to
DEVELOPER level.
2013-05-01 10:17:34 +01:00
Frederic Massart 7b6ed67e0a MDL-38500 repository: Instance names must be unique 2013-05-01 16:14:39 +08:00
AMOS bot 35b10e19af Automatically generated installer lang files 2013-05-01 00:39:24 +00:00
Eloy Lafuente (stronk7) d8d636dfe4 Merge branch 'wip-MDL-39432-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-05-01 01:35:10 +02:00
Sam Hemelryk be9d851c07 Merge branch 'MDL-39422-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-05-01 11:14:28 +12:00
Sam Hemelryk eecd7b4412 Merge branch 'wip-MDL-39099_M24' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE 2013-05-01 11:04:50 +12:00
Sam Hemelryk 609d262c17 Merge branch 'MDL-39414-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-05-01 11:02:05 +12:00
Sam Hemelryk 5a682ca6f9 MDL-39432 course: converted closures to lambda functions 2013-05-01 10:41:42 +12:00
Sam Hemelryk 858131c09c Merge branch 'MDL-36060-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-05-01 10:14:09 +12:00
Mark Nielsen 75156589fd MDL-36060: Remove anonymous functions in mod/lti
This was breaking eaccelerator because it doesn't
support anonymous functions.
2013-04-30 17:50:29 +01:00
Dan Poltawski 41b2eb8400 MDL-39422 mod_forms: prevent long coruse module names
To prevent ugly DB errors.
2013-04-30 17:42:03 +01:00
Dan Poltawski da7b1ecb12 MDL-39422 course: prevent module names longer 255 chars
To prevent ugly DB errors.
2013-04-30 17:42:02 +01:00
Gareth J Barnard 34877d21af MDL-39099 course_format: Allow section_summary() to be overridden. 2013-04-30 17:02:44 +01:00
Dan Poltawski fb0698f344 Merge branch 'MDL-35385_chat_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-04-30 14:08:06 +01:00
Dan Poltawski dd9b396af4 MDL-39414 portfolio: don't queue google portfolio exports
This is a bit of an ugly way of saying 'I dont support queued exports'.

The google plugins need a valid user session in order to export to the
google services, thereforce we are forcing the export to be interactive
and not queued through cron, as this wont work in the current
implmenetation.

It's possible we could add offline access to the plugins, but I don't
believe it is worth the benefit for the additional complexity.
2013-04-30 10:37:47 +01:00
Damyon Wiese a1ffe7e235 Merge branch 'MDL-39354_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-04-30 16:25:08 +08:00
Jerome Mouneyrac e2bceb5018 MDL-30775 get_course_contents: remove warnings when the section is empty 2013-04-30 14:12:25 +08:00
Damyon Wiese 6476ff5a7c Merge branch 'MDL-37966_24' of git://github.com/jonof/moodle into MOODLE_24_STABLE 2013-04-30 12:51:27 +08:00
Damyon Wiese 00f0d5c97f Merge branch 'MDL-39246_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-04-30 12:16:02 +08:00
Andrew Davis e4f7ad5d55 MDL-31713 core_grade:added a unit test to replicate a raw grade max bug 2013-04-30 09:37:23 +08:00
Andrew Davis 9ffffa5ec7 MDL-35385 mod_chat: made sure no message popups display within the chat window 2013-04-30 09:10:18 +08:00
Sam Hemelryk 7de740be35 Merge branch 'MDL-39303_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-04-30 10:00:09 +12:00
Sam Hemelryk 7e1c6bf8b4 Merge branch 'MDL-39365-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-04-30 09:36:36 +12:00
Sam Hemelryk 38fdbcf001 Merge branch 'MDL-39398-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-04-30 09:31:42 +12:00
Tim Hunt b3c1e4b131 MDL-39354 put back a bit of margin on checkboxes. 2013-04-29 19:14:56 +01:00
Dan Poltawski c0f02f7c89 Merge branch 'MDL-39378_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-04-29 17:01:03 +01:00
Brian King a7fce60867 MDL-39409 auth/cas pass web proxy settings along to phpCAS 2013-04-29 17:51:43 +02:00
Tim Hunt 70351389f7 MDL-39378 Improve s() performance.
These changes give about a 10% speed-up in this function. The significant changes are:
1. Simplify the if logic to remove unnecssary cases.
2. Dont pass default argument values to htmlspecialchars, just using the
   defaults is faster.
3. I can confirm that /i regex is faster than the equivalent regex without the i.

I also added more unit tests to test the edge cases.
2013-04-29 12:32:24 +01:00
Tim Hunt 7017ce1a30 MDL-39378 s(): fix bad hex regex 2013-04-29 12:32:20 +01:00
Frederic Massart 923f470056 MDL-39398 message: Prevent notice when sending Jabber messages
Not tracking the presence prevents a notice to be displayed during disconnect(),
where the the jabber server attempts to subscribe to $CFG->jabberusername presence.
As the server name does not include a resource identifier (stillwit@jabber.org/resource),
an explode('/') fails.
2013-04-29 19:17:58 +08:00
Dan Poltawski 3fb4ce7d58 Merge branch 'MDL-27071_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-04-29 10:27:41 +01:00
Damyon Wiese 49b18efa4e Merge branch 'MDL-39342_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-04-29 15:36:09 +08:00
Damyon Wiese 6f9d4498d2 Merge branch 'MDL-30940-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-04-29 14:06:11 +08:00
Ankit Agarwal d9ea44e5a3 MDL-39365 scorm reports: Return correct track count 2013-04-29 13:23:15 +08:00
Damyon Wiese 8927b51d23 Merge branch 'MDL-37845_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-04-29 11:46:33 +08:00
Damyon Wiese 58498bde56 Merge branch 'MDL-38440-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-04-29 11:10:35 +08:00
Eloy Lafuente (stronk7) f530a1f868 MDL-27071 Add big IN() unit tests
Let's verify how all databases perform with a big
number of parameters (10000) using IN() SQL clauses.
Both using QM and NAMED parameters.

Ideally only Oracle fails, and only it will need fixing.
2013-04-29 01:53:41 +02:00
Eloy Lafuente (stronk7) 0f987021a3 MDL-27071 Allow Oracle IN() to use > 1000 items
By using a pivoting strategy, we modify the list
of params (QM and NAMED supported) into a
subquery, so the 1000 limit in Oracle (ORA-01795)
is not thrown anymore.

Conflicts:
	lib/dml/oci_native_moodle_database.php
2013-04-29 01:53:01 +02:00
Sam Hemelryk 3e7b95b431 Merge branch 'MDL-39192_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-04-29 10:53:49 +12:00
AMOS bot 77474a85a1 Automatically generated installer lang files 2013-04-27 00:37:28 +00:00
Tim Hunt 2d57c26b8b MDL-39246 quiz timer: compute a more accurate stop time. 2013-04-26 12:29:15 +01:00
Tim Hunt 6b32bf8520 MDL-39246 JavaScript: store the time the page starts loading.
This helps synchronise time on the client side with time on the server.
If you wait until a js_init_call runs, you might have had to wait an
unknown number of seconds while all the JS loads. Therefore, we capture
the current time as soon as possible in <head>.

This is a bit like adding .jsenabled to <body> as soon as possible, to
reduce visual flicker.
2013-04-26 12:29:11 +01:00
Jerome Mouneyrac 5831c40c5c MDL-38440 WebService get_contents doesn't return the full text of labels 2013-04-26 15:59:14 +08:00
Tim Hunt 9a3d0206da MDL-37845 multichoice qtype: Fix some display issues.
1. Better handling of multi-line choices in the correct answer display.
2. Remove dangerous CSS that is no longer needed.
2013-04-25 17:21:11 +01:00
Dan Poltawski 0b8cda3b9e Merge branch 'MDL-34403-MOODLE_24_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_24_STABLE 2013-04-25 12:54:17 +01:00
Jason Platts 261aae298b MDL-39342 stop users entering too long matching answers.
Since they lead to an ugly DB error.
2013-04-25 12:00:09 +01:00
Dan Poltawski 3aba4326d4 Merge branch 'MDL-29258_24' of git://github.com/dmonllao/moodle into MOODLE_24_STABLE 2013-04-25 10:29:55 +01:00
Frederic Massart 442e59e785 MDL-39329 course: Strict standard warning during unpublishing 2013-04-25 10:11:42 +01:00
AMOS bot f368e4a731 Automatically generated installer lang files 2013-04-25 00:38:08 +00:00
Eloy Lafuente (stronk7) c6be1389b7 weekly release 2.4.3+ 2013-04-25 01:10:08 +02:00
Eloy Lafuente (stronk7) ff1e26aba4 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-04-25 01:03:38 +02:00
Eloy Lafuente (stronk7) 9c65b19cb5 Merge branch 'MDL-35364_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-04-24 23:36:55 +02:00
Justin Filip 61c9217b2a MDL-39166 auth_ldap Add triggers for user created/updated events. 2013-04-24 16:16:39 -04:00
Matt Petro 7dc22c4ef1 MDL-34403 mod quiz: fix error during enrolment 2013-04-24 14:52:33 -04:00
Dan Poltawski ce024436be Merge branch 'MDL-39283_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-04-24 14:35:09 +01:00
Dan Poltawski fdeb0d80ed Merge branch 'MDL-39219_scorm_ie7_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE 2013-04-24 09:08:49 +01:00
Ruslan Kabalin 414095a014 MDL-34939: Fix clamdscan permissions-related issues
Use --fdpass parameter that passes the file descriptor permissions to clamd,
which allows to scan given file irrespective of directory and file
permissions. Changing file permissions is not required.
2013-04-24 14:59:19 +08:00
Mark Nelson ee02d17466 MDL-39303 mod_forum: prevent user from submitting when post threshold reached 2013-04-24 14:02:52 +08:00
Ankit Agarwal ca61ed1bbe MDL-39296 scorm reports: Fixing incorrect variable name 2013-04-24 13:43:35 +08:00
Mark Nelson 709c441e89 MDL-39192 mod_forum: do not need to check the posting threshold when editing a post 2013-04-24 12:32:39 +08:00
Davo Smith 7b443f87dd MDL-39219 mod_scorm - make sure YUI JSON module is loaded 2013-04-23 18:58:49 +01:00
Dan Poltawski 2a4eeac067 Merge branch 'MDL-37784_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-04-23 13:00:39 +01:00
Dan Poltawski 5559857f9e Merge branch 'MDL-39296-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-04-23 12:50:51 +01:00
Jean-Michel Vedrine c8fbd8b0c3 MDL-39283 GIFT and XML question export broken for unsupported qtypes
Do no write any data to the export for unsupported qtypes
2013-04-23 09:52:47 +02:00
Jean-Michel Vedrine 37eadb417b MDL-37784 Adaptive no penalty display wrong penalty info
Adaptive Mode tells students they have been penalized even when set to no penalties
2013-04-23 08:39:48 +02:00
Damyon Wiese 9723842bc0 Merge branch 'MDL-34933_24_STABLE' of https://github.com/mchurchward/moodle into MOODLE_24_STABLE
Conflicts:
	lib/db/upgrade.php
	version.php
2013-04-23 12:02:47 +08:00
Ankit Agarwal 2c2544877d MDL-39296 scorm reports: Fix undefined variables in graphs report 2013-04-23 11:55:41 +08:00
David Monllao d902ffe847 MDL-29258 core_portfolio: Fixing broken default breadcrumb 2013-04-23 11:16:38 +08:00
AMOS bot d4aca421df Automatically generated installer lang files 2013-04-23 00:37:55 +00:00
Tim Hunt 79ed1fe6c6 MDL-35364 shorten text: don't return invalid HTML.
I also broke the unit tests into more, smaller, named tests, so that
when things start failing, more tests are run, and it is clearer what
the problem is.

In a couple of cases, I adjusted the $ideal lenght in the test. A
careful counting of the characters in the test input (added as comments)
suggests that the new values make for better tests.
2013-04-22 19:24:50 +01:00
Alex Leontiev 22687af45a MDL-37514 module.js: fix .js for auto quiz submission in preview mode
The issue: when we attempt the quiz as teacher/admin and timer is up,
quiz is not submitted, even though "Open attempts are submitted
automatically" is set. I've changed the javascript for a timer,
responsible for submission, removing the special behaviour in case of
preview mode. Note, that when the admin/teacher is taking a quiz, the
"preview" mode is automatically switched on.

It is a bit strange, since in the javascript there was clearly no
expressed intention to really submit quiz in preview, even when timer
hits. It does not really seem like a accidental bug, rather it looks
like some misunderstanding. Worse still, it may happen that I did not
understand the intentions of previous editor and ruined some
functionality. Because of this, and the fact that this is my first bug,
I would like to ask about the peer review! Please, see my comments in
bug discussion for the testing steps.
2013-04-22 14:10:06 +01:00
Mike Churchward d75a987e36 MDL-34933 core_message: Adding index to improve database access on message_working table. 2013-04-22 08:38:03 -04:00
Jason Platts e1267ba041 MDL-37942 Images with non-alphanumeric chars in file name won't export 2013-04-22 12:43:39 +01:00
Dan Poltawski 3fd370acde Merge branch 'w16_MDL-39141_m24_toolbar' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-04-22 12:40:44 +01:00
Damyon Wiese 499c16040d Merge branch 'MDL-39050_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-04-22 10:29:20 +08:00
AMOS bot fb1b6c4fbc Automatically generated installer lang files 2013-04-22 00:38:29 +00:00
Sam Hemelryk b920c4096c Merge branch 'MDL-39172_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-04-22 11:02:14 +12:00
Dan Poltawski 6f69ef749e Merge branch 'MDL-39219_scorm_ie7_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE
Conflicts:
	mod/scorm/module.js
2013-04-19 15:20:36 +01:00
Dan Poltawski d9a277684f Merge branch 'MDL-38361_24' of https://github.com/prateeksachan/moodle into MOODLE_24_STABLE 2013-04-19 15:11:48 +01:00
Dan Poltawski 0c60dae522 Merge branch 'wip-MDL-38565-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-04-19 13:47:44 +01:00
Tim Hunt 98ccd4fa20 MDL-39050 quiz access rules: settings.php files should work. 2013-04-19 11:52:55 +01:00
Damyon Wiese 501dd08c6b Merge branch 'MDL-39084-moodle24' of github.com:StudiUM/moodle into MOODLE_24_STABLE 2013-04-19 14:07:15 +08:00
Damyon Wiese 3054e59f40 Merge branch 'MDL-39167_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-04-19 13:30:54 +08:00
Frederic Massart 8154dd8350 MDL-30940 form: Mutiple select work correctly without any selection 2013-04-19 11:06:29 +08:00
Sam Hemelryk d7b2888810 Merge branch 'MDL-39185_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-04-19 13:53:36 +12:00
Sam Hemelryk aec4f1e956 Merge branch 'MDL-39135-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-04-19 13:48:07 +12:00
Sam Hemelryk 6318a38885 MDL-38565 cache: tidy up pre-integration
Conflicts:
	lib/db/upgrade.php
2013-04-19 10:11:38 +12:00
Sam Hemelryk 1a038ed7d9 MDL-38565 cache: improve stats gathering 2013-04-19 10:11:37 +12:00
Sam Hemelryk 312ad653e9 MDL-38565 cache: upgrade code to amend default stores
Conflicts:
	version.php
2013-04-19 10:11:37 +12:00
Sam Hemelryk 73433c0995 MDL-38565 cache: cron routine to clean up old session data 2013-04-19 10:09:55 +12:00
Sam Hemelryk 2e0b7de1b1 MDL-38565 cache: session caches now function as expected
This change is a large change to the way sessions are handled
within MUC after it was discovered that session did not function
as expected when any store other than the default session store
was being used.
As part of this change the session loader has been largely
customised in order to consolidate session data for the loader.
The unit tests have also being greatly increased to provide
better coverage for sessions.

Conflicts:
	cache/README.md
	cache/tests/cache_test.php
2013-04-19 10:09:55 +12:00
Petr Škoda 7fcffb98bb MDL-39141 fix customtoolbar notices during upgrade 2013-04-18 20:22:52 +02:00
Jean-Michel Vedrine 3b44cab37b MDL-39172 Import of .dat files is broken in blackboard_six import format 2013-04-18 17:48:08 +02:00
Dan Poltawski d298661993 weekly release 2.4.3+ 2013-04-18 12:49:40 +01:00
Davo Smith 76bb36da6f MDL-39219 mod_scorm - replace JSON with Y.JSON for IE7 compatibility 2013-04-18 12:47:54 +01:00
Dan Poltawski 0d80c1cc7a Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-04-18 12:44:04 +01:00
Dan Poltawski 8803e9c7e1 Merge branch 'MDL-39203-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-04-18 08:44:10 +01:00
Frederic Massart c32c6c1c24 MDL-39203 repository: Fixed authentication errors with Dropbox 2013-04-18 14:54:19 +08:00
prateeksachan 004f868825 MDL-38794 passed overflowdiv parameter 2013-04-17 20:36:28 +05:30
Dan Poltawski f8e976e56a Merge branch 'MDL-38824-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-04-17 14:38:06 +01:00
Tim Hunt ccbe8ca79e MDL-39167 quiz access rules: need to validate their settings.
We were missing the hook in the form validation method. We had them
everywhere else they were needed.
2013-04-17 14:26:08 +01:00
Dan Poltawski ea4841fbef Merge branch 'wip-mdl-39110-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-04-17 13:02:47 +01:00
Mark Nelson bb244cb482 MDL-39185 mod_forum: declare new object before creating member variables to prevent Strict Standards warning 2013-04-17 15:21:44 +08:00
Dan Poltawski ea99087d08 MDL-39135 assign_feedback: fix missing renderer argument
assign_user_summary expects extra profile fields

Conflicts:

	mod/assign/feedback/file/locallib.php
2013-04-17 14:05:31 +08:00
Jean-Philippe Gaudreau efc0be399e MDL-39084 grade: Capability checks are incoherent for the Course grade settings section 2013-04-16 09:28:25 -04:00
Dan Poltawski 464ab7894b Merge branch 'MDL-39080_M24' of git://github.com/kordan/moodle into MOODLE_24_STABLE 2013-04-16 12:45:01 +01:00
Daniel Neis Araujo 461ccadab0 MDL-38136: fix user_get_user_details doesn't return idnumber (thanks to Antonio Carlos Mariani) 2013-04-16 15:47:16 +08:00
Damyon Wiese 20d52c6b9c Merge branch 'wip-MDL-38055-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-04-16 14:42:20 +08:00
Sam Hemelryk d203a50c02 MDL-39127 navigation: fixed loading of categories for navbar
Conflicts:

	lib/navigationlib.php
2013-04-16 10:04:55 +08:00
Eloy Lafuente (stronk7) 1e803a3e45 Merge branch 'm24_MDL-37844' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-04-16 01:15:06 +02:00
Dan Poltawski dd79ab10b3 Merge branch 'MDL-38880_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-04-15 16:25:15 +01:00
Dan Poltawski ef9c4b6ef5 Merge branch 'MDL-39000-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-04-15 08:30:16 +01:00
Dan Poltawski 7af74e7f19 Merge branch 'MDL-38011-24' of git://github.com/srynot4sale/moodle into MOODLE_24_STABLE 2013-04-15 07:59:10 +01:00
Rajesh Taneja 1f02e1548f MDL-39110 Administration: Get role from get_roles function to display as filter label 2013-04-15 14:29:49 +08:00
Damyon Wiese 5ac9166740 Merge branch 'MDL-39068_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-04-15 14:24:02 +08:00
Damyon Wiese 25105b650a MDL-37762 navbar - fold some long lines in previous patch 2013-04-15 13:26:36 +08:00
Damyon Wiese 6bf520165b Merge branch 'wip-MDL-37762-m24' of https://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-04-15 12:37:54 +08:00
Eloy Lafuente (stronk7) 6e0b5a725d Merge branch 'MDL-39089_24' of git://github.com/dmonllao/moodle into MOODLE_24_STABLE 2013-04-15 01:57:35 +02:00
Sam Hemelryk ce520e0470 MDL-37762 navbar: shows categories for current course again 2013-04-15 11:35:23 +12:00
Paul Nicholls 7a5f3762d0 MDL-37762: Breadcrumb not showing categories on course page 2013-04-15 11:30:23 +12:00
Eloy Lafuente (stronk7) a68e6026ca MDL-39068 use cross-db text column ORDER BY
Credit goes to Valerii Kuznetsov, thanks!
2013-04-14 16:09:54 +02:00
AMOS bot 6c5a661606 Automatically generated installer lang files 2013-04-13 00:37:25 +00:00
David Monllao 42cff3b54a MDL-38089 mod_wiki: Fix incorrect links 2013-04-12 13:17:13 +08:00
Damyon Wiese aa17028b35 MDL-29877 Grades - Remove hardcoded prefix from upgrade step 2013-04-12 11:53:20 +08:00
Damyon Wiese 870f78b0fd MDL-29877 Grades - version bump for upgrade step.
And whitespace...
2013-04-12 11:41:54 +08:00
Damyon Wiese d4a997b7d7 Merge branch 'MDL-29877_bad_grade_item_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE
Conflicts:
	version.php
2013-04-12 11:36:17 +08:00
Jayesh Anandani 7ec3994f78 MDL-39054 quiz statistics: move hard-coded text to lang file 2013-04-12 11:09:24 +08:00
Dan Poltawski 5c58c88545 Merge branch 'MDL-37537-24' of git://github.com/srynot4sale/moodle into MOODLE_24_STABLE 2013-04-12 10:26:45 +08:00
Jean-Philippe Gaudreau 4d06b6a841 MDL-38637 CAS Authentication: Undefined index: QUERY_STRING when executing cron 2013-04-11 10:55:02 -04:00
Jean-Michel Vedrine 50a9a7d498 MDL-38880 Imported Cloze questions lose embedded images or other media 2013-04-11 16:29:34 +02:00
Aaron Barnes d20826dc4c MDL-37537 completion: Fix incorrect lang string reference in block 2013-04-12 01:49:35 +12:00
Aaron Barnes 3220058b14 MDL-38011 completion: Use new localised role names 2013-04-12 01:39:52 +12:00
Eloy Lafuente (stronk7) 931eff3b84 weekly release 2.4.3+ 2013-04-11 12:42:07 +02:00
Eloy Lafuente (stronk7) 112c8e8812 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-04-11 12:32:51 +02:00
Kordan 871a4102dc MDL-39080 theme_formal_white: modified "Main menu" block look to resemble the "Navigation" one 2013-04-11 11:01:20 +02:00
Dan Poltawski caf6774576 Revert "MDL-38254 Assignment Module: add avaialble message to all assignment types"
This reverts commit 079a76bb37.
2013-04-11 16:53:02 +08:00
Damyon Wiese 1b68e51133 MDL-35144 Categories - Allow editing by custom roles
Users with category:manage or course:create should be able to edit
the course/category.php page.
2013-04-11 14:07:46 +08:00
Eloy Lafuente (stronk7) 0d9a2ce8e0 Merge branch 'MDL-38525-24' of https://github.com/damyon/moodle into MOODLE_24_STABLE 2013-04-11 00:57:07 +02:00
Damyon Wiese 3133c8e4ac MDL-38525: Assignment upgrade - Error with comments for unenrolled students.
Students with comments on 'upload' assignments cause errors for the upgrade
tool if they are no longer enrolled. The solution is to allow siteadmin to
see student submissions even if the student is not currently enrolled (you
must be siteadmin to run the upgrade tool).
2013-04-10 16:17:43 +08:00
Ryan Panning 1fbe4f46ba MDL-38525: Assignment - print exception message when assignment upgrade fails.
Change to use getMessage() from the Exception class will prevent "{$a}" when
$e->error is null.
2013-04-10 16:17:33 +08:00
Dan Poltawski 4e7aef7651 Merge branch 'MDL-19072_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-04-10 14:10:51 +08:00
Dan Poltawski 5bad124045 Merge branch 'MOODLE_24_MDL35144' of git://github.com/thepurpleblob/gumoodle into MOODLE_24_STABLE 2013-04-10 12:23:53 +08:00
Dan Poltawski eda9f7bd43 Merge branch 'wip-mdl-35883-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-04-10 12:16:40 +08:00
Dan Poltawski 3a44f70e62 Merge branch 'MDL-38254_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-04-10 12:13:28 +08:00
Dan Poltawski a1ec118378 Merge branch 'MDL-38999_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-04-10 10:35:52 +08:00
Andrew Davis 166102e9b3 MDL-29877 core_grade:add some upgrade code to fix broken grade items introduced by bad restores 2013-04-10 08:28:05 +08:00
Petr Škoda 1802cb2536 MDL-38912 fix incorrect timeout reset 2013-04-10 00:07:26 +02:00
sam marshall 58404f0ab4 MDL-39000 Conditional activities: Section condition restore errors 2013-04-09 17:35:39 +01:00
Jean-Michel Vedrine 720b0f5eb0 MDL-19072 XHTML export for match questions fix for distractors 2013-04-09 11:02:27 +02:00
Dan Poltawski 892c4e1bc6 Merge branch 'wip-MDL-38442-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-04-09 15:40:19 +08:00
Aparup Banerjee 883050603c Merge branch 'w14_MDL-38798_m24_php55' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-04-09 14:31:10 +08:00
Aparup Banerjee 6b9fc96f8e Merge branch 'wip-MDL-38887-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-04-09 14:21:32 +08:00
Dan Poltawski dec2c2086f Merge branch 'MDL-38766/MOODLE_24_STABLE' of github.com:kemitix/moodle into MOODLE_24_STABLE 2013-04-09 10:38:09 +08:00
Dan Poltawski 927416c2f3 Merge branch 'wip-MDL-38541-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-04-09 09:48:05 +08:00
Marina Glancy 69778612db MDL-38541 Restrict calling rebuild_course_cache() from upgrade process
only plugins upgrade scripts can call rebuild_course_cache() and for clearing cache only.
2013-04-09 11:13:50 +10:00
AMOS bot dea31c3040 Automatically generated installer lang files 2013-04-09 00:37:50 +00:00
Eloy Lafuente (stronk7) 989a8abc44 Merge branch 'w14_MDL-38753_m24_ocicount' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-04-09 02:25:31 +02:00
Petr Škoda cfbdf4d2a0 MDL-39028 fix sqlsrv concat type conversion 2013-04-09 02:18:34 +02:00
Sam Hemelryk a95fb6895d MDL-38442 navigation: set_expansion_limit now only hides structural nodes 2013-04-09 12:06:26 +12:00
Petr Škoda 239fb7ac41 MDL-39024 fix MSSQL seek past the end of recordset 2013-04-09 01:59:43 +02:00
Petr Škoda 0816f853fa MDL-39022 fix MSSQL concat type conversion 2013-04-09 01:56:48 +02:00
Eloy Lafuente (stronk7) f6a2e02702 Merge branch 'MDL-38912_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-04-09 01:39:49 +02:00
Damyon Wiese d11c78a127 MDL-38907 Course: Remove unused CSS causing jump menu to be center aligned. 2013-04-09 01:09:50 +02:00
Eloy Lafuente (stronk7) a387569134 Merge branch 'MDL-39023-parentlang_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-04-08 16:57:47 +02:00
Howard Miller de6e4874ef MDL-35144 adding editing capabiltities to page 2013-04-08 15:47:03 +01:00
Eloy Lafuente (stronk7) eecfff557d MDL-38999 timezones: add some TZ/stamps know to be problematic to tests. 2013-04-08 16:32:28 +02:00
Eloy Lafuente (stronk7) 8874028e9e MDL-38999 timezones: fixed timezone information. 2013-04-08 16:32:19 +02:00
sam marshall cfd41befd5 MDL-38824 Activity completion: Automatic completion quotes not escaped 2013-04-08 14:53:38 +01:00
David Mudrák 5c0877079c MDL-39023 Make get_language_dependencies() aware of circular dependency risk
The patch reimplements the core_string_manager::get_language_dependencies()
so that potentially mis-configured language packs with circular
dependencies or self dependency do not make the site unavailable.
Unit tests for the expected behaviour are added.
2013-04-08 14:26:23 +02:00
Petr Škoda b795853f5b MDL-38753 tweak count SQL to make stupid Oracle happy 2013-04-08 12:34:46 +02:00
Damyon Wiese 0ab296bd10 Merge branch 'MDL-38452-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-04-08 14:08:24 +08:00
Dan Poltawski 99a66861b7 Merge branch 'MDL-37676_24_STABLE' of git://github.com/appalachianstate/moodle into MOODLE_24_STABLE 2013-04-08 14:07:04 +08:00
Tim Lock 0852e56af6 MDL-35868: quiz: Use correct attemptnumber when a last attempt exists. 2013-04-08 11:09:42 +08:00
Dan Poltawski 3a509e1a6a Merge branch 'wip-MDL-38701-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-04-08 10:23:21 +08:00
Marina Glancy 4ea004cf9e MDL-38701 Added missing require_once() before calling course_get_format 2013-04-08 11:37:33 +10:00
Marina Glancy 11799954dc MDL-38887 dim hidden branches in navigation expanded via AJAX requests 2013-04-08 11:36:15 +10:00
AMOS bot ddc9ca757d Automatically generated installer lang files 2013-04-08 00:36:05 +00:00
Matteo Scaramuccia 18c3001eb4 MDL-35840 SCORM TOC: fixed a typo, improvements on getting the focus 2013-04-08 09:45:07 +12:00
Dan Marsden 9e8c6c7bff MDL-37844 SCORM: fix js error and highlight selected node in TOC. 2013-04-08 09:45:00 +12:00
Petr Škoda 5364ee6b09 MDL-38798 remove unused property which was giving notices in PHP 5.5beta 2013-04-07 11:53:50 +02:00
AMOS bot 7ecf4f1360 Automatically generated installer lang files 2013-04-07 00:37:25 +00:00
Tim Hunt 1e659c865a MDL-38912 prevent time-outs during unit tests. 2013-04-05 18:39:20 +01:00
Andrea Bicciolo 704e2ecaaa MDL-38480_m24 Fix for messy usage of language strings in block course overview 2013-04-05 12:25:04 +02:00
Dan Poltawski bd11908373 weekly release 2.4.3+ 2013-04-05 18:01:38 +08:00
Dan Poltawski 76593ae5e6 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-04-05 17:52:35 +08:00
Paul Campbell 3519df7631 MDL-38766 wiki2.0: fix redirects
Signed-off-by: Paul Campbell <pcampbell@carnegiecollege.ac.uk>
2013-04-05 09:38:30 +01:00
Rossiani Wijaya 079a76bb37 MDL-38254 Assignment Module: add avaialble message to all assignment types 2013-04-04 11:08:57 +08:00
AMOS bot 362add0f4f Automatically generated installer lang files 2013-04-04 00:36:09 +00:00
Eloy Lafuente (stronk7) 3a5cb521c9 Merge branch 'MDL-38112-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-04-04 00:57:59 +02:00
Dan Poltawski b7f0af199d Merge branch 'MDL-38657_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-04-03 16:51:13 +08:00
Aparup Banerjee 20a98af525 Merge branch 'MDL-38809_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-04-03 16:33:00 +08:00
AMOS bot 5ac884c9a3 Automatically generated installer lang files 2013-04-03 00:35:46 +00:00
Matteo Scaramuccia 5c2a800bfa MDL-38545 Reports: PHP Strict Standards error in graph.php 2013-04-02 22:12:47 +02:00
Damyon Wiese 70a9bf863b MDL-38840 Statslib - Fix failing unit tests on ci server (DST change) 2013-04-02 16:49:21 +02:00
Rajesh Taneja 819ad10fa3 MDL-35883 Accessibility: Added title for login as user link in header and footer for accessibility 2013-04-02 16:00:29 +08:00
Rajesh Taneja 9c14f808ed MDL-35883 Accessibility: Added title for user link in header and footer for accessibility 2013-04-02 16:00:29 +08:00
Dan Poltawski b2c04be9c5 MDL-35603 backup: fix coding style issues
Conflicts:
	backup/util/ui/restore_ui_components.php
2013-04-02 14:34:29 +08:00
Dan Poltawski ecfa79b801 Merge branch 'MDL-35603_24' of git://github.com/rlorenzo/moodle into MOODLE_24_STABLE 2013-04-02 14:26:47 +08:00
Damyon Wiese 0c61dbecf7 Merge branch 'MDL-38713-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-04-02 13:19:51 +08:00
Damyon Wiese f034c23b0a Merge branch 'MDL-38700-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-04-02 13:11:13 +08:00
Dan Poltawski 536780c5de Merge branch 'MDL-38702_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-04-02 10:04:47 +08:00
Mary Evans f246415143 MDL-38657 theme_base: Fixes misalignment issue in User Report page. 2013-03-31 02:30:57 +01:00
prateeksachan e8803d5293 MDL-38361: Fixed typos in mod/assign/locallib.php 2013-03-30 23:42:25 +05:30
Tim Hunt 56054396c4 MDL-38809 quiz manual grading: delete expensive unnecssary code. 2013-03-30 17:27:16 +00:00
Rex Lorenzo 1936dbe341 MDL-35603 - Backup - Course import/restore max results
* Unified UI for import and restore course search
2013-03-28 15:24:33 -07:00
Damyon Wiese fe33d24cab weekly release 2.4.3+ 2013-03-28 14:48:58 +08:00
Damyon Wiese 994bc95e2a Merge branch 'MDL-25631_m24' of git://github.com/merrill-oakland/moodle into MOODLE_24_STABLE 2013-03-28 10:41:20 +08:00
Jonathon Fowler bbf86cd4f3 MDL-37966 Assignment: put upgraded modules where the originals were 2013-03-27 12:52:36 +10:00
Aparup Banerjee 843093789d Merge branch 'MDL-38659_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-03-27 10:38:48 +08:00
Eloy Lafuente (stronk7) 821c60617e Merge branch 'MDL-38557_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-26 23:41:31 +01:00
Eloy Lafuente (stronk7) 673ff9d82e Merge branch 'MDL-38647_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-26 23:22:53 +01:00
Eric Merrill 59c5f4cd35 MDL-25631 backup Decoupling legacy files from course config settigs. If they are present, they will be restored. 2013-03-26 17:02:51 -04:00
Petr Škoda 0fe975bbf2 MDL-37782 reset DB after each failed database test 2013-03-26 16:11:08 +01:00
Eloy Lafuente (stronk7) 25ce2cfbeb MDL-38659 environment: fix incorrect feedback messages 2013-03-26 15:36:37 +01:00
Dan Poltawski 85c361d3ea MDL-38713 course: correctly set visibleold on mod creation
Remove uncessary set of visibleold in the form
2013-03-26 16:21:16 +08:00
Damyon Wiese 48bf094142 Merge branch 'm24_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-03-26 16:02:28 +08:00
Damyon Wiese cacbbb46ce MDL-38468 Filelib: Fix ordering of new mimetypes 2013-03-26 15:25:56 +08:00
Damyon Wiese 11ba99ea72 Merge branch 'm24_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-03-26 15:23:57 +08:00
Charles Fulton 914624d51d MDL-38700 course: only change visibility if a module moves to a different section 2013-03-26 15:00:26 +08:00
Dan Poltawski ba97fbe855 MDL-38700 course: add tests for moveto_module()
* Test visibility when moving around hidden sections
* Test for visiblity changes when moving around in the same sections.
2013-03-26 15:00:26 +08:00
Damyon Wiese fe33e80077 Merge branch 'wip-MDL-35875-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-03-26 14:48:40 +08:00
Damyon Wiese 06b3c7e961 Merge branch 'MDL-30438_b_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-03-26 14:36:28 +08:00
Damyon Wiese a9cb8b73c8 Merge branch 'MDL-38380_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-03-26 13:24:47 +08:00
Dan Poltawski d0732e589f MDL-38112 - update to the ISO list of countries
According to ISO 3166-1
2013-03-26 10:46:19 +08:00
Damyon Wiese 0e91ef2d66 Merge branch 'wip-mdl-36882-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-03-26 10:42:18 +08:00
Rajesh Taneja 6299d9a1a7 MDL-36882 course: Added aria-live for manual completion
This is required so that assistive technologies can notify user about change on completion status
2013-03-26 10:26:28 +08:00
Damyon Wiese a5a3618c66 Merge branch 'wip-mdl-36125-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-03-26 10:13:38 +08:00
Mary Evans db5cbad673 MDL-38702 theme_mymobile: Replaced missing theme setting to disable CSS Optimiser.
The missing setting was a regression casued by MDL-33357.
2013-03-26 00:50:29 +00:00
Damyon Wiese 33c1b04c2a Merge branch 'MDL-38668_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-03-25 15:51:29 +08:00
Jason Fowler b055a241b8 MDL-35875 - Accessibility - Remove empty summary attribute for user information table in view user's profile 2013-03-25 10:30:31 +08:00
Damyon Wiese eb6f546b1b MDL-37033 Environment - Fix indenting in XML 2013-03-25 09:26:11 +08:00
Damyon Wiese 9fcdee8692 Merge branch 'MDL-37033_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-03-25 09:22:19 +08:00
Eloy Lafuente (stronk7) 864a5cfd2f Merge branch 'MDL-38658-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-03-24 23:40:55 +01:00
Eloy Lafuente (stronk7) d2db86448e Merge branch 'MDL-36927-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-03-24 23:39:22 +01:00
Matteo Scaramuccia 417d004cad MDL-38336 SCORM: incorrect TOC bulding when 'Display course structure' is on 2013-03-24 11:06:54 +01:00
Eloy Lafuente (stronk7) 3adedb6f00 MDL-38668 timezones: update to tzdata 2013b 2013-03-24 10:45:49 +01:00
Andrew Robert Nicols 65f302ac4d MDL-38658 JavaScript: Correct fullpath for dndupload definition 2013-03-23 22:07:35 +00:00
Matteo Scaramuccia 9992ee729e MDL-38468 Files API: fixed the support for MTHML (MIME HTML: web page archive) files 2013-03-23 12:26:03 +01:00
Eloy Lafuente (stronk7) d9e93de2eb MDL-37033 environment: add 2.5 brach details 2013-03-22 18:41:23 +01:00
Fred Woolard 7a257bb0f7 MDL-37676 Use course grade category if mapping fails for manual grade items 2013-03-22 08:27:21 -04:00
Tim Hunt 37b6904b8c MDL-38647 quiz review question issues
1. Page URL should contain 'step=0' if necessary, but not 'step='.
2. Review specific step was not using the right display options.
2013-03-22 11:17:48 +00:00
Tim Hunt 519c20adb8 MDL-38557 quiz manual grading should check mod/quiz:grade 2013-03-22 10:19:47 +00:00
Damyon Wiese b9ef2c9607 weekly release 2.4.3+ 2013-03-22 13:52:56 +08:00
Damyon Wiese 4b5c4e2637 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-03-22 13:35:55 +08:00
Rajesh Taneja 6d1e592c2a MDL-36125 course: Added aria-describedby for editing activity title 2013-03-22 12:42:04 +08:00
AMOS bot 526bcd44cd Automatically generated installer lang files 2013-03-21 00:37:30 +00:00
Eloy Lafuente (stronk7) 6ef445a515 Merge branch 'MDL-38035-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-03-20 17:09:22 +01:00
sam marshall 50701d1e89 MDL-38035 Conditional availability: Support multilang custom user fields 2013-03-20 15:58:59 +00:00
David Monllao 3bb4d9b400 MDL-38364 phpunit: PHPUnit autoload uses capital A 2013-03-20 16:06:10 +08:00
Ankit Agarwal 9df92fcacb MDL-36927 Reports: Page layout is not defined in course/recent.php 2013-03-20 14:13:26 +08:00
Damyon Wiese 3ab41b9779 Merge branch 'wip-MDL-38387-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-03-20 13:46:59 +08:00
Frederic Massart 6c402aa73d MDL-38452 repositories: User logged in as have access to non-private repositories 2013-03-20 13:32:43 +08:00
Damyon Wiese 6e2f8aa9f1 MDL-38373 Auth - Additional strict warning fix for radius authentication 2013-03-20 12:37:39 +08:00
Damyon Wiese 81c8a28c72 Merge branch 'MDL-38373_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-03-20 12:34:26 +08:00
Sam Hemelryk fb3ff98014 MDL-38055 course: fixed double encoding of title properties
Conflicts:
	lib/navigationlib.php
2013-03-20 17:28:43 +13:00
Sam Hemelryk bf07f4e212 MDL-38387 cache: removed call to plugins API from cache API 2013-03-20 16:07:53 +13:00
Sam Hemelryk 7588627b8b MDL-38350 cache: fixed issue with siteidentifier === false 2013-03-20 16:07:53 +13:00
AMOS bot 9427beaf77 Automatically generated installer lang files 2013-03-20 00:36:55 +00:00
Eloy Lafuente (stronk7) 6407ca6927 Revert "MDL-38515 JavaScript: Correct module dependencies for core_filepicker"
This reverts commit 573571d727.
2013-03-20 00:56:41 +01:00
Eloy Lafuente (stronk7) 8bcca79594 Merge branch 'MDL-38490_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-20 00:43:43 +01:00
Eloy Lafuente (stronk7) e285f93242 Merge branch 'MDL-38370-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-03-20 00:32:02 +01:00
Eloy Lafuente (stronk7) d4aac84fbe Merge branch 'w12_MDL-38364_m24_phpunitloading' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-03-20 00:19:57 +01:00
Eloy Lafuente (stronk7) 7765766512 MDL-38035 api: doc get_condition_user_fields() new param. 2013-03-20 00:06:28 +01:00
Eloy Lafuente (stronk7) 87342f4cfb Merge branch 'MDL-38035-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-03-19 23:57:51 +01:00
Eloy Lafuente (stronk7) e4095955ed Merge branch 'MDL-37664-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE 2013-03-19 23:37:31 +01:00
Eloy Lafuente (stronk7) 5efd762f7a Merge branch 'MDL-38424_m24' of git://github.com/kordan/moodle into MOODLE_24_STABLE 2013-03-19 23:18:51 +01:00
Eloy Lafuente (stronk7) 581e9db8e0 Merge branch 'MDL-38395_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-19 23:07:24 +01:00
Eloy Lafuente (stronk7) 745a0dc660 Merge branch 'MDL-38460_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-03-19 21:14:55 +01:00
Eloy Lafuente (stronk7) dc122b32b3 Merge branch 'wip-MDL-38422_M24' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE 2013-03-19 21:12:53 +01:00
Eloy Lafuente (stronk7) 82f27d5bbd Merge branch 'MDL-38363_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-19 21:07:08 +01:00
Eloy Lafuente (stronk7) bc353318b2 Merge branch 'MDL-38355_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-19 21:01:10 +01:00
Eloy Lafuente (stronk7) 4b6963eb6d Merge branch 'MDL-38388_24' of git://github.com/jonof/moodle into MOODLE_24_STABLE 2013-03-19 19:03:21 +01:00
Eloy Lafuente (stronk7) 60d7878a3a Merge branch 'MDL-38412_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-19 18:22:53 +01:00
Eloy Lafuente (stronk7) f0f28e3c3b Merge branch 'w12_MDL-38329_m24_webkit' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-03-19 18:17:35 +01:00
Petr Škoda 8cdc6bfc4f MDL-38180 do not add links for enrol and other users candidates 2013-03-19 18:03:13 +01:00
Petr Škoda 15d001fc28 MDL-38202 fix loginas logout redirection 2013-03-19 16:53:57 +01:00
Eloy Lafuente (stronk7) 59faf92e1f Merge branch 'MDL-38542_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-19 16:49:23 +01:00
Eloy Lafuente (stronk7) 332e3c0153 Merge branch 'MDL-38444_24' of https://github.com/ppichet/moodle into MOODLE_24_STABLE 2013-03-19 16:35:30 +01:00
Tim Hunt 708c1b7fc8 MDL-38542 shortanswer qtype: was broken for responses of '0'.
This was a regression caused by MDL-37157 & MDL-37746.
2013-03-19 13:55:41 +00:00
Eloy Lafuente (stronk7) 38b7d50139 Merge branch 'MDL-38515-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-03-19 12:58:07 +01:00
Eloy Lafuente (stronk7) f6a52da112 Merge branch 'MDL-38397_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-19 12:28:52 +01:00
Eloy Lafuente (stronk7) d4ce77f624 Merge branch 'wip-mdl-38431-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-03-19 10:24:39 +01:00
Eloy Lafuente (stronk7) 834a0c1a55 Merge branch 'MDL-36872-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-03-19 09:37:24 +01:00
Damyon Wiese f402d3225f Merge branch 'w12_MDL-38320_m24_logininfo' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-03-19 15:02:23 +08:00
Damyon Wiese 0cb081f51f Merge branch 'MDL-38456-mdeploy-paths_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-03-19 14:12:23 +08:00
AMOS bot 00e2eb15a6 Automatically generated installer lang files 2013-03-19 00:36:22 +00:00
Damyon Wiese 147400d846 Merge branch 'MDL-38215-workshop-oracle_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-03-18 11:45:53 +08:00
Petr Škoda 54aabc8200 MDL-38320 fix role name display when roles switched 2013-03-17 21:16:33 +01:00
Petr Škoda 92ce0a63cb MDL-38329 use proper plugin name for the webkit lists workaround
Credit goes to Mauno Korpelainen, thanks.
2013-03-17 21:03:22 +01:00
Petr Škoda 6bc755274a MDL-38364 rework PHPUnit autoloading
This is related to BC incompatibility introduced in https://github.com/sebastianbergmann/phpunit/issues/848
2013-03-17 19:56:15 +01:00
Andrew Robert Nicols 573571d727 MDL-38515 JavaScript: Correct module dependencies for core_filepicker 2013-03-17 16:51:16 +00:00
ppichet 1e9f48c9bc MDL-38444 Saving datasets from edit_calculatedsimple_form.php
Bypassing the 3 steps savequestion() of calculated.
2013-03-17 00:45:00 -04:00
Eloy Lafuente (stronk7) 0713cc584d MDL-25655 glossary: non full searches now working.
In the process of updting the module from 1.9 to
2.0 the (non) full search feature was lost without notice.

This restitutes it with the same behavior present in 1.9:

- fullsearch disabled: look into concepts and aliases.
- fullsearch enabled (default): look also into definitions.
2013-03-16 18:08:51 +01:00
Eloy Lafuente (stronk7) ee40219d6a MDL-38373 Use correct PEAR->loadExtension()
Current use is wrong (static) and leads to strict standards notice.
2013-03-16 11:43:41 +01:00
Mary Evans 2ff2d96916 MDL-38380 theme_magazine: Fixed typo in style/core.css. 2013-03-16 01:42:16 +00:00
Tim Hunt d1fa204c0f MDL-38412 fix quiz reports group mode weirdness.
Moodle currently selected group uses the session. This can cause weird
effects when you have two tabs open. This is particularly weird in the
quiz reports, where some actions like delete attempt are checked against
the currently selected group.

The solution is to put the currently selected group into the URL for all
actions like delete/regrade attempt, regrade all attempts, download and
sort table.
2013-03-15 12:02:11 +00:00
Tim Hunt 7b62eec877 MDL-38363 qtype_calculated. Fix warnings. 2013-03-15 11:23:33 +00:00
Eloy Lafuente (stronk7) 29f8c0937a Moodle release 2.4.3 2013-03-15 12:03:30 +01:00
Eloy Lafuente (stronk7) 01d6191b81 weekly release 2.4.2+ 2013-03-15 09:50:08 +01:00
Tim Hunt ddd11cbf0b MDL-38395 question categories: wrong URLs after editing.
The problem was that array1 + array2 takes the values from
array1 when a key appears in both places.

While working on this area, I updated it to use html_writer.
2013-03-15 08:15:13 +00:00
Damyon Wiese cd824e74d8 Merge branch 'MDL-38474-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-03-15 13:06:04 +08:00
Frederic Massart abf0c9fc9e MDL-38474 repository: Undefined variable 2013-03-15 13:00:35 +08:00
Damyon Wiese 54c0c9e58e Merge branch 'MDL-38474-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-03-15 10:50:47 +08:00
Frederic Massart 7c78db604b MDL-38474 repository: Correct context when checking permissions to access a repository 2013-03-15 10:04:50 +08:00
Jonathon Fowler ffbc0d6f2f MDL-38388 qformat_blackboard_six: fix question image import
This works on the expectation that the returned array from readdata()
is opaque and will be fed directly into readquestions() since
filebase is different per file and needs to be set up appropriately
before each parse.
2013-03-15 09:09:54 +10:00
Tim Hunt 16442e5cfd MDL-38355 qtype_multianswer: input boxes too big in Russian.
... and any other language where the characters take multiple
bytes in UTF-8.

This fix was worked out by Dušan Ristić. I am just committing it.
2013-03-14 22:26:40 +00:00
Tim Hunt 3d8c5cb044 MDL-38397 question editing: only validate default mark if present.
Most qtypes have that field, but not all. multianswer is an example in core.
Also some contrib qtypes.
2013-03-14 22:13:44 +00:00
Tim Hunt fe9f42de4d MDL-38490 question preview, variant is attempt (not display) option 2013-03-14 17:22:32 +00:00
Eloy Lafuente (stronk7) a812924762 weekly release 2.4.2+ 2013-03-14 15:48:11 +01:00
Damyon Wiese ea8393591f Merge branch 'wip-MDL-38303-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-03-14 15:32:34 +08:00
Ankit Agarwal 5c18a83649 MDL-36872 reports: Fixing incorrect sorting of recent activites by timestamp 2013-03-14 14:45:24 +08:00
Aparup Banerjee ecbf8aee6e Merge branch 'MDL-38356-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-03-14 11:03:54 +08:00
Aparup Banerjee 8513176415 Revert "Merge branch 'MDL-38356-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE"
This reverts commit aebfad51a0, reversing
changes made to 484dcc9b90.
2013-03-14 11:02:27 +08:00
Mary Evans b7295e8e5d MDL-38460 theme_mymobile: Fixes resources folders to show properly on first access. 2013-03-14 01:20:18 +00:00
Eloy Lafuente (stronk7) 6b2510f4c7 Revert "Merge branch 'MDL-34818_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE"
This reverts commit 6a34b93223, reversing
changes made to c9b9abc090.
2013-03-14 00:24:07 +01:00
Andrew Robert Nicols 4969eb20ac MDL-38356 JavaScript: Correct check for currentform 2013-03-13 18:22:00 +00:00
Brent Boghosian db23afadac MDL-38356 Forms: Check that the form exists before applying changechecker
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
2013-03-13 18:08:33 +00:00
David Mudrák e8c660394d MDL-38215 Fix cross-db support in workshop SQL queries
The $sql used in these methods may contain multiple parts glued
together by the UNION operator. Simply appending the ORDER BY statement
to the end of the query does not work in all DBs (failure reported at
Oracle). Following the pattern already applied in MDL-30051, we wrap the
SQL into yet another SELECT statement and perform ordering there.

Credit goes to Sara Cenni for suggesting the fix.
2013-03-13 15:04:37 +01:00
David Mudrák a1ba9e89d9 MDL-38456 Allow colons in paths passed to mdeploy.php utility
The input_manager now accepts colons (:) in TYPE_PATH options, but only
in cases where the colon is used as a part of Windows drive labels, as
in C:\apache.
2013-03-13 12:14:19 +01:00
Ankit Agarwal fc427a8cbc MDL-38370 scorm: Fixing strict standard errors in outline report 2013-03-13 16:02:38 +08:00
Eloy Lafuente (stronk7) eeb0efd7d8 Merge branch 'MDL-38268-m24' of https://github.com/jfilip/moodle into MOODLE_24_STABLE 2013-03-13 01:14:38 +01:00
Eloy Lafuente (stronk7) ddaf467f31 Merge branch 'MDL-30166-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-03-13 01:09:31 +01:00
Eloy Lafuente (stronk7) b3a5ae03d0 Merge branch 'wip-mdl-38332-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-03-12 22:53:16 +01:00
Shamim Rezaie d4677b4059 MDL-37664 course: Fix drag & drop RTL mode issue 2013-03-12 15:47:23 +00:00
sam marshall 0e79c3ee74 MDL-38035 Activity settings: Support multilang names for custom user fields 2013-03-12 15:39:38 +00:00
Kordan f1820fdd6a MDL-38424 theme_formal_white: added suggestions to css custom styles description 2013-03-12 13:49:07 +01:00
Damyon Wiese 2b2d3244cd Merge branch 'MDL-34011_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-03-12 16:04:54 +08:00
Aparup Banerjee 86070a3ed9 Merge branch 'MDL-35615_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-03-12 15:50:39 +08:00
Rossiani Wijaya 7a28bba4d3 MDL-34011 Lesson module - short answer question: fixed student attempt statistics 2013-03-12 15:02:37 +08:00
Damyon Wiese a8a71bbad3 MDL-34011 Lesson module: fixed incorrect display of student attempt for short answer question 2013-03-12 15:02:26 +08:00
Aparup Banerjee aebfad51a0 Merge branch 'MDL-38356-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-03-12 13:37:45 +08:00
Aparup Banerjee 484dcc9b90 Merge branch 'MDL-35582_message_labels_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-03-12 13:27:19 +08:00
Rajesh Taneja 967bfb4334 MDL-38431 comment: Pass formated comment created time to JS and print_comment 2013-03-12 12:38:46 +08:00
Aparup Banerjee 46640b7e53 Merge branch 'MDL-38386-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
Conflicts:
	version.php - 2012120302.01 in db/upgrade.php too
2013-03-12 11:35:03 +08:00
Damyon Wiese a22f7cb864 Merge branch 'MDL-37771-M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-03-12 11:22:16 +08:00
Ankit Agarwal 13bb9cee30 MDL-30166 Remove deprecated %fullname% from core
Thanks to Matheus Kautzmann for the initial patch.
2013-03-12 11:16:11 +08:00
Eloy Lafuente (stronk7) 2f286d7658 Merge branch 'MDL-34774_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-03-12 00:55:05 +01:00
Eloy Lafuente (stronk7) 7b8110d4b0 Merge branch 'MDL-38337_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-12 00:25:13 +01:00
Eloy Lafuente (stronk7) 6a34b93223 Merge branch 'MDL-34818_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-03-12 00:22:27 +01:00
Eloy Lafuente (stronk7) c9b9abc090 Merge branch 'wip_24_mdl-38262' of git://github.com/iarenaza/moodle into MOODLE_24_STABLE 2013-03-12 00:05:02 +01:00
Gareth J Barnard bc8e5bce36 MDL-38422 theme_mymobile: TinyMCE editor difficulties. 2013-03-11 18:07:56 +00:00
Rossiani Wijaya 4ee9853a78 MDL-30438 Lesson Module: fixed input text editable capability after checking/unchecking unmask option for all browsers except IE8 or lower 2013-03-11 15:43:35 +08:00
Damyon Wiese ff28c81cb6 Merge branch 'wip-MDL-34713-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-03-11 13:47:22 +08:00
Rossiani Wijaya b3af55b363 MDL-30438 Lesson Module: improve password field to disabled when password protect is set to no. 2013-03-11 13:18:56 +08:00
Damyon Wiese 494c554bf3 Merge branch 'MDL-33424_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-03-11 13:18:04 +08:00
Rajesh Taneja 58c8b68c3c MDL-38332 Users: Browse list of users should not contain guest user record 2013-03-11 10:18:03 +08:00
Mary Evans 5d61ac8012 MDL-34818 theme_mymobile: Fixes resources folders to show properly on first access. 2013-03-11 00:18:44 +00:00
Mary Evans 89bcfc4aac MDL-37771 themes: Fixed table header color in Question Bank window block.
modified: theme/anomaly/style/general.css
modified: theme/base/style/question.css
modified: theme/magazine/style/core.css
modified: theme/serenity/style/core.css
modified: theme/splash/style/blue.css
modified: theme/splash/style/green.css
modified: theme/splash/style/orange.css
modified: theme/splash/style/pagelayout.css
modified: theme/splash/style/red.css
2013-03-10 19:04:43 +00:00
Sam Hemelryk 95d3b8e1f2 MDL-38387 cache: fixed inifinite initialisation loop with site id 2013-03-10 11:31:58 +13:00
Sam Hemelryk d55276ee51 MDL-38303 cache: fixed purging of session cache when switching users 2013-03-10 11:31:38 +13:00
Jean-Michel Vedrine c16e466de2 MDL-33424 Images missing when restoring a 1.9 backup 2013-03-09 13:41:03 +01:00
Tim Hunt 0e4511877e MDL-38337 quiz: respect maximum grade config for new quizzes. 2013-03-08 21:33:03 +00:00
Eloy Lafuente (stronk7) 5c8860f735 Moodle release 2.4.2 2013-03-08 20:02:48 +01:00
Jason Fowler 586fff6894 MDL-34713 - Blog - Fixing undefined index for blog menu block 2013-03-08 14:13:07 +08:00
Lalit Khattar 9dc58f9b26 MDL-34724 Accessibility: At the bottom of Messaging settings page put the label of the checkboxes in <label> 2013-03-08 10:01:45 +08:00
Damyon Wiese 0d9c836ab2 MDL-38386 Courselib: Make sure the upgrade step for MDL-38173 always runs 2013-03-08 09:19:31 +08:00
Eloy Lafuente (stronk7) db0175400b MDL-38378 Take rid of harcoded db prefix and bump. 2013-03-08 00:24:55 +01:00
Eloy Lafuente (stronk7) 5dd43226a0 weekly release 2.4.1+ 2013-03-07 16:23:57 +01:00
Eloy Lafuente (stronk7) 20cb544cdd Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-03-07 16:16:40 +01:00
Eloy Lafuente (stronk7) 5ac03639ca MDL-38345 Prevent undefined CFG leading to DB error.
It seems that MDL-32975, no matter a version bump
was done, leads to the $CFG->navsortmycoursessort
setting undefined sometimes. And that ends with an error
visiting the /my page. This just ensures a safe default
if the setting is undefined/empty.
2013-03-07 10:23:46 +01:00
Frederic Massart 67c858414a MDL-37852 repository: Admins can't access user instances settings 2013-03-07 16:37:05 +08:00
Frederic Massart e1be68f296 MDL-37852 repository: Prevent user from deleting a site-wide instance 2013-03-07 14:35:31 +08:00
Rossiani Wijaya ebfdc35f2a MDL-37411 Note Module: additional patch to fixed undefined property for stable branches 2013-03-07 11:09:05 +08:00
Damyon Wiese d6d470ae15 Revert "MDL-38055 block_courseoverview: fixed formatting of course fullname"
This reverts commit 6013e16b25.
This reverts commit 498ee7d44b.

This issue has failed testing and will be delayed.
2013-03-07 10:29:47 +08:00
Brent Boghosian 057f509fad MDL-38356 Forms: Check that the form exists before applying changechecker
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
2013-03-06 21:47:15 +00:00
Eloy Lafuente (stronk7) f73c7d410b Merge branch 'MDL-38173-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-03-06 17:55:19 +01:00
Eloy Lafuente (stronk7) f4b9cea5fc Merge branch 'MDL-38352-en_fix_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-03-06 17:28:19 +01:00
Damyon Wiese 4d25fc3208 MDL-38173 Course: Fix DB from regression when adding a (new) course module to a section. 2013-03-06 23:58:36 +08:00
Helen Foster 3658d00c2b MDL-38352 Merge English strings from the en_fix language pack 2013-03-06 16:55:00 +01:00
Tim Hunt fdbb450f5f MDL-38311 question manual grading: comment fixes. 2013-03-06 10:37:16 +01:00
Sam Hemelryk 3d6fb349eb MDL-32975 navigation: fixed error when viewing my with no enrolments 2013-03-06 14:35:30 +13:00
AMOS bot 3cc745a16c Automatically generated installer lang files 2013-03-06 00:36:56 +00:00
Eloy Lafuente (stronk7) ef01018a00 Merge branch 'MDL-38311_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-06 01:24:11 +01:00
Rossiani Wijaya bc144ebbe0 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:39:41 +13:00
sam marshall cc59085352 MDL-38315 Completion: Bugs with 'locked' status in activity form 2013-03-05 16:34:38 +00:00
Justin Filip 3000c6bde7 MDL-38268 files: Must be explicit about switching cURL request method from HEAD to GET. 2013-03-05 11:30:16 -05:00
Eloy Lafuente (stronk7) add7b5a250 Merge branch 'MDL-38119_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-05 16:45:42 +01:00
Tim Hunt 1707b741b6 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:56:12 +00:00
Aparup Banerjee 57b0cfaaf1 Merge branch 'wip-MDL-34775-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-03-05 17:03:44 +08:00
Frederic Massart 2498509cfd MDL-37852 repository: Prevent undesired access to repositories settings 2013-03-05 09:56:19 +01:00
Damyon Wiese fa1a43c43e Merge branch 'MDL-38282_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-05 16:14:26 +08:00
Daniele Cordella 9593527b54 MDL-35615 Course section: fixed alignment for userdefaultname checkbox to be inline with section name text input 2013-03-05 16:05:28 +08:00
Damyon Wiese 099b7986a5 Merge branch 'MDL-38279_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-03-05 15:36:15 +08:00
Damyon Wiese c694545650 MDL-37935: Cache - fix spelling mistake in language string 2013-03-05 13:07:33 +08:00
Damyon Wiese c23f9efc64 Merge branch 'wip-MDL-37935-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-03-05 13:07:19 +08:00
Aparup Banerjee a05b00c686 Merge branch 'MDL-30481_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-03-05 12:56:14 +08:00
Damyon Wiese 469025580f Merge branch 'wip-MDL-38055-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-03-05 11:41:11 +08:00
Frederic Massart eecdec4d5b MDL-34284 library: Import ZF2012-01 security patch for Zend 2013-03-05 10:32:16 +08:00
Sam Hemelryk af27002b54 Merge branch 'wip-MDL-37901_M24' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE 2013-03-05 15:22:57 +13:00
Eloy Lafuente (stronk7) 29f07d932a Merge branch 'wip-MDL-36215-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-03-05 01:28:03 +01:00
Eloy Lafuente (stronk7) 00d4e02598 MDL-32975 mini-bump to get navsortmycoursessort defined. 2013-03-04 23:47:10 +01:00
Eloy Lafuente (stronk7) 032b80ea4b Merge branch 'wip-MDL-32975-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-03-04 23:47:10 +01:00
Sam Hemelryk 7581032c96 MDL-32975 navigation: Added option to select how my courses are sorted 2013-03-05 09:46:36 +13:00
Sam Hemelryk b0aca71569 Merge branch 'MDL-38101-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-03-05 09:29:49 +13:00
Eloy Lafuente (stronk7) 083b0a54aa Merge branch 'MDL-37522-published-attachment_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-03-04 20:47:02 +01:00
Eloy Lafuente (stronk7) 6c2dec31f5 Merge branch 'wip-MDL-33013-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-03-04 20:18:37 +01:00
Eloy Lafuente (stronk7) 4856fb65b2 Merge branch 'MDL-36380-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-03-04 18:00:03 +01:00
Eloy Lafuente (stronk7) bbdbe0a490 Merge branch 'wip-MDL-37983-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2013-03-04 16:43:00 +01:00
Eloy Lafuente (stronk7) 26431c6f94 Merge branch 'MDL-38170-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-03-04 16:26:07 +01:00
Sam Hemelryk 892ee7ee56 Merge branch 'MDL-35350_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-03-04 16:12:54 +13:00
Sam Hemelryk fb2ac5029c Merge branch 'MDL-35127-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-03-04 16:07:59 +13:00
Eloy Lafuente (stronk7) 653c7d4a27 Merge branch 'wip-MDL-38205-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-03-04 03:01:21 +01:00
Frederic Massart 6153c8040d MDL-36426 repository: Prevent login_as() users to access 2013-03-04 02:38:32 +01:00
Sam Hemelryk b158bcce98 Merge branch 'MDL-37625-m24' of https://github.com/jfilip/moodle into MOODLE_24_STABLE 2013-03-04 14:18:33 +13:00
Sam Hemelryk 6a218739e4 Merge branch 'MDL-36128-moodle24' of https://github.com/StudiUM/moodle into MOODLE_24_STABLE 2013-03-04 13:59:40 +13:00
Frederic Massart 92e5923857 MDL-37681 repository_webdav: improved form handling when configuring an instance 2013-03-04 13:55:47 +13:00
Rajesh Taneja a608b0e670 MDL-37338 Calendar: User will not see calendar subscription, which he/she can't edit
Signed-off-by: Rajesh Taneja <rajesh@moodle.com>
2013-03-04 01:51:09 +01:00
Sam Hemelryk 4ea25c227c Merge branch 'MDL-38168-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-03-04 13:35:00 +13:00
Frederic Massart 75822af579 MDL-37507 repositories: improved formatting of external resources 2013-03-04 13:28:36 +13:00
Mark Nielsen 53c66110a8 MDL-36901: Remove system paths from exceptions
Replaces any server paths, like dataroot, with a token
in exception messages and debug info.
2013-03-04 00:16:58 +01:00
Frederic Massart fc58c234ed MDL-37481 user: fixed bug when logged in as guest 2013-03-04 11:18:49 +13:00
Eloy Lafuente (stronk7) 8b0318d538 Merge branch 'wip-MDL-38165-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-03-03 23:08:12 +01:00
Sam Hemelryk b62c8a06ad Merge branch 'MDL-32125-moodle24' of git://github.com/StudiUM/moodle into MOODLE_24_STABLE 2013-03-04 10:31:30 +13:00
Sam Hemelryk 6013e16b25 MDL-38055 block_courseoverview: fixed formatting of course fullname
Conflicts:
	blocks/course_overview/renderer.php
2013-03-04 09:35:17 +13:00
Iñaki Arenaza 04c258ee19 MDL-38262 auth/{ldap,cas}: Fix undefined property notification on first config
Just move the test after we've set the default configuration values if
they are not defined.

Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
2013-03-03 21:19:21 +01:00
Andrew Davis d2dbe64ba4 MDL-38149 core_grade: added a guard for when there are no old grades 2013-03-03 11:16:33 +08:00
Gareth J Barnard c2cd6618d2 MDL-37901 format_topics & format_weeks: Fix drag icon tooltip after move. 2013-03-02 12:53:37 +00:00
Tim Hunt 97f7bfc457 MDL-39282 quiz: always allow removal of bogus questions. 2013-03-01 17:34:17 +00:00
Tim Hunt a78c180efa MDL-38279 questions: must have default mark positive. 2013-03-01 15:22:05 +00:00
sam marshall 850d33e658 MDL-38170 SimplePie: Cannot read https feeds through proxy 2013-03-01 10:33:24 +00:00
AMOS bot 58110adcc6 Automatically generated installer lang files 2013-03-01 00:42:16 +00:00
Sam Hemelryk ca35d1c6b6 MDL-38165 cache: fixed issues purging peristent caches by event 2013-03-01 11:37:56 +13:00
Sam Hemelryk fcb404faac MDL-38165 cache: added unit tests for event purging of persistent caches 2013-03-01 11:37:56 +13:00
Sam Hemelryk 5a9b867cec MDL-38205 cache: implemented key prefix in memcache plugin 2013-03-01 10:11:19 +13:00
Sam Hemelryk f9bbcc5302 MDL-38165 cache: fixed up application event purging 2013-03-01 10:10:25 +13:00
Sam Hemelryk f810487764 MDL-38165 cache: fixed up session event purging 2013-03-01 10:10:25 +13:00
Sam Hemelryk 498ee7d44b MDL-38055 navigation: fixed ampersand use within titles
Conflicts:
	lib/navigationlib.php
2013-03-01 10:09:47 +13:00
Sam Hemelryk 704d82627c MDL-37935 cache: improved ready testing of stores on admin screen and testing script 2013-03-01 10:09:20 +13:00
Sam Hemelryk 49f853bfcb MDL-36215 navigation: fixed blog URL within courses using groups 2013-03-01 10:08:38 +13:00
Sam Hemelryk 5defa8f05e MDL-33013 navigation: fixed expansion limit issue hiding nodes 2013-03-01 10:08:15 +13:00
Jean-Philippe Gaudreau 4d30065a0a MDL-36128 grade: Import outcomes error 2013-02-28 13:30:24 -05:00
Tim Hunt 627f31b52c MDL-37847 / MDL-38119 question engine: document API change. 2013-02-28 18:26:46 +00:00
David Mudrák c24b75e257 MDL-37522 Serve images from published submissions
If the user is allowed to see the published submission, she must be also
able to see images in it (both embedded into the text as well as
attached to the submission). See the logic in submission.php as a
reference.
2013-02-28 18:51:44 +01:00
Gilles-Philippe Leblanc 445146552a MDL-32125 mod_forum: Updating subscription mode not reflecting subscribers 2013-02-28 11:59:26 -05:00
Eloy Lafuente (stronk7) 19075a2120 weekly release 2.4.1+ 2013-02-28 15:50:39 +01:00
Eloy Lafuente (stronk7) eac27523b5 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-02-28 15:40:31 +01:00
Rossiani Wijaya 5fe2acd17b MDL-34774 Lesson module: fixed report stats for 'high score' and 'low score' values where there is only one attempt with 0 score 2013-02-28 16:01:40 +08:00
Michael de Raadt 79e21e7d75 MDL-34775 - Forum, RSS - Fixing RSS entries option to be disabled if RSS is not enabled 2013-02-28 15:50:28 +08:00
Michael de Raadt d5c6c474c2 MDL-35350 Advanced uploading assignment: add submission timestamp on assignment index page 2013-02-28 14:04:50 +08:00
Frederic Massart fad56ea4be MDL-36380 stats: Issue with DST and monthly statistics 2013-02-28 13:56:45 +08:00
Frederic Massart 4c4ea10c3f MDL-36380 stats: No more duplicated entries when viewing monthly stats 2013-02-28 13:56:45 +08:00
Damyon Wiese 73646066a4 MDL-35127 Assignment - declare the variables in the outer scope (for readability) 2013-02-27 09:59:03 +08:00
Damyon Wiese 507507352b Merge branch 'MDL-35127_m24' of git://github.com/merrill-oakland/moodle into MDL-35127-24 2013-02-27 09:58:24 +08:00
Eric Merrill 37cb15e634 MDL-35127 mod_assign More efficient use of expensive database queries
Moving two relatively expensive DB queries so they are only executed when needed
instead of on every function call. They will still only execute once, and not
repeatedly during execution of the loop.
2013-02-26 09:48:46 -05:00
Rossiani Wijaya e6e074cc70 MDL-30481 Advanced upload assignment: Fixed assignment available date string to appropriately identify past or future availability 2013-02-26 17:41:04 +08:00
Eloy Lafuente (stronk7) f881b74bd8 Merge branch 'MDL-38076-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-02-26 10:14:51 +01:00
Erik Lundberg a5c4a76848 MDL-37835 Assignment unit tests fail when custom submission types are installed.
The assignment generator will now take all submission/feedback modules into concideration when creating new assignments.
2013-02-26 10:09:16 +01:00
Adrian Greeve 4f1538728a MDL-30669 - blocks: Unit tests for course_page_type_list() 2013-02-26 09:50:02 +01:00
Adrian Greeve 2d931ca93b MDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays set.
Also added a fix to the function course_page_type_list(). It was making a call to
get_context_info_array() which will generate an error if $currentcontext is not set.
2013-02-26 09:49:52 +01:00
Damyon Wiese 382b3d7596 MDL-37792 Conditions: Fix upgrade step in previous patch 2013-02-26 10:56:11 +08:00
Damyon Wiese db0c7b4e7b Merge branch 'MDL-37792-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-02-26 10:54:48 +08:00
Sam Hemelryk 823b45cb49 Merge branch 'wip-MDL-38144-MOODLE_24_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-02-26 15:26:55 +13:00
Marina Glancy 1a9d07fb59 MDL-38144 categories are created in reverse sort order in externallib 2013-02-26 11:29:39 +11:00
Eloy Lafuente (stronk7) a5ce98d52f Merge branch 'wip-MDL-38162-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-02-26 01:29:10 +01:00
Sam Hemelryk 5fe9dcbbed MDL-38110 cache: increased ttl unit test value to avoid timing issues 2013-02-26 00:47:37 +01:00
sam marshall 1a44518a64 MDL-37792 Conditions: Interests condition offered but not implemented 2013-02-25 13:25:17 +00:00
Damyon Wiese 3424086143 MDL-28692 Base theme - Version bump for css change 2013-02-25 13:52:05 +08:00
Damyon Wiese 6ff9929833 Merge branch 'MDL-28692_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-02-25 13:34:55 +08:00
Damyon Wiese 203338ab02 Merge branch 'MDL-38052_M24' of git://github.com/kordan/moodle into MOODLE_24_STABLE 2013-02-25 11:38:47 +08:00
Tim Lock c9c205e450 MDL-38113: Blind Marking grader email reveals submitters details 2013-02-25 11:14:17 +08:00
Dan Poltawski 6b5dc09867 Merge branch 'wip-MDL-38091-MOODLE_24_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-02-25 11:00:11 +08:00
Dan Poltawski 45551ed4df Merge branch 'MDL-38061-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-02-25 10:20:55 +08:00
Damyon Wiese a083389c63 Merge branch 'MDL-35175_24' of git://github.com/rlorenzo/moodle into MOODLE_24_STABLE 2013-02-25 09:52:19 +08:00
AMOS bot 0d260e54da Automatically generated installer lang files 2013-02-25 00:39:45 +00:00
Marina Glancy c49adb8e18 MDL-38091 fixed bug with SQL query on Oracle 2013-02-23 12:22:21 +11:00
kordan 06c108f879 MDL-38052 theme_formal_white: allowed the overlap between headermenu and header logo 2013-02-22 19:12:24 +01:00
sam marshall aee5f1f4d8 MDL-38168 Filelib: Curl class does not honour proxybypass option 2013-02-22 14:20:04 +00:00
Damyon Wiese 56d22f190e weekly release 2.4.1+ 2013-02-22 10:59:52 +08:00
Damyon Wiese 45dc254910 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-02-22 10:50:27 +08:00
Damyon Wiese 351cd1416f MDL-38061 Assignment - Use $CFG->showuseridentity to add extra fields to the assignment grading table/user summary.
Conflicts:

	mod/assign/gradingtable.php
	mod/assign/locallib.php
	mod/assign/renderable.php
	mod/assign/renderer.php
2013-02-22 10:32:08 +08:00
Sam Hemelryk 7a3a576617 MDL-38162 memcache: fixed up the memcache plugins 2013-02-22 14:27:28 +13:00
Sam Hemelryk c7746a0f7f MDL-37224 backup-import: better handling of search button 2013-02-21 08:24:20 +13:00
Dan Poltawski b1703e2951 Revert "MDL-36380 stats: No more duplicated entries when viewing monthly stats"
This reverts commit 33b5464e96.
2013-02-20 17:04:52 +08:00
Dan Poltawski 349a6fde37 Merge branch 'MDL-35622-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-02-20 14:27:52 +08:00
Rajesh Taneja 2225d0cfe6 MDL-37329 Navigation: Enrolled courses in category should be added only. 2013-02-20 12:41:21 +08:00
Frederic Massart 16296b4a84 MDL-35622 files: Fixed typo in galleryitem extension 2013-02-20 12:23:56 +08:00
Rajesh Taneja d432ff9e99 MDL-37329 Navigation: Navigation node My Courses will only show enrolled courses 2013-02-20 08:58:02 +08:00
Eloy Lafuente (stronk7) d863b93f5c MDL-37894 Amend tests with new openclose rule. 2013-02-20 01:37:08 +01:00
Eloy Lafuente (stronk7) 49ac497117 Merge branch 'wip-MDL-37224-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-02-20 00:48:50 +01:00
Eloy Lafuente (stronk7) ee04accfba Merge branch 'wip-MDL-34298-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-02-20 00:46:24 +01:00
Eloy Lafuente (stronk7) 5ddaf0a8ff Merge branch 'MDL-37894_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-02-20 00:40:21 +01:00
Eloy Lafuente (stronk7) 097404cd2b Merge branch 'MDL-37967_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-02-20 00:34:36 +01:00
Eloy Lafuente (stronk7) 950fead105 Merge branch 'wip-MDL-38075-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-02-20 00:07:47 +01:00
sam marshall fc84419f34 MDL-38101 Completion: Error when teacher/admin marks activity complete 2013-02-19 16:57:09 +00:00
Eloy Lafuente (stronk7) 8e628ee242 MDL-32620 whitespace + comment fixes. 2013-02-19 13:23:10 +01:00
Mark Nielsen 2fc00b3a5d MDL-32620: Fixing up white space in comment 2013-02-19 13:23:01 +01:00
Chris Scribner 53a993e103 Fixing an issue with not sending the launch_presentation_return_url 2013-02-19 13:22:55 +01:00
Eloy Lafuente (stronk7) e9d41cebe5 Merge branch 'MDL-38031-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-02-19 12:50:25 +01:00
Eloy Lafuente (stronk7) b5476a34bc Merge branch 'MDL-38033_dnd_uppercase_extn_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE 2013-02-19 12:24:24 +01:00
Dan Poltawski 8fbdd7cd1e Merge branch 'w07_MDL-38059_m24_cachedir' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-02-19 14:07:20 +08:00
Damyon Wiese fc511c8e48 Merge branch 'wip-MDL-38000-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-02-19 13:47:23 +08:00
Dan Poltawski e2b55c9c34 Merge branch 'MDL-38048-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-02-19 13:44:27 +08:00
Dan Poltawski bf0c578f16 Merge branch 'm24_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https://github.com/scara/moodle into MOODLE_24_STABLE 2013-02-19 13:41:55 +08:00
Dan Poltawski e23d098117 Merge branch 'MDL-37749_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-02-19 12:25:30 +08:00
Damyon Wiese e3f6d84b15 MDL-31636 Comments - Call display callback when adding a new comment. 2013-02-19 11:52:13 +08:00
Aparup Banerjee 86c1de421f MDL-31636 Added strftimeformat to comment object being passed through to xxx_comment_display() for further time format changes. 2013-02-19 11:52:02 +08:00
Aparup Banerjee 5fef447ee3 MDL-31636 redirect debugging to error log for ajax 2013-02-19 11:51:50 +08:00
Dan Poltawski ff7a518119 Merge branch 'MDL-38051_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-02-19 11:23:46 +08:00
Dan Poltawski 0141a869eb Merge branch 'MDL-37934_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-02-19 10:56:37 +08:00
AMOS bot ad3e244afd Automatically generated installer lang files 2013-02-19 00:44:34 +00:00
Sam Hemelryk 99720e73a6 MDL-34298 course: fixed course search output validation issue 2013-02-19 11:03:33 +13:00
Sam Hemelryk f3e186ab55 MDL-37224 backup: fixed bug when searching for a course to import 2013-02-19 09:32:22 +13:00
Tim Hunt fd8c97d264 MDL-37894 Show the quiz close date even if the quiz is not open yet.
People care a lot about deadlines!
2013-02-18 10:28:45 +00:00
Dan Poltawski 0e3d1236f8 Merge branch 'MDL-38039_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-02-18 15:59:56 +08:00
Aparup Banerjee 3026cb9910 MDL-37687 use $SITE to allow non-logged-in users to browse comment via ajax 2013-02-18 15:18:54 +08:00
Jean-Michel Vedrine ddc03b10d5 MDL-37967 Improve XML question import format handling of duplicated files 2013-02-18 07:54:30 +01:00
Dan Poltawski ff1d6556a7 Merge branch 'MDL-37396_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-02-18 14:27:40 +08:00
Dan Poltawski 9d0c759ed1 Merge branch 'MDL-36380-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-02-18 14:18:36 +08:00
Rossiani Wijaya 4086097935 MDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable in quickenrolment.js 2013-02-18 13:30:33 +08:00
Damyon Wiese bc11a70203 Merge branch 'MDL-37939-m24' of https://github.com/andrewnicols/moodle into MOODLE_24_STABLE
Conflicts:
	lib/db/upgrade.php
	version.php
2013-02-18 12:47:32 +08:00
Dan Poltawski 047f7aa46c Merge branch 'MDL-35336_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-02-18 12:24:12 +08:00
Dan Poltawski a2f6f882c4 Merge branch 'MDL-35622-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
Conflicts:
	lib/db/upgrade.php
	version.php
2013-02-18 11:33:00 +08:00
Dan Poltawski f4fb6d9898 Merge branch 'MDL-34800_ajax_submit_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-02-18 11:07:40 +08:00
Damyon Wiese 86c2bbd5f2 MDL-37683 cache: - Comments cleanup and remove ;; 2013-02-18 10:41:48 +08:00
Damyon Wiese b6f49c741d Merge branch 'wip-MDL-37683-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-02-18 10:39:47 +08:00
Rossiani Wijaya 53a054c8dd MDL-37396 User Enrollment: fixed missing user from enrolment sub-menu 2013-02-18 10:27:38 +08:00
Rossiani Wijaya 2102aee45c MDL-35336 report (course overview): check the setting for enablestats before printing out the node for setting > site admin > reports 2013-02-18 10:22:51 +08:00
Rossiani Wijaya ec0fef3294 MDL-35336 Report (course overview): fixed redirect url to enable statistics setting page when statistics is disable 2013-02-18 10:22:50 +08:00
Mary Evans b402f6ddc3 MDL-28692 theme_base: Added background-color to admin settings form overridden in base/style/admin.css 2013-02-18 01:58:47 +00:00
Frederic Massart 5bcea4d315 MDL-38076 usability: Fix wrong position of new 2.4 icons 2013-02-18 09:41:31 +08:00
Adrian Greeve 3884b0624e MDL-37983 - my home / navigation: $CFG->forcelogin is no longer affecting default home page redirects. 2013-02-18 08:53:45 +08:00
Sam Hemelryk 31c94e5cb3 MDL-37683 cache: improved indentifier collection and storage 2013-02-18 10:20:23 +13:00
Sam Hemelryk 2ad68b8c95 MDL-38000 css: fixed handling of CSS files by outputlib. 2013-02-18 08:34:01 +13:00
Sam Hemelryk a2b5f389de MDL-37683 cache: siteidentifier is now included in the keys
Conflicts:
	lib/db/upgrade.php
	lib/moodlelib.php
	version.php
2013-02-18 08:30:29 +13:00
Sam Hemelryk fd6d738db4 MDL-38075 csslib: fixed coding error when working with an array of styles 2013-02-18 08:22:08 +13:00
Petr Škoda 4a9c28b513 MDL-38059 explain that cachedir must be shared in cluster 2013-02-16 14:45:17 +01:00
Jean-Michel Vedrine ffcc444fa7 MDL-38051 Annihilate all the CRLFs present in some questions/fixtures... 2013-02-16 14:41:35 +01:00
Andrew Robert Nicols acdf4859b5 MDL-37939 Course: Add additional unit tests to confirm that module move occurs correctly 2013-02-15 21:10:22 +00:00
Andrew Robert Nicols 41d397e68b MDL-37939 Course: Correct broken sequence data 2013-02-15 21:10:13 +00:00
Matteo Scaramuccia 9b6485865c MDL-37449 Incorrect doubled 'u.email' field in the SQL query (Oracle error: ORA-00918) 2013-02-15 21:19:14 +01:00
Frederic Massart 33b5464e96 MDL-36380 stats: No more duplicated entries when viewing monthly stats 2013-02-15 15:03:37 +08:00
Frederic Massart 59cb24ff0c MDL-38048 documentation: Typo in README file 2013-02-15 13:15:24 +08:00
Frederic Massart b4d0144d09 MDL-38301 usability: Fixed wrong icon size 2013-02-15 10:05:20 +08:00
Eloy Lafuente (stronk7) 03fd922158 MDL-38040 Clean core from CRLFs 2013-02-15 02:20:28 +01:00
Mary Evans 229e69a1c0 MDL-38039 theme_base: Corrected typo fickering to flickering in CSS comment which blocked IPCOP browser firewall in IE. 2013-02-15 01:06:44 +00:00
Davo Smith aea372a659 MDL-38033 dndupload - ignore case when comparing dropped file extensions with those supported by activity modules 2013-02-14 20:22:07 +00:00
Jean-Michel Vedrine 58a43ebebe 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:43:32 +01:00
Damyon Wiese 09de5eb3de weekly release 2.4.1+ 2013-02-14 14:08:04 +08:00
Damyon Wiese 73e15efa4b Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-02-14 14:06:54 +08:00
AMOS bot 5b98dd1e85 Automatically generated installer lang files 2013-02-14 00:49:56 +00:00
Damyon Wiese 47d8bb6e25 MDL-37883 Assignment Grade import/export. Additional fix to prevent different grade rounding on export. 2013-02-13 15:35:39 +08:00
AMOS bot a31370452a Automatically generated installer lang files 2013-02-13 00:45:40 +00:00
Rex Lorenzo b20c4d58db MDL-35175 - Lesson shows no attempts if associated with a grouping 2013-02-12 15:27:50 -08:00
Mary Evans fbf87b8143 MDL-37749 theme_mymobile: Removed redundant JS and CSS code for Collapsed Topic contributed plugin. 2013-02-12 17:20:29 +00:00
Eloy Lafuente (stronk7) efdb676e84 MDL-37893 Take rid of old comment. 2013-02-12 10:04:28 +01:00
Eloy Lafuente (stronk7) 553e19b443 Merge branch 'MDL-37893-grouped-empty_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-02-12 10:04:12 +01:00
Dan Poltawski 6d5f4fd536 Merge branch 'wip-MDL-37976-MOODLE_24_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE 2013-02-12 16:13:55 +08:00
Dan Poltawski db41eeb8bd Merge branch 'wip-mdl-37633-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-02-12 15:49:55 +08:00
Rajesh Taneja 353fac6f48 MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default
Conflicts:

	mod/forum/version.php
2013-02-12 15:01:05 +08:00
Andrew Davis c605d0b9c6 MDL-34800 core_grade:switched from hiding the submit button to disabling it if ajax is enabled 2013-02-12 14:54:28 +08:00
Dan Poltawski dbdcc42eee Merge branch 'MDL-32076_unlimited2_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-02-12 14:42:35 +08:00
Dan Poltawski 25da216389 Merge branch 'MDL-37883-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-02-12 13:47:44 +08:00
Dan Poltawski 519375f9fe Merge branch 'MDL-37074-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-02-12 13:39:34 +08:00
Dan Poltawski ccc32eba06 Merge branch 'MDL-37924_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-02-12 13:36:04 +08:00
Dan Poltawski 09931f8158 Merge branch 'wip-MDL-34798_M24-2' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE 2013-02-12 10:34:15 +08:00
Marina Glancy abc3a22f42 MDL-37976 fixed missing global 2013-02-12 12:53:47 +11:00
Dan Poltawski 6cf9f04cd6 Merge branch 'MDL-37952_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2013-02-12 09:46:08 +08:00
Damyon Wiese 3da2415167 MDL-36297 Version bump for js changes. 2013-02-12 09:40:11 +08:00
Davo Smith 80accd23bb MDL-37831 filepicker - icons / details / tree selector buttons now work more reliably 2013-02-12 09:37:33 +08:00
Eloy Lafuente (stronk7) d3a2b63143 Merge branch 'MDL-37943_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-02-12 01:21:06 +01:00
Eloy Lafuente (stronk7) 017382e6d3 Merge branch 'MDL-37896_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-02-12 01:14:24 +01:00
David Mudrák 0eab91dcce MDL-37919 Let PHPUnit display the content of $a even if the error string is not found 2013-02-12 01:08:22 +01:00
Eloy Lafuente (stronk7) 2c9a28bbe6 Merge branch 'MDL-35037-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-02-12 00:59:56 +01:00
Frederic Massart bc2de4ab0e MDL-37961 webservice: PARAM_BOOL with PARAM_DEFAULT accepts boolean default 2013-02-12 00:44:17 +01:00
Gareth J Barnard cac8708d0b MDL_34798 format_topics and format_weeks: Adjust section names when moving up. 2013-02-11 14:07:35 +00:00
Dan Poltawski af5d66f999 Merge branch 'MDL-37039-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-02-11 14:33:27 +08:00
Dan Poltawski 8b2034bc7b Merge branch 'MDL-37797_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-02-11 13:58:47 +08:00
Frederic Massart bac188fa71 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-11 10:29:50 +08:00
AMOS bot 526bff4c64 Automatically generated installer lang files 2013-02-10 00:41:39 +00:00
Eloy Lafuente (stronk7) dcaeeda60c MDL-37952 make helper descendants abstract 2013-02-09 16:21:49 +01:00
Tim Hunt e2d9006792 MDL-37924 quiz settings: change wrong 'fix' => 'adv'. 2013-02-08 12:50:17 +00:00
Tim Hunt 2de3659810 MDL-37896 qtype_essay: correct PARAM_CLEANHTML -> PARAM_RAW.
It turns out that you should almost never use PARAM_CLEANHTML.
2013-02-08 12:49:58 +00:00
Tim Hunt 5baa26c105 MDL-37943 upgrade: logic error in upgrade_plugins_blocks.
Derek Woolhead tracked down the problem and what needed to be fixed. I
just made the patch.

The problem was that if $plugin->cron had changed in version.php, then
the version number in the database could end up wrong after the upgrade,
and so the upgrade would immediately run a second time.
2013-02-08 12:43:58 +00:00
David Mudrák dc85a9e833 MDL-37774 Do not pass trailing slash if the method does not want it 2013-02-08 12:53:23 +01:00
David Mudrák 9f887c6c79 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 and a
debugging for the developer is displayed.
2013-02-08 12:53:23 +01:00
David Mudrák 8616f9380c MDL-37774 Add unit test to illustrate the problem with the trailing slash
The patch introduces two new tests for moodle1_file_manager::migrate_directory().
The second test with the trailing slash reveals the trouble here.
The expected behaviour is that the method would deal with the trailing
slash. Debugging message for the developer should be displayed though.
2013-02-08 12:53:23 +01:00
Damyon Wiese b9dc4c3cbe MDL-37039 Assignment - Do not apply filters to grading table for offline assignments
Because the filters do not make sense for offline assignments, they are hidden. But if the active filter
prevents you from seeing any assignments you cannot change it. This change makes it so the filters are
also not applied when the assignment is an offline assignment.
2013-02-08 15:48:08 +08:00
Damyon Wiese 1d16b7f80c MDL-37074 Assign theming: Use addClass/removeClass instead of setAttribute to preserve existing classes 2013-02-08 15:18:53 +08:00
Damyon Wiese 0e6d8bc952 weekly release 2.4.1+ 2013-02-08 11:19:06 +08:00
Damyon Wiese f2d81d1e54 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-02-08 11:01:44 +08:00
Eloy Lafuente (stronk7) 04116863fb MDL-37893 Always notify pending starts before dispatching chunk 2013-02-08 01:48:32 +01:00
David Mudrák 176f08e90c MDL-37893 Allow elements with no final tags to form a grouped path 2013-02-08 01:48:32 +01:00
David Mudrák 8ab37b5fca MDL-37893 Add unit test to demonstrate the issue 2013-02-08 01:48:32 +01:00
AMOS bot 7da5b49bc4 Automatically generated installer lang files 2013-02-08 00:45:15 +00:00
Sam Hemelryk 007cd537d0 MDL-37645 cache: fixed issue deleting mongo instance 2013-02-08 08:07:01 +13:00
Dan Poltawski b59f90efa4 MDL-35037 tags: dont display blog entries when blogging disabled 2013-02-07 12:34:55 +08:00
Andrew Robert Nicols 3c754bb442 MDL-37566 AJAX Fix issues with minimum height and centring
Conflicts:
	lib/yui/chooserdialogue/chooserdialogue.js
2013-02-07 01:10:21 +01:00
Damyon Wiese 99aa14d1ff MDL-37883 Assign offline marking: Properly handle french decimal grades when importing worksheet. 2013-02-06 15:45:43 +08:00
Andrew Davis e456586166 MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests 2013-02-06 15:34:35 +08:00
Rajesh Taneja cd1792a902 MDL-30144 Assignmnet 2.2: fixed context retrival 2013-02-06 13:22:17 +08:00
Eloy Lafuente (stronk7) b626992e09 Merge branch 'MDL-37854_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-02-05 11:19:30 +01:00
Mark Nelson e0d4f2b66c MDL-37854 phpunit: replaced occurrence of non-existent function assertFail 2013-02-05 18:03:58 +08:00
David Mudrák e57a314de8 MDL-37870 Fix the number of parameters when calling the parent constructor 2013-02-05 10:19:52 +01:00
Howard Miller 3bcf80e9f2 MDL-37797 HTML block: add contextid to block_positions query and make it more unique. 2013-02-05 16:23:23 +08:00
Damyon Wiese d854035ffe MDL-36206 Unit tests - Cleanup whitespace issues from previous patch 2013-02-05 14:13:37 +08:00
Jason Fowler 27e79a40ce MDL-36206 - Unit Test - Create unit test for pagination bar 2013-02-05 14:13:16 +08:00
Dan Poltawski 44a29a501a Merge branch 'MDL-37800_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE 2013-02-05 12:43:15 +08:00
Dan Poltawski 7298cf7db3 Merge branch 'wip-MDL-36322-m24' of https://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-02-05 10:26:21 +08:00
Dan Poltawski 50890e037e MDL-37357 - fix trailing whitespace 2013-02-05 09:58:27 +08:00
Dan Poltawski d5822fbfd7 Merge branch 'MDL-37357_hidden_rank_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-02-05 09:58:10 +08:00
Dan Poltawski 2647ebb63c MDL-37574 - Fix navigation tests: remove title
We are no longer setting it, to improve accessibility
2013-02-05 08:38:39 +08:00
Eloy Lafuente (stronk7) 4ce7de34ca Merge branch 'MDL-37566-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-02-05 01:14:21 +01:00
Davo Smith 747e16f7b0 MDL-37801 mod_glossary - encode / decode links to 'showentry' pages during backup & restore 2013-02-05 01:03:14 +01:00
Eloy Lafuente (stronk7) 52c86533d9 Merge branch 'MDL-37775_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-02-05 00:57:33 +01:00
Eloy Lafuente (stronk7) 47ae7ebe35 Merge branch 'MDL-37785_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-02-05 00:36:13 +01:00
Eloy Lafuente (stronk7) e42c4ee260 Merge branch 'MDL-37523_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-02-05 00:28:32 +01:00
Eloy Lafuente (stronk7) 125d26d23c Merge branch 'MDL-37518_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-02-05 00:14:01 +01:00
Eloy Lafuente (stronk7) bd11fca3aa Merge branch 'm24_MDL-33078' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-02-04 23:59:14 +01:00
Eloy Lafuente (stronk7) 65828d8652 Merge branch 'MDL-37847_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-02-04 22:56:03 +01:00
Tim Hunt b7f894a403 MDL-37847 plain text essays were screwing up HTML special chars.
This was incorrect use of PARAM_CLEANHTML for these inputs.

This fix also adds some unit tests to try to verify that this does not
break again in future.
2013-02-04 12:55:31 +00:00
Mary Evans 9ed92b3bd2 MDL-37523 theme_mymobile: Removed a renderer from mymobile/renderers.php and added it to theme/mymobile/renderers/mod_choice_renderer.php. Then added a conditional statement to theme/mymobile/renderers.php in order to call mymobile/renderers/mod_choice_renderer.php. 2013-02-04 11:35:23 +00:00
Dan Marsden 76b177f6c3 MDL-33078 SCORM: rebuild toc when calling LMSCommit to improve pre-req handling 2013-02-04 22:10:19 +13:00
Damyon Wiese 2c9f35960f Merge branch 'MDL-37781-workshop-schedule_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-02-04 16:19:26 +08:00
Dan Poltawski bfc80ec4e8 Merge branch 'MDL-37574-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-02-04 16:14:12 +08:00
Dan Poltawski 64d4729f3d Merge branch 'm24_MDL-29207' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-02-04 15:56:15 +08:00
Dan Poltawski 3677b2ecf3 Revert "MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests"
This reverts commit 002178276f.
2013-02-04 15:12:45 +08:00
Dan Poltawski 3fd6f7e088 Merge branch 'MDL-32076_unlimited2_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-02-04 14:30:48 +08:00
Michael Hughes da071ee1d2 MDL-30144 Assignment 2.2: Download all as zip should only contain submission from active enroled users 2013-02-04 13:55:30 +08:00
Dan Poltawski 2cb6f68179 Merge branch 'MDL-37646-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-02-04 13:49:32 +08:00
Dan Poltawski 8b447463ad Merge branch 'MDL-37710-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-02-04 12:12:56 +08:00
Dan Poltawski 3e0ddd4cfd Merge branch 'MDL-37635-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-02-04 11:57:15 +08:00
Mark Nelson ec4663f863 MDL-37518 blocks: described the introduction of the myaddinstance capability in upgrade.txt 2013-02-04 11:43:46 +08:00
Damyon Wiese ecd60630ac Merge branch 'm24_MDL-36800' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-02-04 11:41:33 +08:00
Damyon Wiese 8917ec5117 Merge branch 'MDL-37177-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-02-04 11:18:33 +08:00
Dan Poltawski a6bd6fcd41 Merge branch 'MDL-37746_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-02-04 10:17:46 +08:00
Dan Poltawski 56f84f2b99 Merge branch 'MDL-25853-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-02-04 10:13:58 +08:00
Dan Marsden a07fe914d0 MDL-29207: SCORM prereq callback is pure js - move it to module.js so it can be cached better. 2013-02-03 20:29:00 +13:00
Dan Marsden bb22d0696e MDL-29207 SCORM: Auto-continue doesn't work with Pre-req due to JS errors 2013-02-03 20:28:57 +13:00
Dan Marsden 216e2e5b7f MDL-36800 SCORM: Fix Yui().use calls - thanks to Nancy Cheng for the fix 2013-02-03 20:22:18 +13:00
Andrew Robert Nicols 9388982eab MDL-37574 Remove default link title from navigation items 2013-02-01 11:34:50 +00:00
Andrew Robert Nicols 3a64e6eb02 MDL-37566 AJAX Only set max-height for chooser dialogues
If we set height as well as max-height then there is a potential for
whitespace to be shown at the bottom of the list of choices.

This commit stops removing the height option so that we only rely upon
max-height for dialogue heigh calculation.
2013-02-01 11:26:30 +00:00
Andreas Grabs baea79cca4 MDL-37800 mod_feedback - item "information" does not appear correctly 2013-02-01 11:42:43 +01:00
Damyon Wiese 5c15ab2b4a MDL-37635 Assign: Prevent errors when viewing a feedback for an assignment with no gradeitem in gradebook
Unit tests removed from backport to verify that:
Feedback is visible even if there is no grade
The grade is not shown if the gradeitem is hidden unless you have mod/assign:grade capability

Conflicts:

	mod/assign/locallib.php
	mod/assign/renderer.php
	mod/assign/tests/locallib_test.php
2013-02-01 13:46:58 +08:00
Andrew Davis 6d168299ae MDL-37357 core_grade: fixed the showing and hiding of rank on the overview report 2013-02-01 10:54:41 +08:00
Andrew Davis 002178276f MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests 2013-02-01 08:52:52 +08:00
Sam Hemelryk 3fbba4bf48 MDL-36322 cache: implemented cache_store::create_clone 2013-02-01 08:49:07 +13:00
Sam Hemelryk 722907c7b0 MDL-36322 cache: clarified docs for initialise and construct 2013-02-01 08:49:07 +13:00
Sam Hemelryk 770eed82fd MDL-36322 cache: cache stores now test connections during construction 2013-02-01 08:49:07 +13:00
Matteo Scaramuccia 447475e5d7 MDL-36322 Errors when updating a Moodle instance with some misconfigured cache stores 2013-02-01 08:49:07 +13:00
Tim Hunt 3f7a6d5331 MDL-37746 qtype_shortanser: avoid normalizer_normalize dangers.
When an error occurs, normalizer_normalize just silently returns null,
which is dangerous. Here, we wrap it in a safe helper function.
2013-01-31 11:33:12 +00:00
Eloy Lafuente (stronk7) a8e927e26c weekly release 2.4.1+ 2013-01-31 11:04:58 +01:00
Mary Evans 56364dcec0 MDL-37775 theme_canvas: Changed ADD a block from center align to left in style/blocks.css 2013-01-31 08:11:08 +00:00
Frederic Massart ba7b0fb3b3 MDL-37177 navigation: Prevent exception when viewing a profile
When viewing a profile as a non-authenticated user, an exception
was raised because we were trying to fetch the context of this user.
2013-01-31 12:26:52 +08:00
David Mudrák 337c3fa74c MDL-37781 Allocate workshop submissions without waiting for cron
Now we are checking for the need to execute the allocator every time the
main view.php is displayed to any user. Previously this was done by cron
only.
2013-01-31 03:38:21 +01:00
David Mudrák 351aeeeba6 MDL-37781 Check for switching the workshop phase without waiting for cron
Now we are checking for the need to switch the phase when the main
view.php is displayed to any user (previously this was done via cron
only). To give our subplugins (such as the scheduled allocation method)
a chance to do what they need to do, the workshop_viewed event is
triggered before the phase is actually switched.
2013-01-31 03:31:18 +01:00
Dan Poltawski d070222f69 Merge branch 'm24_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-01-31 10:14:53 +08:00
Mary Evans 05ec4d9d20 MDL-37785 theme_base: remove duplicate .dir-rtl file-picker css rules from styke/core.css 2013-01-31 01:17:52 +00:00
Sam Hemelryk 8003618cd1 MDL-36363 cache: added unit tests for muliple loaders 2013-01-31 12:16:21 +13:00
Dan Marsden 54bc823b80 MDL-34231 SCORM: calculate correct number of attemptsleft when entering an attempt. 2013-01-31 10:46:16 +13:00
Sam Hemelryk 4786eca8f2 MDL-36363 cache: fixed issue with double parsing keys for stacked loaders 2013-01-31 09:14:31 +13:00
Damyon Wiese 2c24a252c5 Merge branch 'wip-MDL-37747-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-01-30 09:06:04 +08:00
Frederic Massart d987453bd4 MDL-25853 calendar: Fixed broken previous/next links 2013-01-30 09:03:22 +08:00
Eloy Lafuente (stronk7) 498a14ef8b Merge branch 'w04_MDL-37734_m24_marshack' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-30 01:23:36 +01:00
Sam Hemelryk 0241200633 MDL-37747 cache: changed PARAM_TEXT to PARAM_ALPHANUMEXT 2013-01-30 13:18:56 +13:00
Petr Škoda 1b2ab57a92 MDL-37767 allow empty host in enrol_database which is required for default pg socket 2013-01-30 00:42:37 +01:00
Eloy Lafuente (stronk7) f89712dc6d Merge branch 'MDL-37533-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-01-29 15:35:14 +01:00
Eloy Lafuente (stronk7) becce23e4a Merge branch 'wip-MDL-36363-m24' of https://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-01-29 12:06:43 +01:00
Petr Škoda 674e0a210d MDL-37734 add one more recordset isolation test 2013-01-29 10:18:54 +01:00
Petr Škoda e63aff8479 MDL-37734 use prefetching workaround for MARS transaction problems 2013-01-29 10:18:41 +01:00
Damyon Wiese 3cf3ecd90f MDL-37710 Assign: Fix pluginfile permission checks for student viewing their own team submission.
This change adds a function to the assign class to allow the permissions for a group submission
to be checked and updates all the submission plugins to call it.

Conflicts:

	mod/assign/locallib.php
	mod/assign/submission/file/lib.php
	mod/assign/submission/onlinetext/lib.php
2013-01-29 17:07:17 +08:00
Rajesh Taneja 9f9bc1f0ab MDL-34190 Course: Role with student archtype should be selected as default in user list 2013-01-29 16:54:04 +08:00
ppichet 92a7501ac6 MDL-29691 Improve numerical format in multianswer
Allow the use of , as decsep in multianswer numerical subquestions
2013-01-29 16:30:27 +08:00
Damyon Wiese afcc12e80b MDL-37646 Assign: Quickgrading fix when using grading filters or lots of students. 2013-01-29 14:39:42 +08:00
Dan Poltawski adedab33de Merge branch 'MDL-37694_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-01-29 11:54:42 +08:00
Sam Hemelryk 3cb0325122 Merge branch 'MDL-37476-stable24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-01-29 15:23:45 +13:00
Dan Marsden 2a97de2671 MDL-37696 SCORM css: don't include style.css multiple times 2013-01-29 10:34:22 +13:00
Sam Hemelryk bb5ebb6280 Merge branch 'MDL-37697-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-01-29 09:56:37 +13:00
Sam Hemelryk 6a1e566152 Merge branch 'MDL-37350-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-01-29 08:54:52 +13:00
Sam Hemelryk cd6e980e66 Merge branch 'MDL-36881-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-01-29 08:51:39 +13:00
Sam Hemelryk 47795b2126 Merge branch 'MDL-34671-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-01-29 08:39:23 +13:00
Sam Hemelryk 21126fc5e8 Merge branch 'MDL-37668-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-01-29 08:33:19 +13:00
Sam Hemelryk 353db49bfb Merge branch 'm24_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-01-29 08:28:12 +13:00
Eloy Lafuente (stronk7) 18d4c3120a Merge branch 'wip-MDL-37545-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-01-28 19:23:25 +01:00
Eloy Lafuente (stronk7) f1b7893d57 MDL-37086 phpunit: use alt reset method.
When code executed in test cases is using/preventing
database transactions, phpunit itself cannot
use transactions for reseting between cases. But we
can tell it about, so some alternative (and slower)
method for reseting will be used.
2013-01-28 18:49:56 +01:00
sam marshall e978e6b5f5 MDL-37668 Accessibility: Help popup should be easy to close using keyboard 2013-01-28 10:58:59 +00:00
Andrew Robert Nicols d2e360710f MDL-34671 Stop browser receiving escape keydown in modal dialogues
In certain modal dialogues, we listen on the Escape key to close a
dialogue. However, this is still passed to the browser. As a result, if the
browser is in full screen mode and that browser respects the escape key as
a means to exit full screen.

As a result, we need to ensure that we listen for the escape key at keydown
rather than keyup, and additionally prevent the default browser behaviour.

This is a workaround to http://yuilibrary.com/projects/yui3/ticket/2532616
and, should that issue be fixed, it should be removed.
2013-01-28 10:49:15 +00:00
Sam Chaffee 48a5b81346 MDL-36881 Handle poorly behaved modname_get_types functions better
The modname_get_types function is not always well implemented by
third-party plugins and some return poor data. This in turn leads to
incorrect module definitions, and can lead to problems in both the
'Add an activity...' dropdowns and the Activity chooser.

This will also prevent display of plugins which legitimately can have
subtypes but where no subtypes were found. Since such plugins cannot be
used in this fashion in any case, this is also beneficial.

Signed-off-by: Andrew Robert Nicols <andrew.nicols@lancaster.ac.uk>
2013-01-28 10:22:55 +00:00
Andrew Robert Nicols 584eca0871 MDL-37350 Detach listeners when hiding the 'Add roles' popup
If the submit event listener is not correctly closed, then the submit event
calls the relevant callback multiple times incorrectly.

When hiding the Add role dialogue, we need to detach any event listeners
which are applied to it.
2013-01-28 09:58:39 +00:00
Andrew Robert Nicols 15652ea93c MDL-37697 Use the user selected editor format for new course forums 2013-01-28 09:55:13 +00:00
Dan Marsden 481e8f7105 MDL-34231 SCORM: Lock after final attempt when using skip content structure or direct navigation to player.php 2013-01-28 21:20:39 +13:00
Sam Hemelryk a9c75fdc75 Merge branch 'w04_MDL-37638_m24_rolecloning' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-28 17:59:48 +13:00
Sam Hemelryk 151d0c574d Merge branch 'w04_MDL-37713_m24_testdir' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-28 17:53:42 +13:00
Sam Hemelryk 611314c096 Merge branch 'MDL-37548-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-01-28 17:46:02 +13:00
Sam Hemelryk 3e72333f0c Merge branch 'wip-MDL-29723_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-01-28 17:34:51 +13:00
Sam Hemelryk e7a68ca017 Merge branch 'MDL-37172_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-01-28 17:29:09 +13:00
Sam Hemelryk 72e5445732 Merge branch 'MDL-13805_others_messages_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-01-28 16:06:58 +13:00
Andrew Davis 799be0ba8c MDL-13805 core_message: fixed the admin's ability to read another users messages 2013-01-28 10:19:42 +08:00
David Monllao db246a14e0 MDL-37634 lesson: readquestion visibility to protected 2013-01-28 13:45:36 +13:00
Sam Hemelryk 4d572da1b3 Merge branch 'MDL-37628-24' of git://github.com/grabs/moodle into MOODLE_24_STABLE 2013-01-28 13:41:54 +13:00
Sam Hemelryk e86e05ebf0 Merge branch 'w04_MDL-37407_m24_chineseunzip' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-28 13:31:54 +13:00
Sam Hemelryk 452a704ae9 Merge branch 'MDL-37414_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-01-28 13:28:52 +13:00
Sam Hemelryk 362b124e69 Merge branch 'MDL-19069_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-01-28 11:32:41 +13:00
Sam Hemelryk 4636cf771c MDL-37545 cache: fixed bug during initialisation and updating of cache config 2013-01-28 10:40:49 +13:00
Sam Hemelryk a50cdcc0fd MDL-36363 cache: clean up pre-integration 2013-01-28 10:39:07 +13:00
Matteo Scaramuccia 86afa1d00f MDL-36363 Override instance_deleted() for all cache stores performing just a cleanup() when this action successfully applies over all the definitions of the cache store 2013-01-28 10:39:07 +13:00
Matteo Scaramuccia 233046ea5e MDL-36363 Adding/Removing a file store cache instance cleanups the folder too 2013-01-28 10:39:07 +13:00
Matteo Scaramuccia 5d7411e92b MDL-36363 Added cache_store::instance_created() and cache_store::instance_deleted() 2013-01-28 10:39:07 +13:00
Petr Škoda 54b96ced13 MDL-37713 let phpunit bootstrap create test dataroot if necessary 2013-01-26 14:59:55 +01:00
Andreas Grabs 70328cc2e7 MDL-37628 feedback - Coding error in Recent Activity 2013-01-26 11:26:00 +01:00
Jean-Michel Vedrine d53ba71a24 MDL-37172 Hardcoded strings in some question imports formats
AMOS BEGIN
CPY [unknownorunhandledtype,qformat_blackboard_six],[unknownorunhandledtype,question]
AMOS END
2013-01-25 22:45:47 +01:00
Petr Škoda 4fb6eeb518 MDL-37638 fix name of duplicate role 2013-01-25 19:36:17 +01:00
Petr Škoda 401dc3dbb9 MDL-37407 add support for zh_cn unicode unzip 2013-01-25 15:56:45 +01:00
Tim Hunt c257025ccd MDL-37694 move quiz unit tests to the right place.
Follow-on from MDL-37684.
2013-01-25 12:14:10 +00:00
Dan Poltawski df93b156a7 MDL-37684 - phpunit add missing definitions to phpunit.xml.dist 2013-01-25 16:27:50 +08:00
Dan Poltawski 9c0349b416 weekly release 2.4.1+ 2013-01-25 15:58:09 +08:00
Dan Poltawski f0e846b410 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-01-25 15:57:52 +08:00
Dan Poltawski 87eb1d645f Merge branch 'MDL-37473b-24' of git://github.com/srynot4sale/moodle into MOODLE_24_STABLE 2013-01-25 12:35:55 +08:00
Aaron Barnes fb28b75b74 MDL-37473 completion: Add missing cap checks to tracked users functions
Namely get_num_tracked_users and is_tracked_user()
2013-01-25 17:11:02 +13:00
Andrew Robert Nicols a64df7558c MDL-37548 Show the incorrect value in a colour picker after validation 2013-01-24 10:15:34 +00:00
Stephen Bourget ad4d0c5e05 MDL-37533 Assign: Fix grading filters to show only assignments needing grading
Conflicts:

	mod/assign/gradingtable.php
2013-01-24 11:07:41 +08:00
Damyon Wiese 95755113bf MDL-37533 Assign: Use the constant for the submitted status in the query (and parameterize the query) 2013-01-24 11:06:46 +08:00
Stephen Bourget 153292da44 MDL-37533 Assign: assign_print_overview does not correctly display assignments that need grading
Conflicts:

	mod/assign/lib.php
2013-01-24 11:06:33 +08:00
AMOS bot fa85892b0a Automatically generated installer lang files 2013-01-24 00:46:49 +00:00
Jerome Mouneyrac 7e2184125c MDL-37476 course_create unit test fails if course completion is enabled 2013-01-23 13:57:24 +08:00
Mary Evans b213281ba1 MDL-29723 mod/quiz: Modified show/hide button in edit.php and added some extra CSS rules to styles.css to make Question bank block more compatible/adaptable with themes. 2013-01-23 00:58:26 +00:00
Damyon Wiese 8ca54dbbf3 MDL-37619 Assign - Fix regression assign_print_overview caused by MDL-37527 2013-01-23 08:47:00 +08:00
Sam Hemelryk 7700ec42c1 Merge branch 'MDL-34435-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
Conflicts:
	version.php
2013-01-23 11:08:14 +13:00
Eloy Lafuente (stronk7) d31a080f91 Merge branch 'wip-MDL-15930-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2013-01-22 20:33:06 +01:00
Justin Filip 990c247841 MDL-37625 auth_radius Updated to latest version (1.5.0) of included PEAR Crypt_CHAP library. 2013-01-22 10:41:54 -05:00
Aparup Banerjee 1c7c33b314 Merge branch 'wip-mdl-37339-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-01-22 16:28:39 +08:00
Dan Poltawski 13d03939a6 Merge branch 'wip-mdl-32526-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-01-22 14:00:34 +08:00
Dan Poltawski 83d4aee03c Merge branch 'MDL-27164-MOODLE_24_STABLE' of git://github.com/micaherne/moodle into MOODLE_24_STABLE 2013-01-22 12:51:59 +08:00
Dan Poltawski c57ed76265 Merge branch 'm24_MDL-36853' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-01-22 12:49:26 +08:00
Dan Poltawski 1bb2d65bb2 Merge branch 'MDL-37275_m24' of git://github.com/markn86/moodle into MOODLE_24_STABLE 2013-01-22 12:46:16 +08:00
Dan Poltawski 3dae8bcedd Merge branch 'MDL-37375_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-01-22 12:43:55 +08:00
Dan Poltawski 9f8b8bbd37 Merge branch 'w03_MDL-37593_m24_httpslogineditor' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-22 12:36:06 +08:00
Dan Poltawski 82cb942bff Merge branch 'MDL-37430-24' of github.com:damyon/moodle into MOODLE_24_STABLE 2013-01-22 11:53:38 +08:00
Dan Poltawski facd17c1ce Merge branch 'MDL-35357_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-01-22 11:48:16 +08:00
Dan Poltawski 76c98ace9a Merge branch 'MDL-37599_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-01-22 11:40:14 +08:00
Dan Poltawski f5222c7416 Merge branch 'MDL-37473-24' of git://github.com/srynot4sale/moodle into MOODLE_24_STABLE 2013-01-22 11:14:32 +08:00
Aparup Banerjee 3a6152ceac Merge branch 'MDL-37540-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-01-22 10:59:53 +08:00
Aparup Banerjee 0e5bf3c4af Merge branch 'MDL-37543-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-01-22 10:56:38 +08:00
Mark Nelson 528b5b7dac MDL-37414 blocks: re-added the ability to add some blocks to the My Moodle 2013-01-22 10:54:13 +08:00
Dan Poltawski bd541e24b3 Merge branch 'MDL-37355-stable24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-01-22 09:06:30 +08:00
Eloy Lafuente (stronk7) d828e8c678 Merge branch 'MDL-36104_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-01-22 01:19:52 +01:00
Eloy Lafuente (stronk7) b1886826de Merge branch 'MDL-37539-24' of github.com:damyon/moodle into MOODLE_24_STABLE 2013-01-22 01:06:13 +01:00
Eloy Lafuente (stronk7) 4e63dc5e5d Merge branch 'MDL-28512_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-01-22 01:02:22 +01:00
Eloy Lafuente (stronk7) cf3e5c4965 Merge branch 'wip-mdl-37432-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-01-22 00:52:53 +01:00
Aaron Barnes 349fc3edfc MDL-37473 completion: Add missing cap checks to tracked users functions
Namely get_num_tracked_users and is_tracked_user()
2013-01-22 11:18:31 +13:00
Sam Hemelryk dc5e0d1665 Merge branch 'MDL-37563-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-01-22 09:10:31 +13:00
Eloy Lafuente (stronk7) be8bc2de54 Merge branch 'MDL-37577_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-01-21 20:01:46 +01:00
Eloy Lafuente (stronk7) e081622b9b Merge branch 'MDL-35924_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE 2013-01-21 19:44:14 +01:00
Eloy Lafuente (stronk7) ebe2f5a19c Merge branch 'MDL-34050_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-01-21 16:47:32 +01:00
Tim Hunt 876ba8faec MDL-37577 quiz overdue handling: optimise database query
This is the standard trick of adding a redundant WHERE clause to a
subquery to help the database realise that it does not have to inspect
so many rows.
2013-01-21 13:23:27 +00:00
Tim Hunt 9970d909a3 MDL-37599 question import: add missing string.
AMOS BEGIN
 MOV [matcherror,question],[invalidgrade,question]
AMOS END
2013-01-21 12:16:15 +00:00
Petr Škoda a8dc59fc54 MDL-37593 use https for editor script if required 2013-01-21 09:41:01 +01:00
Michael de Raadt e6052102ec MDL-35357 Lesson Module: fixed undefined property for $answerformat 2013-01-21 15:38:48 +08:00
Aparup Banerjee 72389d1133 Merge branch 'w03_MDL-37559_m24_otherusers' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-21 15:26:32 +08:00
Rossiani Wijaya 3895b3459e MDL-37375 Report: fixed blog post link from course activity report 2013-01-21 14:58:20 +08:00
Mark Nelson 55cf5dfd8b MDL-36104 mod_assign: added hidden labels to the feedback input fields 2013-01-21 12:51:38 +08:00
Andrew Davis 3396c400eb MDL-37352 core_grade:fixed some ajax display issues 2013-01-21 12:27:52 +08:00
Rossiani Wijaya 58d633f0b2 MDL-19069 RSS feed block: Removed link for remote RSS feeds on navigation 2013-01-21 12:01:14 +08:00
Rajesh Taneja a19a913d7d MDL-37432 Calendar: If Calendar url is invalid then remove invalid subscription 2013-01-21 10:48:30 +08:00
Rajesh Taneja 76657ed83c MDL-37432 Calendar: Added check for empty calendar url 2013-01-21 10:48:30 +08:00
Dan Poltawski 4ef2160966 Merge branch 'MDL-30769_iframe_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-01-21 10:25:51 +08:00
Dan Poltawski 171c3af461 Merge branch 'wip-mdl-36674-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-01-21 10:15:22 +08:00
Dan Poltawski c44fe3050e Merge branch 'MDL-35074_24_2' of git://github.com/pauln/moodle into MOODLE_24_STABLE 2013-01-21 10:08:58 +08:00
Dan Poltawski 6ee3f386bd Merge branch 'MDL-37527-24' of github.com:damyon/moodle into MOODLE_24_STABLE 2013-01-21 10:03:49 +08:00
Dan Poltawski cf82c45de9 Merge branch 'm24_MDL-36421' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-01-21 09:01:13 +08:00
AMOS bot 537e4d1897 Automatically generated installer lang files 2013-01-21 00:44:53 +00:00
Sam Hemelryk bf14c15fb5 Merge branch 'MDL-37295-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-01-21 10:18:21 +13:00
Sam Hemelryk 9afa0e696e Merge branch 'MDL-35817_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE 2013-01-21 09:46:14 +13:00
Sam Hemelryk c5d97a96e4 Merge branch 'MDL-36757_hidden_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-01-21 09:31:23 +13:00
Petr Škoda 55fc886ea7 MDL-37559 fix display of multiple roles of other users
Credit goes to Tyron Delean, thanks.
2013-01-19 16:51:29 +01:00
Tim Hunt 2b18a45e61 MDL-28512 qtype essay: clean up properly when a question is deleted. 2013-01-18 11:51:47 +00:00
Mark Nelson 2d8e189825 MDL-35924 filemanager: added label for the input field when creating a new folder 2013-01-18 15:36:05 +08:00
Mark Nelson 0147636391 MDL-37275 webservices: ensure a webservice function is chosen before attempting to add to service 2013-01-18 15:34:06 +08:00
Dan Poltawski 7def53379b weekly release 2.4.1+ 2013-01-18 14:30:35 +08:00
Dan Poltawski 425894422b Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-01-18 14:30:30 +08:00
Petr Skoda feb30eda03 MDL-30769 - URL module: always use iframe instead of problematic object tag 2013-01-18 11:24:53 +08:00
Ankit Agarwal 065a7d5b4f MDL-37295 forum: Parse old log entries during restore 2013-01-17 14:33:33 +08:00
Damyon Wiese f2130033d4 MDL-37563 Assignment upgrade: Upgrade conditional activity settings.
Conflicts:

	mod/assign/upgradelib.php
2013-01-17 14:08:52 +08:00
Dan Poltawski cf75be653b Merge branch 'wip-mdl-29534-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-01-17 13:47:44 +08:00
Rajesh Taneja e8835af020 MDL-29534 Forum: Fixed userfrom reference problem 2013-01-17 13:46:49 +08:00
Rossiani Wijaya 6b519ea6cc MDL-35817 login: convert html tag to use html_writer and change <a> tag id to be more specific to login 2013-01-17 13:05:52 +08:00
Rossiani Wijaya 999a594039 MDL-35817 Login: set page focus to error message for login error 2013-01-17 13:05:33 +08:00
Damyon Wiese 48410be620 MDL-37539 Assignment upgrade: Disable submission comments if allow notes was not enabled.
For advanced upload of files only - this setting was stored in var2.

Conflicts:

	mod/assign/submission/comments/locallib.php
2013-01-17 12:16:32 +08:00
Rajesh Taneja c21089c81e MDL-35780 Administration: current user email should be always displayed on participants page 2013-01-17 11:56:56 +08:00
Damyon Wiese 36d7050ded MDL-37540 Assignment upgrade: Upgrade setting "Hide description before due date"
Advanced upload of files has this setting which is stored in var3.
2013-01-17 11:54:27 +08:00
Andrew Davis e7052c0349 MDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade items 2013-01-17 11:37:14 +08:00
Damyon Wiese 5132e88b10 MDL-37543 Assignment upgrade: convert advanced upload files "Send for marking" setting
Advanced upload files assignment type has "Enable send for marking" setting instead
of "Allow resubmissions". Needs special handling in upgrade code to convert to
"Require students click submit button".

Conflicts:

	mod/assign/submission/file/locallib.php
2013-01-17 11:22:35 +08:00
Dan Poltawski 2540839f58 Merge branch 'MDL-37374_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-01-17 10:23:07 +08:00
Eloy Lafuente (stronk7) 7b85d7a014 MDL-37555 Apply realpath() 2 CFG->phpunit_dataroot 2013-01-16 20:54:33 +01:00
Tim Hunt e4863a1668 MDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB. 2013-01-16 19:15:20 +01:00
Tim Hunt db1f584cc2 MDL-37374 questions: fix property_exists calls. 2013-01-16 11:20:58 +00:00
Rajesh Taneja 3fc3fcd333 MDL-32526 Course: After creating course user should be redirected to newly created course
After creating a new course if user has capability to enrol users then
enrol user page should be visible else user should see newly created course
2013-01-16 16:29:11 +08:00
Dan Poltawski 9044bc2f8b Merge branch 'wip-MDL-37536-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-01-16 13:52:07 +08:00
Rajesh Taneja c5a078b25e MDL-35873 Blocks: Made alt-text on block control icons more descriptive 2013-01-16 18:26:27 +13:00
Damyon Wiese 6aafb32f8b MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)
Reported by Mark Neilsen.

Conflicts:

	mod/assign/lib.php
2013-01-16 13:19:11 +08:00
Davo Smith d8613ef967 MDL-31484 backup - repeated restores with anonymised users now works correctly 2013-01-16 11:45:43 +08:00
sam marshall 90cbde0cb7 MDL-34612 Grade condition range validation allows impossible conditions 2013-01-16 09:56:51 +08:00
Rajesh Taneja 30595c294a MDL-37339 Administration: Unique custom profile should not be checked if it's empty.
Currently we have two options for custom profile fields 'Unique' and 'Required'
If value s not entered for unique and not required field then we should allow
duplicate empty values. If value is entered then we should check for unique input.
In case field is unique and required then it should be always checked as required
field can't be empty.
2013-01-16 09:45:51 +08:00
Dan Poltawski d08da96c20 MDL-37313 question: fix trailing whitespace 2013-01-16 09:40:40 +08:00
Dan Poltawski 7a82b70970 Merge branch 'MDL-37313_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-01-16 09:39:54 +08:00
Sam Hemelryk 69f83828fc MDL-37536 cache: fixed typo 2013-01-16 14:23:16 +13:00
AMOS bot e08dbd1076 Automatically generated installer lang files 2013-01-16 00:43:43 +00:00
Sam Hemelryk 7288582633 Merge branch 'wip-MDL-35818-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-01-16 11:03:23 +13:00
Eloy Lafuente (stronk7) 6babcc30ad Merge branch 'MDL-37173-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-01-15 21:56:40 +01:00
Eloy Lafuente (stronk7) c7e4ebf3f3 Merge branch 'MDL-37354-stable24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-01-15 21:51:00 +01:00
Tim Hunt 70688fd72e MDL-31616 block editing: show in subcontexts does not work on category pages.
Thanks to Ian David Wild for pointing to the proper fix.
2013-01-15 20:16:03 +01:00
Eloy Lafuente (stronk7) 38d2c7642d Merge branch 'wip-mdl-37062-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-01-15 20:06:12 +01:00
Eloy Lafuente (stronk7) 0baee36398 NOBUG: 1 more whitespace, was hurting my eyes all the time. 2013-01-15 19:19:52 +01:00
Eloy Lafuente (stronk7) 5bd1e381aa MDL-33117 Whitespace fixes 2013-01-15 19:10:40 +01:00
Eloy Lafuente (stronk7) c1a8fb414e Merge branch 'MDL-34883_unit_tests_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-01-15 18:21:27 +01:00
Eloy Lafuente (stronk7) 0218dd4ccb Merge branch 'MDL-37395-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-01-15 18:17:24 +01:00
Ben Johnson d8088a359e MDL-36421 SCORM: fix SCORM course format new window popups 2013-01-15 23:17:10 +13:00
Dan Poltawski 37784b037e Merge branch 'MDL-37381-stable24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-01-15 14:29:50 +08:00
Dan Poltawski 9d49ca31b1 Merge branch 'MDL-36708-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-01-15 13:56:26 +08:00
Dan Poltawski a79b88e20c Merge branch 'MDL-37162_24' of git://github.com/pauln/moodle into MOODLE_24_STABLE 2013-01-15 13:33:53 +08:00
Dan Poltawski d9babbcce1 Merge branch 'MDL-37374_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-01-15 12:59:46 +08:00
Jason Fowler d4c4b845b8 MDL-30316 - Libraries - improving pagination output to allow a shifting start page for displays of less than 18 pages -- original code provided by Martha (martha dot morelos at gmail dot com) 2013-01-15 12:49:57 +08:00
Dan Poltawski 391e361387 Merge branch 'MDL-29835_24' of git://github.com/pauln/moodle into MOODLE_24_STABLE 2013-01-15 12:41:46 +08:00
Dan Poltawski 03e63438da Merge branch 'MDL-36616-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-01-15 11:48:18 +08:00
Rossiani Wijaya 96d6ab3a12 MDL-34050 Lesson Module: Fixed spacing and removed array_unique() for responses 2013-01-15 11:19:55 +08:00
Damyon Wiese 545b77c8f2 MDL-37430 Course - Make modules created in hidden sections visible when section is made visible. 2013-01-15 11:17:43 +08:00
Dan Poltawski 3b8535a386 Merge branch 'MDL-37413-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-01-15 10:58:36 +08:00
Dan Poltawski b4d896505b Merge branch 'MDL-37194-stable24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-01-15 10:43:29 +08:00
Eloy Lafuente (stronk7) c01b82d4e4 Merge branch 'MDL-37431_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-01-15 00:16:27 +01:00
Marina Glancy b3e8f06d20 MDL-37453 fixing regression from MDL-36550 - label show/hide in AJAX works incorrectly 2013-01-15 00:09:56 +01:00
Petr Škoda 17c88e6ec9 MDL-37483 improve require_login redirect when activity not accessible 2013-01-14 23:30:28 +01:00
Eloy Lafuente (stronk7) bff4fc86e1 Merge branch 'MDL-37485_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-01-14 23:21:53 +01:00
Marina Glancy f939cf3159 MDL-37206 preload course format renderer in course/view.php
Also fixed bug with hardcoded default 'weeks' format
2013-01-15 10:49:13 +13:00
Sam Hemelryk 2dcbaaa68c Merge branch 'MDL-37378_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-01-15 10:42:52 +13:00
Damyon Wiese f6d09222a2 MDL-37030 Assignment: Fix error on download all submissions.
When group submissions and blind marking are enabled, an error is thrown
when a teacher trys to download all submissions in a zip. The fix is to
move the url rewriting from the plugin to the assign class so it is
done in a standard way by all modules. The rewriting is done to make images
in a text editor field resolve correctly.
2013-01-15 10:40:43 +13:00
Rajesh Taneja 8cb601ad4d MDL-36674 Administration: out_as_local_url will check for both http and https url's
out_as_local_url will first check if url passed in wwwroot, if it's not then it will check
if loginhttps is enabled and url is httpswwwroot
2013-01-14 16:01:01 +08:00
Dan Poltawski ee8044f2e6 Merge branch 'wip-MDL-30797-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2013-01-14 15:26:16 +08:00
Adrian Greeve 93b38fc5a6 MDL-30797 - backup groups: Added a parameter to the groups_assign_grouping function.
$timeadded has now been included so that the backup / restore functions can now use
this API rather than duplicating the code.
2013-01-14 15:12:49 +08:00
Adam Olley b03d9255ee MDL-30797 backup: Use correct API call for mapping groups to groupings on import/restore 2013-01-14 15:12:29 +08:00
Dan Poltawski 00dba5bb11 MDL-36297 - increment version number 2013-01-14 15:05:56 +08:00
Dan Poltawski 94c4afe13a Merge branch 'wip-MDL-36297-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2013-01-14 15:05:23 +08:00
Dan Poltawski b90eab06c7 Merge branch 'wip-mdl-29534-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-01-14 14:59:30 +08:00
Anthony Borrow 88d7468a3b MDL-15930 - admin: reorganize logic to allow ->fullnamedisplay to be used as default sort. 2013-01-14 10:34:02 +08:00
Jason Fowler a809b827f1 MDL-35818 - Enrolment - Changing all enrolment method icon alt text attributes to include the name of the course 2013-01-14 09:47:03 +08:00
Sam Hemelryk b54015e60d Merge branch 'MDL-37048-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-01-14 14:08:45 +13:00
Davo Smith 6cf6c3806f MDL-35568 course dndupload - resources created with the same visibility as the section they are dragged onto 2013-01-14 13:55:59 +13:00
Sam Hemelryk 7e7c23fcad Merge branch 'wip-MDL-35885-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2013-01-14 13:39:53 +13:00
Sam Hemelryk 625098abc5 Merge branch 'MDL-36095-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-01-14 12:23:49 +13:00
Sam Hemelryk 7977c782e8 Merge branch 'MDL-36511-24' of git://github.com/srynot4sale/moodle into MOODLE_24_STABLE 2013-01-14 12:12:41 +13:00
Sam Hemelryk 842524812a Merge branch 'm24_MDL-37394' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-01-14 11:46:01 +13:00
Sam Hemelryk 80b6e318fb Merge branch 'MDL-37397-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE 2013-01-14 11:04:40 +13:00
Sam Hemelryk 7c2046b727 Merge branch 'wip-mdl-35780-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-01-14 10:59:47 +13:00
Eloy Lafuente (stronk7) 3e90b10ad8 Moodle release 2.4.1 2013-01-11 22:23:29 +01:00
Tim Hunt 8c11e08765 MDL-37431 question preview: cron performance problem.
This query was performing badly. The solution seems to be to add a
redundant JOIN and WHERE to the subquery.

I renamed the table aliases in the subquery to avoid name collisions
elsewhere. I am afraid that makes the diff rather unhelpful. The
    AND subq_qu.component = :qubacomponent2
line is new. The other lines have just had subq_ added.
2013-01-11 13:05:07 +00:00
Tim Hunt ffdca1520b MDL-37378 quiz restore: timecheckstate not in old backups.
We need to avoid a notice. If the value is missing, setting it to 0 is
fine. It will get sorted out the next time cron is run.
2013-01-11 13:04:50 +00:00
Tim Hunt 4dcede552e MDL-37374 questions: use property_exists rather than isset
$a->field = null; isset($a->field) returns false, which is typical PHP.
I also improve the error handling a bit.
2013-01-11 13:04:31 +00:00
Tim Hunt 198279d303 MDL-37485 plugins overview: require_login before _capability. 2013-01-11 12:52:26 +00:00
Andrew Robert Nicols 283f877719 MDL-37397 Test for a valid select in formautosubmit
Ideally we shouldn't get into this situation, but in cases where the
generated select element is incorrectly configured, we should try and
handle it gracefully with a warning.
2013-01-11 11:50:52 +00:00
Eloy Lafuente (stronk7) 8a646b55f7 weekly release 2.4+ 2013-01-11 12:33:57 +01:00
Michael Aherne 53c07f1644 MDL-27164 groups Do not show multiple instances of the same role as multiple 2013-01-11 11:31:46 +00:00
Eloy Lafuente (stronk7) 72cece6ff4 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2013-01-11 12:16:34 +01:00
Dan Marsden 1e503b8925 MDL-37394 SCORM: Aicc direct url fails with new nav as it has a single sco with no children - allow these to be navigated correctly. 2013-01-11 23:50:05 +13:00
Eloy Lafuente (stronk7) 9b7b6fa33c MDL-37420 rework pg schema (partial backport of 92b00c3) 2013-01-11 10:33:33 +01:00
Jean-Michel Vedrine dce48cf576 MDL-37313 Sample files with images for XML import 2013-01-11 09:37:44 +01:00
Jean-Michel Vedrine af8a122872 MDL-37313 Moodle XML import format should use draft file areas, not arrays 2013-01-11 09:37:42 +01:00
Andrew Robert Nicols e75fe1a7bd MDL-37413 Use correct variable in chooserdialogue 2013-01-11 08:21:14 +00:00
Ashley Holman a78ba9a827 MDL-36616 repository: Fix direct linking to images in Flickr Public. 2013-01-11 15:34:03 +08:00
Jason Fowler 487a6fcc8c MDL-35885 - Wiki - add a legend element to the search wikis form 2013-01-11 15:30:46 +08:00
Dan Marsden 840193d514 MDL-36853 SCORM: get first valid sco instead of array of scos - thanks to Jamie Smith for the fix - fixes PHP warnings when returning to an existing attempt. 2013-01-11 19:51:32 +13:00
Rossiani Wijaya 324e0aa540 MDL-34050 Lesson Module: improved matching question logic for checking user response. This patch will also resolved MDL-36343. 2013-01-11 13:52:40 +08:00
Rossiani Wijaya 69199e4aa2 MDL-34050 Lesson module: Fixed undefined variable for $qtype 2013-01-11 13:52:28 +08:00
Joseph Rézeau e893d6b032 MDL-34050: Lesson module: fixed matching answer format to use text 2013-01-11 13:52:18 +08:00
Damyon Wiese 1c5d23e281 MDL-32341 calendar: get_file_by_hash() expects a hash 2013-01-11 11:56:59 +08:00
Rajesh Taneja 0b55c44e68 MDL-35780 Administration: email display on user profile view page will respect user capability 2013-01-11 10:16:34 +08:00
Eloy Lafuente (stronk7) 43bfcff941 Merge branch 'MDL-37467-blogs_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-01-10 18:20:48 +01:00
David Mudrák a4611b9d02 MDL-37467 Do not provide blog posts via RSS when blogging is disabled 2013-01-10 16:57:10 +01:00
Mark Nelson 5be009245b MDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using count_records_sql incorrectly as well as generating RSS content when no data exists 2013-01-10 11:13:45 +01:00
Frederic Massart 5a2c33b107 MDL-34435 reports: Log category actions
Conflicts:

	version.php
2013-01-10 15:14:38 +08:00
Andrew Robert Nicols a50bf852e4 MDL-36600 Add missing sesskey check when previewing the message 2013-01-10 10:20:45 +08:00
AMOS bot 9c3ef35763 Automatically generated installer lang files 2013-01-10 00:44:11 +00:00
Rajesh Taneja be8868900d MDL-29534 Forum: if forum_replytouser is not set then send forum email using noreplyaddress. 2013-01-09 14:53:04 +08:00
Isaac Marco Blancas 3c3ca35fee MDL-29534 Forum: If forum_replytouser is not set then don't display from user email" 2013-01-09 14:53:04 +08:00
Jerome Mouneyrac ada5df1069 MDL-37354 clean return value for each externallib PHPUnit tests 2013-01-09 13:55:54 +08:00
Aaron Barnes e014ed78dd MDL-36511 course: Save "completion starts on enrolment" disabled state 2013-01-09 15:33:13 +13:00
Marina Glancy 562782a48d MDL-37404 add class 'format-xxx' to the body for the current course format 2013-01-09 14:35:31 +13:00
Eloy Lafuente (stronk7) b56324b829 Merge branch 'w51_MDL-37420_m24_pgschema' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-09 01:32:33 +01:00
Paul Nicholls 490e604bae MDL-37162: Use CSS to make mod show/hide icons not look "clickable" in hidden sections
Previously, the resource toolbox initialiser was using JS to find the show/hide icon, then find its section ancestor, then check if the section was hidden - only to pointlessly set pointer:auto if it was.  That didn't meet the aim stated in the comments ("Disable" show/hide icons (change cursor to not look clickable) if section is hidden), but this patch meets that goal with a single CSS rule.
2013-01-09 11:26:06 +13:00
Andrew Robert Nicols 47ee76344e MDL-36600 user: improve course messaging checks 2013-01-09 09:22:08 +13:00
Eloy Lafuente (stronk7) 844cb63fed Merge branch 'w51_MDL-37152_m24_smtp' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-08 18:02:37 +01:00
Petr Škoda a668f57e75 MDL-37420 add support for db schemas in enrol test 2013-01-08 17:35:59 +01:00
Petr Škoda 543fc34ed9 MDL-37420 add support for more PostgreSQL schemas 2013-01-08 17:35:51 +01:00
sam marshall c3775f93ab MDL-37395 Add .jar filetype so Moodle doesn't incorrectly call it a zip file 2013-01-08 12:50:17 +00:00
Jean-Michel Vedrine 0a32dca4bb MDL-28183 fix for problem during integration
Conflicts:
	question/type/multianswer/question.php
2013-01-08 12:05:45 +01:00
Eloy Lafuente (stronk7) 65a550c484 Merge branch 'MDL-37220_dnd_icon_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE 2013-01-08 11:54:31 +01:00
Jerome Mouneyrac 7c08fb89fb MDL-37194 activity chooser displays entire list of default activities/resources 2013-01-08 18:03:47 +08:00
Andrew Robert Nicols 38727c6bc6 MDL-37173 Stop attempting to set User-Agent from core JS
This leads to some browsers throwing warnings that it is unsafe to set the
User-Agent. It doesn't help us in any way particularly either.
2013-01-08 09:56:24 +00:00
Eloy Lafuente (stronk7) 0f83a143b0 Merge branch 'w51_MDL-37186_m24_tinymceconfig' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-08 10:34:15 +01:00
Eloy Lafuente (stronk7) 793c431543 Merge branch 'w51_MDL-37323_m24_dlgstrings' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-08 10:22:15 +01:00
Jerome Mouneyrac 7059a421ef MDL-37381 core_external::get_component_strings returns wrong format value 2013-01-08 16:25:24 +08:00
Dan Poltawski 2e25f806fb Merge branch 'MDL-32639-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-01-08 14:46:25 +08:00
Petr Škoda f923f7aefe MDL-xxxx show appropriate instance status on user enrolments page 2013-01-08 14:22:28 +08:00
Jason Fowler cb838a36b2 MDL-36620 - Blog, RSS - Preventing Guests from viewing the RSS of site level blogs 2013-01-08 14:06:47 +08:00
Ankit Agarwal 56f4d0ed80 MDL-37106 calendar: Proper capability checks should be done before processing an ical request 2013-01-08 14:02:54 +08:00
Ankit Agarwal 6c806e8384 MDL-36738 calendar: Display events imported details
We should display a the status of events when a new subscription is added. Although this means we need to redirect through an itermediate page.
2013-01-08 13:58:21 +08:00
Ankit Agarwal 5b6e74c85f MDL-36738 calendar: Ical subscription list should display type of event 2013-01-08 13:58:21 +08:00
Dan Poltawski c33a96f676 MDL-28183 - fix trailing whitespace 2013-01-08 12:18:31 +08:00
Dan Poltawski 9910a5d7eb Merge branch 'MDL-28183_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE 2013-01-08 12:17:58 +08:00
Dan Poltawski 7c8fb69b1c Merge branch 'w51_MDL-37191_m24_plugindelete' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-08 11:16:49 +08:00
Paul Nicholls 3dcd751a4b MDL-29835: filemanager - zero means zero, not unlimited
The form_filemanager constructor was using empty() rather than !isset(),
so overwrote maxfiles=0 with the default (-1).  In addition, the JS UI
treated 0 as unlimited - but the non-JS fallback UI treated it as zero.
This would result in a file manager which allowed files to be
chosen/uploaded, which would then vanish into the void when the backend
saw that the maximum number of files was 0.
2013-01-08 16:11:36 +13:00
Dan Poltawski ef42830b87 Merge branch 'MDL-31641_drag_drop_help_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE 2013-01-08 10:54:14 +08:00
Charles Fulton 05f8741cee MDL-35130 shibboleth: remove hard-coded string 2013-01-08 10:51:17 +08:00
Dan Poltawski 9a1ac11640 Merge branch 'MDL-36456-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-01-08 10:30:58 +08:00
Dan Poltawski 04ab55dd4f Merge branch 'w51_MDL-37301_m24_coursecatinfoas' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-08 10:27:00 +08:00
Dan Poltawski b2e3fb3dc9 Merge branch 'w51_MDL-37254_m24_courseinfoas' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-08 10:24:11 +08:00
Sam Hemelryk d72a0aa2c8 Merge branch 'wip-mdl-36958-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-01-08 14:06:50 +13:00
Sam Hemelryk 2be82d5e13 Merge branch 'w51_MDL-35893_m24_perfinstall' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-08 14:00:23 +13:00
David Mudrák 019cc4eae4 MDL-36977 Be more picky when it comes to migrating files in moodle1 backups 2013-01-08 08:54:20 +08:00
David Mudrák 2726d2a6a4 MDL-36977 Add more unit tests for moodle1 backup conversion 2013-01-08 08:54:20 +08:00
Paul Nicholls 9f1396fb23 MDL-35074: grader report - Ease limit on number of students per page
The limit imposed by max_input_vars "applies only to each nesting level of
a multi-dimensional input array"
(http://www.php.net/manual/en/info.configuration.php#ini.max-input-vars).

Turning the grader report fields into arrays (they were all top-level form
fields, i.e. elements of the top-level array) makes the number of students
become the only limiting factor, thereby allowing us to relax the limit on
number of students per page greatly (to 1 less than max_input_vars, for
safety).
2013-01-08 13:16:25 +13:00
Thanh Le 0c49b6c445 MDL-35794 quiz: config for whether Outcomes are advanced settings 2013-01-07 22:40:31 +01:00
Thanh Le 83a23ea878 MDL-35792 question preview: way to update options without restarting.
It is useful, and possible, to update the display options without
restarting the question. You now only have to restart if you are
changing the maximum mark or the behaviour.
2013-01-07 22:36:17 +01:00
sam marshall 331bbb7f05 MDL-36095 Section availability: Make behaviour consistent with activities 2013-01-07 15:56:16 +00:00
Eloy Lafuente (stronk7) f849d1f6fc Merge branch 'w51_MDL-36807_m24_mysocket' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-07 11:44:54 +01:00
Frederic Massart 217d7979b9 MDL-36708 files: Checking the size limit of a draft area does include references 2013-01-07 17:29:04 +08:00
Davo Smith 2e8da707a0 MDL-31641 filemanager - display help message when drag and drop upload is not supported 2013-01-07 08:14:13 +00:00
Didier Raboud f4537d5676 MDL-37157: Normalize short answers before comparison
This ensures that ambiguous Unicode representations can be compared sanely.
Also add some tests to ensure it keeps working.

Thanks to Tim Hunt for the syntax check.
2013-01-07 14:00:13 +08:00
Dan Poltawski 850aa189e4 Merge branch 'w51_MDL-37128_m24_rssrestore' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-07 13:57:02 +08:00
Dan Poltawski c5e96ad32f Merge branch 'w51_MDL-36893_m24_mnetestrict' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-07 13:53:19 +08:00
Dan Poltawski 9acc49eb93 Merge branch 'MDL-27884-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-01-07 13:30:34 +08:00
Andrew Davis 662cfbc7e1 MDL-33117 grade: adding unit tests for the user report function inject_rowspans() 2013-01-07 11:59:58 +08:00
Damyon Wiese d389a2f7f4 MDL-37244 Assignment: Submission comments plugin does not implement comments callbacks.
This allows anyone to view or modify anyone elses submission comments.
2013-01-07 10:49:12 +08:00
Ankit Agarwal 321554d35f MDL-33340 completion: Incorrect logic in hidden field check
Credit to Jody Steele
2013-01-07 10:37:26 +08:00
Simon Coggins 102903f7ab MDL-35991 - use PARAM_LOCALURL for local urls 2013-01-07 10:10:22 +08:00
Rajesh Taneja da2ea965dc MDL-37062 Course: Show one 'Add new course' button
Currently if there is no course and admin/course creator go to create course, he/she see two
'Add new course' buttons.
2013-01-07 09:46:06 +08:00
Dan Poltawski 181b7f5fea Merge branch 'MDL-36667-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-01-07 09:44:59 +08:00
Sam Hemelryk e04f57c95b Merge branch 'MDL-37161-moodle24' of https://github.com/StudiUM/moodle into MOODLE_24_STABLE 2013-01-07 14:15:17 +13:00
Sam Hemelryk b9639c524d Merge branch 'w51_MDL-36212_m24_entities' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-07 13:44:54 +13:00
Tim Hunt 56003ca491 MDL-37068 qformat_learnwise: fix UTF8 and other issues. 2013-01-07 13:40:24 +13:00
Sam Hemelryk 192cb8f894 Merge branch 'w51_MDL-37281_m24_othersnav' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-07 13:35:04 +13:00
Sam Hemelryk 2d7c42275f Merge branch 'MDL-36855-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-01-07 12:05:07 +13:00
Charles Fulton ac41913cea MDL-4781 forum: show discussion link when user has ability to view discussion 2013-01-07 11:15:32 +13:00
Davo Smith 359c790b1c MDL-35887 course dndupload - correct default used for completion tracking when resources created by drag and drop 2013-01-07 11:07:37 +13:00
Sam Hemelryk 49a66d4b68 Merge branch 'MDL-16730-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-01-07 10:15:11 +13:00
Sam Hemelryk 1a5a5f8e9c Merge branch 'w51_MDL-37105_m24_catlimit' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-07 09:52:50 +13:00
Mark Nelson 3735e3d289 MDL-37359 groups: fixing typo in the web service function create_groupings_parameters 2013-01-07 09:47:43 +13:00
Sam Hemelryk 2c6b79365b Merge branch 'MDL-29327_none_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2013-01-07 09:35:07 +13:00
Mark Nelson 1565171e07 MDL-36741 mod_forum: fixed SQL that was generated when either timed posts or groups were enabled 2013-01-07 09:16:35 +13:00
Sam Hemelryk 0c1be2af21 Merge branch 'w51_MDL-37315_m24_ldappaging' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-07 09:09:25 +13:00
Jean-Philippe Gaudreau e5d70123c9 MDL-37161 Backup: Database error caused by grade book settings when importing or restoring a course 2013-01-04 09:54:42 -05:00
Damyon Wiese 3d6b1bf4e3 MDL-36712: Assignment - Do not always send feedback available emails when grade is created
The entry in the assign_grades table contains grades feedback and other settings such as locked.
Only send the student an email about new feedback if it is actually grades or feedback that
has been added. This is done by using another state for the mailed flag (2) which means "unset".
2013-01-04 14:52:14 +08:00
Jerome Mouneyrac 0d268d71d2 MDL-37355 Fix the REST server that didn't send back the cleaned values 2013-01-04 14:37:06 +08:00
Andrew Davis b164a8904a MDL-29327 core_grade: removing some code that is messing up the categories and items screen when no grade categories are used 2013-01-04 08:58:34 +08:00
Ankit Agarwal 78ac8558e0 MDL-36855 scorm: update to api get_scorm_question_count()
get_scorm_question_count() should return 0 not 1 when no attempt is made in a scorm by any student
2013-01-03 14:42:39 +08:00
Sam Hemelryk 118e933e2d MDL-36297 caching: added for HTML purified text 2013-01-03 10:54:57 +13:00
Ankit Agarwal 363ed37e76 MDL-27884 Implement proper username validation during csv import 2013-01-02 14:10:30 +08:00
Ankit Agarwal 3b800be056 MDL-27884 blocks: Correcting config title string
AMOS BEGIN
 CPY [configtitle,block_html],[configtitle,block_tags]
AMOS END
2013-01-02 10:56:58 +08:00
Petr Škoda ef227f1e0f MDL-35893 do not track performance before installation 2013-01-01 15:51:06 +01:00
Petr Škoda 6606784c3f MDL-37323 add support for _dlg strings in our TinyMCE subplugins
Credit goes to Étienne FLORENT, thanks.
2013-01-01 15:26:27 +01:00
AMOS bot a17b3a200e Automatically generated installer lang files 2013-01-01 00:42:59 +00:00
Eloy Lafuente (stronk7) d63a406b02 weekly release 2.4+ 2012-12-30 01:06:09 +01:00
Petr Škoda e6a3c6e1a1 MDL-37315 fix connection reopening in ldap paging 2012-12-30 00:58:20 +01:00
Eloy Lafuente (stronk7) 356513cc80 Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2012-12-30 00:56:49 +01:00
Petr Škoda b1dc798512 MDL-36893 fix mnet E_STRICT issue 2012-12-27 14:33:09 +01:00
Petr Škoda 697871ddcf MDL-37105 prevent fatal error when category limit reached 2012-12-27 13:52:50 +01:00
Petr Škoda 602150068a MDL-37128 fix E_STRICT rss restore issue 2012-12-27 13:40:47 +01:00
AMOS bot eeeac779c8 Automatically generated installer lang files 2012-12-27 00:42:49 +00:00
Petr Škoda c0333c98ea MDL-37301 fix missing AS in select
This was breaking pg 8.3. Credit goes to Thomas Robb, thanks.
2012-12-26 22:31:47 +01:00
Damyon Wiese d59467dfc9 MDL-37037 Assignment Some minor refactoring of the previous patch
This just makes the control flow a bit easier to read.

I also added a continue button to take you back to the grading page.
2012-12-24 12:23:33 +08:00
Michael Aherne c731018d50 MDL-37037 assign Show message if no files to download 2012-12-24 12:23:33 +08:00
Dan Poltawski e17644cca3 Merge branch 'w51_MDL-37233_m24_skype' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-24 11:34:45 +08:00
Dan Poltawski d71b142446 Merge branch 'wip-MDL-37263-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2012-12-24 11:22:48 +08:00
Dan Poltawski b61dd8b299 Merge branch 'wip-MDL-37290-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2012-12-24 10:55:24 +08:00
Dan Poltawski 41bbc35471 Merge branch 'w51_MDL-37283_m24_spell' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-24 10:35:40 +08:00
Sam Hemelryk 0af4bf40ee MDL-37290 course: fixed up navbar when editing categories 2012-12-24 13:06:52 +13:00
Sam Hemelryk b09c5ac837 Merge branch 'wip-MDL-35833-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2012-12-24 11:43:46 +13:00
Raymond Wijaya 3f897939b2 MDL-36966 Assignment: Bug - Student submission appears graded by themselves.
Fix a bug when a student editing his submission after it has been graded, it changes the 'graded by' details to the student's name in the feeback summary
2012-12-24 11:18:43 +13:00
Sam Hemelryk 3124654247 Merge branch 'wip-mdl-37015-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2012-12-24 10:55:19 +13:00
Sam Hemelryk 9a57563b9f Merge branch 'wip-MDL-35653-MOODLE_24_STABLE' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2012-12-24 09:40:44 +13:00
Brian King 190b5e7cbe MDL-37225 reset cachstore_static store when purging 2012-12-24 09:36:13 +13:00
Mark Nelson a8f8537965 MDL-36455 blocks: removed ability to add blocks to the My Moodle page that did not make sense in that context 2012-12-24 09:31:02 +13:00
Petr Škoda f938b1a89b MDL-37283 import tinymce spellchecker 2.0.6.1 2012-12-22 16:45:22 +01:00
Petr Škoda 2a39a4e01c MDL-37281 fix other users current navigation node 2012-12-22 14:59:12 +01:00
Petr Škoda ab7d4ea7ba MDL-37152 remove bogus $mail->IsSMTP() breaking non-smtp mailing
Credit goes to Aurelijus Bruzas, thanks.
2012-12-22 14:48:25 +01:00
Petr Škoda ac4404e0cc MDL-37254 add missing AS keyword 2012-12-22 14:12:30 +01:00
Petr Škoda 0fe16db123 MDL-37233 do not show skype status icon on https sites
Funny that the same company that implemented the IE security warnings is unable to set up SSL on the Skype status server…
2012-12-21 17:27:12 +01:00
Petr Škoda 5c0dd1fadd MDL-37191 do not timeout when uninstalling plugins 2012-12-21 15:59:15 +01:00
Jean-Michel Vedrine a7eec81ec6 MDL-28183 add num parts correct and clear wrong to multianswer 2012-12-21 05:18:02 +01:00
Sam Hemelryk e03782efdd MDL-37263 cache: fixed event invalidation coding error 2012-12-21 10:50:24 +13:00
Petr Škoda eb2d6a23ab MDL-36212 rework html entity conversions
This should resolve all html entity conversion problems in different PHP versions.
2012-12-20 22:48:30 +01:00
Petr Škoda a48b376978 MDL-36807 use our mysql socket logic in adodb tests 2012-12-20 22:41:57 +01:00
Petr Škoda 544f0f9b11 MDL-37186 add the ultimate TinyMCE custom parameter setting 2012-12-20 22:24:46 +01:00
Eloy Lafuente (stronk7) 322af447f5 weekly release 2.4+ 2012-12-20 21:12:50 +01:00
Eloy Lafuente (stronk7) ec39bd51dd Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE 2012-12-20 20:57:11 +01:00
Eloy Lafuente (stronk7) bbb750e1ba Merge branch 'w50_MDL-37171_m24_outdatedexcel' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-20 10:41:55 +01:00
Jason Fowler 73dd2ee2d5 MDL-35833 - Blocks - Adding alt and title attributes to the docked-block panel close button 2012-12-20 10:28:23 +08:00
Rajesh Taneja a1ccc146ac MDL-37015 Resource: link in onclick should not contain html special char 2012-12-20 10:26:29 +08:00
Dan Poltawski 7a6f073415 Revert "MDL-36704: wrap pending conditions in span tags"
This reverts commit 5e9fd83df8.
2012-12-20 08:45:15 +08:00
AMOS bot 76fa287781 Automatically generated installer lang files 2012-12-20 00:40:36 +00:00
Tim Hunt 94c5a8fe82 MDL-32245 question bank: update URL after moving question between categories.
Also, improve the URL when you go to edit the questions in a category.
2012-12-20 12:12:28 +13:00
Petr Škoda d3fdafc358 MDL-37171 fix some more E_STRICT issues
Credit goes to Mark Nelson, thanks.
2012-12-19 09:55:25 +01:00
Davo Smith 606c07ae3e MDL-37220 course dndupload - improved 'add files' icon 2012-12-19 07:46:23 +00:00
Adrian Greeve c6b458edce MDL-35653 - mod/wiki: Force format now lets users edit wiki pages.
Thanks to Tõnis Tartes for part of this solution.

When force format was selected in the options, trying to view the
wiki would redirect to the front page with a message saying that
you do not have permission to edit this page. Students had no way
of viewing any entries or creating the first page.

When in force format it skips a page , which would be considered
uncessary for students, but this means that the group id is not set
and this is what is causing most of the problems.

I also have included a check to see if the title is default and whether
the user has permission to view all groups. In these situations the
intermediate page is displayed.
2012-12-19 08:51:48 +08:00
Eloy Lafuente (stronk7) a8ccdd2880 Merge branch 'w50_MDL-36245_m24_convert' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-18 23:42:53 +01:00
Marina Glancy 656581fa2c MDL-36339 Modify themes to add course headers and footers provided by course format 2012-12-18 21:37:05 +01:00
Matt Oquist 785a713b82 MDL-36958 Forum: Replaced hard-coded numbers with proper defines 2012-12-18 17:24:31 +08:00
Jay Knight cf04387947 MDL-36704: wrap pending conditions in span tags 2012-12-18 15:09:55 +08:00
Dan Poltawski eddec24752 Merge branch 'MDL-37014_webdav_folders_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE 2012-12-18 14:52:33 +08:00
Dan Poltawski f454c9884f MDL-36259 - change case of table alias to match definition 2012-12-18 14:27:40 +08:00
Thanh Le 53f7c0c641 MDL-36259 course short names: ensure it displays when enabled in admin
Fixed 5 Moodle pages that does not display the course short name even if "Display extended course names" setting is on.  In fixing this, search.php also included related minor code to change to minimise DB calls to improve performance.
2012-12-18 14:26:02 +08:00
Dan Poltawski 2de5b09d84 Merge branch 'MDL-30899_24' of git://github.com/dmonllao/moodle into MOODLE_24_STABLE 2012-12-18 09:11:02 +08:00
Damyon Wiese 70c31beef7 MDL-35740 Assignment: Change the assignment index page to use a renderer.
This also cleans up the patch to prevent students from seeing the number of submissions for the assignment.
2012-12-18 08:44:59 +08:00
Raymond Wijaya 901dd625f8 MDL-35740 Assignment: Hide the number of assignment submissions for all students that was visible to all students through the activities block 2012-12-18 08:44:59 +08:00
Tim Hunt 7d3341b000 MDL-36842 quiz: update accessrule upgrade.txt file in master. 2012-12-18 00:18:59 +01:00
Eloy Lafuente (stronk7) 1f60fe8a23 Merge branch 'w50_MDL-37171_m24_outdatedexcel' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-18 00:13:55 +01:00
Sam Hemelryk 730271af49 Merge branch 'w50_MDL-36475_m24_zindexesgrrr' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-18 10:42:49 +13:00
Sam Hemelryk 8a35efacd7 Merge branch 'MDL-36490_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2012-12-18 10:40:32 +13:00
Adrian Fish cfa9c7e1d0 MDL-37035 Pass user locale after course locale. 2012-12-18 10:32:24 +13:00
Sam Hemelryk acb011dc20 Merge branch 'w50_MDL-37111_m24_forumsinglefirst' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-18 10:24:42 +13:00
Sam Hemelryk a7a1adf4e0 Merge branch 'MDL-37176_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE 2012-12-18 10:12:22 +13:00
Rossiani Wijaya e60bae3575 MDL-35530 Lesson Module: Add question text to facilitate grading 2012-12-18 10:08:53 +13:00
Sam Hemelryk ddb5fb5980 Merge branch 'wip-MDL-35056-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2012-12-18 09:57:11 +13:00
Tim Hunt b70a545c88 MDL-32245 question bank: fix coding style in categories.php 2012-12-18 09:52:30 +13:00
Thanh Le c383f33bbf MDL-32245 question bank: fix moving categories between contexts. 2012-12-18 09:52:30 +13:00
Sam Hemelryk 13683200d6 MDL-36812 grader_report: Fixed whitespace on integration 2012-12-18 09:48:01 +13:00
Nadav Kavalerchik 7be97bd89d MDL-36812 - Enabling grade_report_fixedstudents, shows the user's list on the left side of the page, in RTL mode (theme/standard) 2012-12-18 09:48:01 +13:00
Sam Hemelryk cd281ce1b4 Merge branch 'MDL-29733_master' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2012-12-18 09:42:41 +13:00
David Monllao adc1d7b2a5 MDL-30899 moodle-core-notification Overridding default footer padding 2012-12-17 16:27:30 +08:00
David Monllao b4454b133f MDL-30899 moodle-core-notification Adding ARIA attributes 2012-12-17 16:27:08 +08:00
David Monllao 520a601f14 MDL-30899 moodle-core-notification Adding close button title for accessibility 2012-12-17 16:27:01 +08:00
David Monllao 0409483d5f MDL-30899 moodle-core-notification Adding focus to non modal windows 2012-12-17 16:26:56 +08:00
David Monllao 2d07933c17 MDL-30899 moodle-core-notification Adding H1 to notifications headers 2012-12-17 16:26:43 +08:00
David Monllao 6eabdb6d8c MDL-30899 block_community Changing from overlay to panel references 2012-12-17 16:26:09 +08:00
David Monllao 291455cecd MDL-30899 modchooser Changing from overlay to panel references 2012-12-17 16:26:03 +08:00
David Monllao b76204d589 MDL-30899 moodle-core-notification Replacing Y.Overlay for Y.Panel
References to lightbox are still there to maintain the same
external API but are converted to a modal attribute internally,
same with closeButton, now it uses the Y.Panel close button
2012-12-17 16:25:51 +08:00
Dan Poltawski e8e9393e76 Merge branch 'w50_MDL-36493_m24_mysql' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-17 15:29:07 +08:00
Joseph Rezeau 231f758404 MDL-37114 quiz form validation: feedback boundaries.
The feedback boundaries must either be a number or a percentage.
We were not correctly validating the non-percentage case.
2012-12-17 15:26:07 +08:00
Andrew Davidson e92d664dd2 MDL-37034 - Added appropriate name to category settings navigation node 2012-12-17 15:21:57 +08:00
Dan Poltawski 973fe984cd Merge branch 'w50_MDL-36597_m24_courselang' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-17 13:53:06 +08:00
Mark Nelson 4548df3155 MDL-29334 mod_data: if site-wide presets created in <= 1.9 exist convert them to 2.x 2012-12-17 13:48:15 +08:00
Rajesh Taneja c874cee03a MDL-36736 course: Availability information should not be visible for hidden modules
If user is viewing hidden module, availability information should only be visible to
user when editing and module is visible. If editing and module is hidden, then hide
availablilty information as it's invalid.
When user is not editing and activity is hidden then don't add availability information.
2012-12-17 12:09:30 +08:00
Rajesh Taneja caeb7f90b0 MDL-36736 course: Availability information will use hide class for hidding 2012-12-17 12:09:30 +08:00
Dan Poltawski da264959f2 Merge branch 'wip-MDL-25928-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2012-12-17 12:05:12 +08:00
Dan Poltawski 41e1109c5f Merge branch 'wip-MDL-35874-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2012-12-17 11:52:59 +08:00
Dan Poltawski 209b2f7b3e Merge branch 'wip-MDL-35979-s24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2012-12-17 11:48:39 +08:00
Dan Poltawski 503325ddcb Merge branch 'MDL-37078-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2012-12-17 11:37:02 +08:00
Damyon Wiese 41575c5571 MDL-37165 Assignment: Oracle fix for count_submissions_with_status (and friends).
Oracle does not like the use of AS after a join.
2012-12-17 11:31:31 +08:00
Sam Hemelryk 73f60c1886 MDL-25928 course: Fixed course info on the combo list to be a popup 2012-12-17 16:03:34 +13:00
Petr Škoda dc7c91ae67 MDL-37171 fix multiple spreadsheet related PHP4isms 2012-12-15 12:38:12 +01:00
Petr Škoda 15dbd27efa MDL-36245 add tests for the buggy utf-8 to utf-8 conversion 2012-12-15 11:50:44 +01:00
Petr Škoda 9a05bd0f8f MDL-36245 try to workaround buggy iconv() when converting text from utf-8 to utf-8 2012-12-15 11:50:43 +01:00
Petr Škoda 524e1ce789 MDL-36475 tweak zIndexes once more
The expected ranges are now:
* 0-1000 for normal code
* 5000-5999 for TinyMCE
* 7000-8999 for filepicker and filemanager

This patch fixes also incorrect location of "MDL-25736 - French spellchecker fixes." modification reminder.
2012-12-15 11:47:16 +01:00
Petr Škoda 3d4de0bc4e MDL-36493 improve timeout handling in mysql upgrade
Credit goes to Mark Nielsen, thanks.
2012-12-15 11:44:18 +01:00
Petr Škoda 1264dd11a0 MDL-36493 improve performance of mysql unsigned/lob upgrade 2012-12-15 11:44:18 +01:00
Petr Škoda 599e7fe006 MDL-37111 copy first post files in single type forum using intro options
This patch also removed the delete button from the first post in single
discussion type forum.

Edit button in the first post leads to the forum edit page now, this should
prevent other problems throwing first post and intro out of sync.
2012-12-15 11:24:16 +01:00
Petr Škoda b768c6f77a MDL-36597 strip '_utf8' from all course.lang fields 2012-12-15 11:16:12 +01:00
Eloy Lafuente (stronk7) 4651e4e464 MDL-37176 timezones: updated to 2012j 2012-12-14 20:08:19 +01:00
Eloy Lafuente (stronk7) 4c7e6ea021 weekly release 2.4+ 2012-12-14 13:31:08 +01:00
Frederic Massart 46b0673732 MDL-36456 repository: S3 handles errors in a nicer way 2012-12-14 17:57:19 +08:00
Damyon Wiese 9c2d41fce2 MDL-30700 tablelib: Fixed get_sort_for_table to work with text sorting columns for oracle
This change stores the list of columns that require text sorting in the session,
so the static function "get_sort_for_table" can work without any additional parameters.
2012-12-13 10:32:23 +01:00
Jason Fowler c5148e0ab6 MDL-35874 - Blocks - Adding a label to the 'Add a block' block's select field 2012-12-13 15:09:45 +08:00
Jason Fowler 8bd65e7aaa MDL-35056 - Backup/Restore - Converting the 'Unmet Dependencies' Message to be a Developer Debug message to make moodle less confusing to the average user 2012-12-13 11:10:56 +08:00
Tim Hunt 4dbdc18fd8 MDL-36897 quiz review: fixup previous commit. 2012-12-13 09:54:28 +08:00
sam marshall 9789d825c2 MDL-37078: Restore - section restore fails with multiple availability conditions 2012-12-12 12:15:41 +00:00
Davo Smith 8f0019214e MDL-37014 repository_webdav - strip the server URL from file & folder paths returned by webdav lib (if present) 2012-12-12 08:55:17 +00:00
Frederic Massart 45cff73a1b MDL-32639 files: Zipping a folder does not overwrite existing files 2012-12-12 14:50:10 +08:00
Frederic Massart aa0cd4a7ef MDL-32639 files: Improved File Manager download and zip support
Conflicts:

	lib/filestorage/zip_packer.php
2012-12-12 14:50:10 +08:00
Vadim Dvorovenko 785e3deb4d MDL-32639 files: Removing '0' start folder in archives created with filemanager
Signed-off-by: Vadim Dvorovenko <vadimon@mail.ru>

Conflicts:

	lib/filestorage/zip_archive.php
2012-12-12 14:43:45 +08:00
Sam Hemelryk 7a4b7c5e18 MDL-33448 enrol_manual: Reduced JS get_string calls for the yui widget 2012-12-12 09:37:36 +08:00
Sam Hemelryk dc5c56e90c MDL-33448 enrol_manual: Reordered things to improve JS performance when enrolling users 2012-12-12 09:37:36 +08:00
Cathal O'Riordan 26679bee33 MDL-36644 Assignment: prepend the course upload limit to the options array
Ensure that the course upload limit is the first option in the list of available choices for the Maximum submission size select.
2012-12-12 08:57:13 +08:00
Dan Marsden 1076d79905 MDL-35737 SCORM: when scorm_parse is called and external scorm manifest use always update the package. 2012-12-12 08:44:00 +08:00
Paul Nicholls 0034f04164 MDL-27619: Prevent teachers from turning course Outcomes into site-wide ones
Similar to the issue which allowed teachers to create site-wide scales by editing a course-specific scale (MDL-24682), teachers could also promote a course-specific scale to a site-wide (standard) by editing it.  As with MDL-24682, removing the course ID check (leaving just the capability check) prevents this unauthorised creation of site-wide (standard) outcomes.
2012-12-12 11:10:35 +13:00
Paul Nicholls 1ff2b56319 MDL-32880: Add moodle1 backup converter for rss_client block.
Creates a shell rss_client.xml file, which contains no feeds.  This makes it behave the same as restoring a Moodle 1.9 backup into a different 1.9 site - the block is created, its title is as per the original course, but it has no feeds selected (and none are added to the site's feed list).
2012-12-11 22:49:13 +01:00
Paul Nicholls 4d9b4e9782 MDL-32880: Add moodle1 backup converter for html block.
This converter processes the HTML block's content, migrating any referenced files.
2012-12-11 22:49:05 +01:00
Paul Nicholls f51fdc9bb7 MDL-32880: moodle1 backup converter: add generic block handler
This handler will automatically be used for any block which does not provide its own handler, and should be subclassed by any block which needs to do anything extra (or different).

This commit incorporates contributions from Mike Churchward and API design suggestions from David Mudrak.
2012-12-11 22:48:54 +01:00
Matteo Scaramuccia f1c403dcec MDL-36641 Missing HTTP check when using an external resource 2012-12-11 22:42:42 +01:00
Sam Hemelryk ab1f9aa3a4 MDL-29805 redirect: added check REQUIRE_CORRECT_ACCESS is true 2012-12-12 09:46:55 +13:00
Sam Hemelryk 1ce6bdd1dd Merge branch 'MDL-29805-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2012-12-12 09:45:17 +13:00
Jerome Mouneyrac e20e67161c MDL-35593 core_webservice_get_site_info returns version number set to PARAM_TEXT and PARAM_FLOAT 2012-12-12 09:39:04 +13:00
Sam Hemelryk c545dcad4f Merge branch 'wip_24_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_24_STABLE 2012-12-12 09:34:44 +13:00
Sam Hemelryk 9e9dd64c35 Merge branch 'MDL-36321_message_participants_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE 2012-12-12 09:29:12 +13:00
Damyon Wiese c6c7a7be8c MDL-30700 Assignment 2.2: Added text_sorting function to tablelib
Allows oracle to sort by text (clob) columns (should be used sparingly).
2012-12-11 19:57:57 +01:00
Eloy Lafuente (stronk7) e958133ca6 MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:12:03 +01:00
Dan Poltawski 9261144beb Merge branch 'w49_MDL-36447_m24_gdtest' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-11 17:54:37 +08:00
Tim Hunt 71cc181bac MDL-37098 quiz: event handler fails deleting group with no overrides
This was a regression from MDL-35717.
2012-12-11 17:52:04 +08:00
Jean-Michel Vedrine cf617e112f MDL-36243 question->questiontext and question->generalfeedback should always be strings 2012-12-11 16:24:24 +08:00
Dan Poltawski 865485fc54 Merge branch 'wip-MDL-36108-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2012-12-11 16:03:34 +08:00
Jason Fowler a595b4dacb MDL-36108 - Blocks - Online User block's user image's alt attribute is now empty to prevent repetition of text for screen readers 2012-12-11 15:50:31 +08:00
Dan Poltawski 7c431a345f Merge branch 'wip-MDL-36938-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2012-12-11 15:19:08 +08:00
Damyon Wiese 4dbc9b0a64 MDL-36712: Assignment grading with custom scale is affected by the current language 2012-12-11 14:01:01 +08:00
Damyon Wiese 9242214612 MDL-36591 Assignment - rewrite image urls in online text summaries 2012-12-11 13:56:58 +08:00
Tim Hunt 4832c70022 MDL-36897 quiz: redirect teachers from summary to review page.
There is already logic like this at the top of attempt.php. If the
teacher arrives at one of these pages for a student's attempt, for
example by clicking a link in the logs, then they should be redirected
to the review page to see the students attempt in its current state.
2012-12-11 13:54:47 +08:00
Andrew Robert Nicols 54fdd4c0e9 MDL-34791 AJAX Update a graded activity's title in the gradebook on rename 2012-12-11 13:22:56 +08:00
sam marshall 0324045e4f MDL-36808 Completion: Incorrect escaping for activity name in completion tickbox 2012-12-11 12:19:32 +08:00
Dan Poltawski fac9ba991b Merge branch 'w49_MDL-36983_m24_ordertext' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-11 12:09:34 +08:00
Dan Poltawski ae5ecea065 Merge branch 'w49_MDL-36892_m24_enrolreadme' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-11 12:07:13 +08:00
Tim Hunt 6357dd08b6 MDL-36845 excel export: don't output invalid sheet names.
We should clean any proposed worksheet name, to remove the characters
that Excel does not allow.
2012-12-11 11:59:20 +08:00
Adam Olley c15b286f88 MDL-36828: mod_scorm: Allow deletion of scorm modules if no scorm_scoes data exists 2012-12-11 11:44:24 +08:00
Dan Poltawski 4afa0b50c7 Merge branch 'wip-MDL-36110-s24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2012-12-11 11:33:14 +08:00
Dan Poltawski b90b9b83bd Merge branch 'wip-MDL-35884-s24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE 2012-12-11 11:17:33 +08:00
Tim Hunt 79bf1e37ca MDL-36650 don't change question timecreated or timemodified on restore. 2012-12-11 16:11:17 +13:00
Matt Petro 95ae9d9e5e MDL-36025 qtype calculated: Fix handling of "-0" 2012-12-11 11:07:24 +08:00
Sam Hemelryk 7027fe4538 Merge branch 'w49_MDL-36731_m24_uploadestrict' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-11 16:04:19 +13:00
Damyon Wiese 50f3d7b5ea MDL-35476 Assignment: Make submissions_open public so it can be used by plugins 2012-12-11 10:49:30 +08:00
Rossiani Wijaya 22fc0c5e9b MDL-36905 accessibility for assignment grading: add label for grading actions and operations select options 2012-12-11 15:44:57 +13:00
Sam Hemelryk 6ff1745873 Merge branch 'MDL-36916' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2012-12-11 15:42:08 +13:00
Luke Tucker 505530eaf5 MDL-34052 assignment - Disable submission and feedback plugins based on assign type when upgrading 2012-12-11 10:39:32 +08:00
Sam Hemelryk a2630c08ae Merge branch 'w49_MDL-36936_m24_composerdev' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-11 15:35:04 +13:00
Dan Poltawski fddbdb79db Merge branch 'w49_MDL-31424_m24_paypalcase' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-11 10:31:36 +08:00
Sam Hemelryk 1c90b9976d Merge branch 'w49_MDL-37060_m24_sessinit' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-11 15:27:14 +13:00
Sam Hemelryk 35cb0e4a4c Merge branch 'MDL-36942' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2012-12-11 15:04:22 +13:00
Sam Hemelryk ada098890b Merge branch 'MDL-36954' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2012-12-11 15:00:00 +13:00
Jerome Mouneyrac 2e8b836243 MDL-36773 timezone inconsistency => some number support decimal other don\'t - Original patch author: Nathan Mares 2012-12-11 09:57:22 +08:00
Sam Hemelryk b004c163ee Merge branch 'wip-mdl-37017-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2012-12-11 14:53:49 +13:00
Sam Hemelryk 6d0c04c208 Merge branch 'w49_MDL-37061_m24_invalidlang' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-11 14:44:21 +13:00
Andrew Davis 29a7d7a1c1 MDL-36321 core_message: made the course participants list correctly show if course participants are contacts or not 2012-12-11 08:55:16 +08:00
Sam Hemelryk eda1d3f37a Merge branch 'w49_MDL-29442_m24_entityutf8' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-11 10:22:06 +13:00
Damyon Wiese 6466396f38 MDL-36263 Assignment: Do not count submissions of unenrolled users 2012-12-11 10:12:26 +13:00
Damyon Wiese 5b2313c26c MDL-36908 Assignment: Additional fixes for preventing empty submissions 2012-12-11 10:12:23 +13:00
Charles Fulton 473eadfe10 MDL-37020 auth_shibboleth: check if target variable is actually set 2012-12-11 09:48:41 +13:00
Sam Hemelryk 52d4168038 Merge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle into MOODLE_24_STABLE 2012-12-11 09:42:29 +13:00
Sam Hemelryk c6bd16545e Merge branch 'MDL-36805-master' of git://git.luns.net.uk/moodle into MOODLE_24_STABLE 2012-12-11 09:16:43 +13:00
Adrian Greeve 517a2dbe84 MDL-37011 - themes: Fixed the alignment of the edit and help icon on the participants page. 2012-12-11 08:43:19 +13:00
Iñaki Arenaza 88d48cd51f MDL-37088 auth_ldap: bad operator in ldap sync_user() method 2012-12-10 16:51:49 +01:00
Dan Poltawski a5ff28cc9f MDL-36755 course_overview block: fix for fix.
I will stop commiting now.
2012-12-10 19:44:26 +08:00
Dan Poltawski 1b2cf98bb0 MDL-36755 course_overview block: fix idiot version
I will shoot the programmer responsible for this mess.
2012-12-10 19:42:29 +08:00
Dan Poltawski 86e28894f4 Merge branch 'w49_MDL-36737_m24_glossstrict' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-10 19:37:31 +08:00
Dan Poltawski c125bb553d Merge branch 'MDL-36755_master' of git://github.com/markn86/moodle into MOODLE_24_STABLE
Conflicts:
	blocks/course_overview/version.php
2012-12-10 19:33:21 +08:00
Dan Poltawski 4ac455d9a4 MDL-36167 fix trailing whitespace 2012-12-10 17:36:31 +08:00
Damyon Wiese 3b7a18f2e5 MDL-36167: Assignment quickgrading fix when there is no grade (ensure feedback still saves)
This patch modifies the previous on by Luke Tucker so that the lastmodified hidden field
is always added to the quickgrading form even if there is no grade for the assignment. This
ensures that the lastmodified checks still work (to prevent teachers overwriting each
others feedback) and feedback is saved when there is no grade.
2012-12-10 17:36:31 +08:00
Luke Tucker a13a1707bc MDL-36167: Update all users in assignment quickgrade form to ensure feedback is saved 2012-12-10 17:36:30 +08:00
Tim Hunt 6812769f8f MDL-36732 Cloze qtype: review marks should not depend on feedback.
The various review options should be independent.
2012-12-10 15:18:14 +08:00
Rossiani Wijaya 2f860b4ded MDL-36549 Lesson module: fixed strict standards errors 2012-12-10 14:18:55 +08:00
Kirill Astashov d84c21dfcc MDL-36856: Fix method name misspelled in two places in mod_assign 2012-12-10 14:04:37 +08:00
Damyon Wiese 0e3c1231da MDL-36835 Assignment: Do not show javascript warning when toggling quickgrading 2012-12-10 14:02:14 +08:00
Dan Poltawski 71e8ee1c33 Merge branch 'MDL-36538_webdav_memory_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE 2012-12-10 13:13:03 +08:00
Dan Poltawski 8938f0848e Merge branch 'w49_MDL-35456_m24_paypal' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2012-12-10 12:03:23 +08:00
Tim Hunt 0e73e16460 MDL-35404 question export: make it work with slasharguments off.
Thanks to Brian King for working out the problem and how to fix it. I am
just committing his patch.
2012-12-10 11:37:17 +08:00
Dan Poltawski 9321379b10 Merge branch 'wip-MDL-36939-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE 2012-12-10 11:08:51 +08:00
Jerome Mouneyrac c91c7fcded MDL-30961 get_course_contents: returned activity name should not be check against PARAM_TEXT, it could be anything 2012-12-10 15:00:00 +13:00
Andrew Davis 0663096dc6 MDL-36680 core_grade: fixed grade_report::blank_hidden_total() and added unit tests 2012-12-10 09:56:45 +08:00
Michael Aherne 7a9e253405 MDL-36946 theme Use server default theme before standard 2012-12-10 14:43:56 +13:00
Sam Hemelryk 5e6b64571c Merge branch 'MDL-34592_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2012-12-10 14:28:33 +13:00
Sam Hemelryk c446a0fca2 Merge branch 'MDL-36608_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2012-12-10 14:24:18 +13:00
Sam Hemelryk 07f89a017c Merge branch 'MDL-36978_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2012-12-10 14:21:25 +13:00
Sam Hemelryk b8b1926e2f Merge branch 'MDL-36579_modLtiBackupFields' of git://github.com/moodlerooms/moodle into MOODLE_24_STABLE 2012-12-10 14:15:54 +13:00
Mark Nielsen 4d5970ea63 MDL-36607: Improve block drag and drop
* Adding support for subpage
* Adding support for regions that do not start with "side-"
2012-12-10 14:12:50 +13:00
Mark Nelson 656cea20a6 MDL-35954 javascript: prevent JS from being triggered on select box by clicking on already selected option 2012-12-10 14:08:52 +13:00
Mary Evans e9f8261131 MDL-34592 theme_magazine: Fixes the report grader fixed column misalignment in magazine/style/core.css theme, plus fixes all CORE themes with minor adjustment to grade/report/grader/style.css 2012-12-09 23:32:04 +00:00
Itamar Tzadok d87a55fc2b MDL-36433 Forms lib - Added dash escaping to validation script getter. 2012-12-10 12:13:54 +13:00
Dan Poltawski b0c87306a6 MDL-36764 ddl/oracle: fix misleading comment 2012-12-10 11:54:28 +13:00
Dan Poltawski 38ab68e6ab MDL-36778 course - prevent undefined index warnings
When logged in as a guest the mform didn't set userid.
2012-12-10 11:51:57 +13:00
Dan Poltawski 0e7cadca03 MDL-36887 quiz: reorder upgrade.txt's 2012-12-10 11:49:03 +13:00
Andrew Robert Nicols efd08cdc2b MDL-36640 Logging: Correct testing of log->info.
log->info sometimes contains additional information which can be looked up
from other tables. This should only be attempted if the field is numeric,
but the CSV, XLS, and ODS outputs were not making this check.

There is an additional case for the print_mnet_log function which has not
been covered - this is because the mnet logging is currently broken beyond
the scope of this bug rendering this section untestable. These issues are
raised in MDL-36642.
2012-12-10 11:43:35 +13:00
Andrew Robert Nicols 7e61737f3d MDL-36918 Decode HTML entities on ajax update title 2012-12-10 11:15:55 +13:00
Andrew Davis 138025470f MDL-36162 core_message: string clean up 2012-12-10 11:04:18 +13:00
Andrew Davis 8b72167d0e MDL-36162 core_message: removed the unnecessary and confusing course URL parameter as well as fixing the broken breadcrumb 2012-12-10 11:04:13 +13:00
Andrew Davis f92305bfa9 MDL-36761 core_grade:shifted a call to count() out of a loop 2012-12-10 10:54:43 +13:00
Sam Hemelryk 0b4767ca50 Merge branch 'MDL-34591_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE 2012-12-10 10:48:59 +13:00
Kevin Wiliarty 1c50e53a05 MDL-35221 mod_feedback: replace checkbox with advcheckbox for all requirable feedback question types 2012-12-10 10:41:48 +13:00
Adrian Greeve a3301036d6 MDL-36906 - mod_data: Latitude and Logitude error fix.
Thanks to Marcus Boon for providing a patch for this issue.

mod/data/field/latlong/kml.php was missing a context variable.
This was causing an error when trying to download a kml file for
google earth. This variable has now been included.
2012-12-10 10:34:29 +13:00
Adrian Greeve c7a34ab704 MDL-36915 - mod/data: A database with no entries no longer displays the export to portfolio button. 2012-12-10 10:27:42 +13:00
Sam Hemelryk 1b696de61b Merge branch 'wip-MDL-37026-MOODLE_24_STABLE' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2012-12-10 10:23:44 +13:00
Adam Olley f4d4c73899 MDL-33125: core_backup: Prevent import/activity duplication from duplicating manual grade items 2012-12-10 10:20:03 +13:00
Petr Škoda da0cf7f883 MDL-36447 skip file preview test if GD not available 2012-12-09 19:22:36 +01:00
Andreas Grabs 7c3f70812e MDL-34591 - paypal does not allow unenrol 2012-12-09 19:10:26 +01:00
Mary Evans f5eabd12db MDL-36490 theme_standard: reduces the 15px radius down to 3px in style/css3.css for .generalbox objects 2012-12-09 18:05:03 +00:00
Mary Evans db1dd3e550 MDL-36608 theme_sky_high: Fixes missing background in sdmin pages by removing incorrect CSS in style/admin.css 2012-12-09 17:44:37 +00:00
Petr Škoda f48902e139 MDL-29442 add missing utf-8 to entity html encoding and decoding 2012-12-09 18:22:16 +01:00
Petr Škoda 7b03292e24 MDL-37061 always validate lang when setting session user
This should resolve problems with TinyMCE langs and some unknown MUCH caching issue.
2012-12-09 11:30:05 +01:00
Mary Evans 2a6e3435d0 MDL-36978 theme_standardold: fixes misplaced block region check in layout/frontpage.php which, with hindsight should have been fixed in MDL-23226. 2012-12-08 22:50:33 +00:00
Petr Škoda 0411eed2cb MDL-36737 fix random glossary E_STRICT issue 2012-12-08 14:44:49 +01:00
Petr Škoda 365ef195b5 MDL-31424 compare PayPal emails case-insensitively
Credit goes to Chris Follin, thanks!
2012-12-08 13:17:10 +01:00
Petr Škoda 8c3547554b MDL-37060 prevent notice in session_get_instance() 2012-12-08 12:31:40 +01:00
Petr Škoda 324efa55e3 MDL-35456 use HTTP 1.1 for PayPal IPN 2012-12-08 11:58:43 +01:00
Eloy Lafuente (stronk7) 0b7c52dd4c weekly release 2.4+ 2012-12-08 02:56:23 +01:00
Petr Škoda cf31390c6f MDL-36936 require phpunit as composer --dev only 2012-12-07 18:20:42 +01:00
Petr Škoda 5af62aa90a MDL-36892 delete outdated enrol info 2012-12-07 17:16:28 +01:00
Davo Smith cf839b4396 MDL-36538 repository_webdav - save files directly to local filesystem, rather than buffering in memory 2012-12-07 09:19:21 +00:00
Jason Fowler 257a5d1299 MDL-35884 - Course - Remove text from ALT attribute for activity chooser 2012-12-07 13:52:32 +08:00
Rajesh Taneja e6d4708fcf MDL-37017 My Moodle: Course name should be fullname of course 2012-12-07 11:58:07 +08:00
Sam Hemelryk f9870842bd MDL-36939 cache: instance form validation now handles errors properly 2012-12-07 08:37:03 +13:00
Sam Hemelryk 2d7173d0c7 MDL-36938 cache: test performance script checks requirements now 2012-12-07 08:36:56 +13:00
Petr Škoda 4682fc7c38 MDL-36983 fix incorrect test method name
Credit goes to David Scotson, thanks.
2012-12-06 15:32:46 +01:00
Petr Škoda 15a77653e4 MDL-36731 fix E_STRICt issue when creating new groups in user upload 2012-12-06 13:15:41 +01:00
Dan Poltawski 9b1f784178 Merge branch 'wip-MDL-36960-m24' of git://github.com/amygroshek/moodle into MOODLE_24_STABLE 2012-12-06 12:04:08 +08:00
Adrian Greeve 44bfbe1e15 MDL-37026 - lib: The function user_can_assign() returns true for admins. 2012-12-06 11:04:34 +08:00
Dan Poltawski 0c767bf6cc Merge branch 'MDL-36963-deployment-backup_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2012-12-06 10:57:13 +08:00
David Mudrák 81c89dd705 MDL-36963 Do not attempt to remove the root folder of a plugin during the update deployment
There is no need to move the root folder of a plugin during the update
deployment. We just need to operate with its contents. So the web server
process can have the write access for the plugin folder only.
2012-12-06 02:45:16 +01:00
David Mudrák b46ee168ef MDL-36963 Add unit tests for directory operations in mdeploy.php 2012-12-06 02:45:16 +01:00
David Mudrák e399d32694 MDL-36963 Improve mdeploy worker::remove_directory() method
The additional parameter allows to use this method without actual
removing the root of the path. That is, it is now possible to remove
the content of a folder only.
2012-12-06 02:35:22 +01:00
David Mudrák 606e2c8ebe MDL-36963 Improve mdeploy worker::move_directory() method
The additional parameter allows to use this method without actual
removing the root of the source location. That is, it is now possible to
move the content of a folder only.

Also, a small refactoring happened here as we will need a variant of
this method that does not throw exception if the target already exists.
2012-12-06 02:31:36 +01:00
Sam Hemelryk c6e0d385c3 MDL-36341 calendar: fixed JS bug with popup node setter 2012-12-06 02:25:14 +01:00
David Mudrák 31a3bcc933 MDL-37003 Fix repeated line in update notification email
There was a problem experienced after 2.4.0 release because the version
of the 2.4.0 release was the same as 2.5dev release. So the version
value matched twice in the loop and the line was repeated in the email.
2012-12-06 01:50:32 +01:00
David Mudrák acade5443f MDL-36943 Do not notify about already installed updates
Before this patch, the available_update_checker::cron_notifications()
method accessed the availableupdates property. But for plugins, that property
basically contains the most recent version available. So we were missing
the check against the actual version installed.

The fix was simple - obtain available updates via the available_updates()
method that performs the check.
2012-12-06 01:50:21 +01:00
Marina Glancy 113105bf9c MDL-36840 Set course.format to 'site' for site-course 2012-12-05 10:28:12 +08:00
Jason Fowler dd9f2b1cca MDL-35979 - Commenting - Adding an empty alt attribute to the javascript generated delete icon for comments 2012-12-05 10:02:31 +08:00
Amy Groshek 90d740364b MDL-36960 - fix broken horizontal positioning of titles for docked blocks 2012-12-04 18:07:25 -06:00
Jason Fowler 89bc7e7b6e MDL-36110 - Blocks - Community finder icon alt attribute is now empty 2012-12-04 15:17:07 +08:00
Jerome Mouneyrac 5c58a540ea MDL-29805 add REQUIRE_CORRECT_ACCESS define + return error code when AJAX_SCRIPT fails 2012-12-04 13:44:48 +08:00
Eloy Lafuente (stronk7) 325e266e95 NOBUG: Bump backup version for 2.4 2012-12-03 21:46:18 +01:00
69886 changed files with 1756480 additions and 8508131 deletions
-185
View File
@@ -1,185 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Generates tsconfig.aliases.json for cross-component TypeScript imports.
*
* Moodle ESM source files can import from other components using the alias
* scheme @moodle/lms/<component>/* (e.g. @moodle/lms/core/SomeUtil). This
* file reads the Moodle component registry (.grunt/components.js), finds every
* component that has a js/esm/src/ directory, and writes the corresponding
* TypeScript path mappings to tsconfig.aliases.json.
*
* tsconfig.json extends tsconfig.aliases.json, so TypeScript picks up the
* mappings automatically. The file is skipped if its content is unchanged, to
* avoid unnecessary rebuilds.
*
* This must run before esbuild compilation. The Grunt `jsconfig` task calls
* generateAliases() so that both jsconfig.json and tsconfig.aliases.json are
* kept in sync. The `react` task depends on `jsconfig`, so aliases are always
* up to date before a React build.
*
* @copyright 2026 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
import fs from "fs";
import path from "path";
import { createRequire } from "module";
const rootDir = process.cwd();
const tsconfigOut = path.join(rootDir, "tsconfig.aliases.json");
const TS_ALIASES_WARNING =
"// WARNING: Do not edit this file manually. It is generated by `grunt jsconfig`.\n";
/**
* Load Moodle component paths from `.grunt/components.js`.
*
* @returns {Record<string, string>} Map of component paths to component names.
*/
function loadComponentPathMap() {
const require = createRequire(import.meta.url);
// Load Moodle's components data from .grunt/components.js.
const { fetchComponentData } = require(
path.join(process.cwd(), ".grunt", "components.js")
);
// Format: `{ components: { "public/lib": "core", ... } }`.
const componentsData = fetchComponentData().components;
// Expected:
// `{ "public/lib": "core", "public/ai": "core_ai", ... }`.
return componentsData;
}
/**
* Compare two TypeScript `paths` maps for exact equality.
*
* @param {Record<string, string[]>} a First paths map.
* @param {Record<string, string[]>} b Second paths map.
* @returns {boolean} True when keys and values match in order.
*/
function pathsEqual(a, b) {
const aKeys = Object.keys(a);
const bKeys = Object.keys(b);
if (aKeys.length !== bKeys.length) {
return false;
}
for (const key of aKeys) {
if (!Object.prototype.hasOwnProperty.call(b, key)) {
return false;
}
const aArr = a[key] ?? [];
const bArr = b[key] ?? [];
if (aArr.length !== bArr.length) {
return false;
}
for (let i = 0; i < aArr.length; i++) {
if (aArr[i] !== bArr[i]) {
return false;
}
}
}
return true;
}
/**
* Parse JSON content and tolerate line comments.
*
* @param {string} content Raw JSON/JSONC file content.
* @returns {unknown}
*/
function parseJsonWithComments(content) {
const stripped = content
.replace(/^\uFEFF/, "")
.replace(/^\s*\/\/.*$/gm, "");
return JSON.parse(stripped);
}
/**
* Convert JSON output so single-value arrays are rendered on one line.
*
* @param {unknown} obj Data to stringify.
* @returns {string} JSON string with flattened single-value arrays.
*/
function stringifyFlatArrays(obj) {
const json = JSON.stringify(obj, null, 2);
return TS_ALIASES_WARNING + json.replace(/\[\s+\"(.*?)\"\s+\]/g, '["$1"]') + "\n";
}
/**
* Generate `tsconfig.aliases.json` from Moodle component metadata.
*
* Includes core aliases, discovers plugin React source aliases, and skips
* rewriting when aliases have not changed.
*
* @returns {void}
*/
export function generateAliases() {
const componentPathMap = loadComponentPathMap();
// Build TS paths for tsconfig.aliases.json
/** @type {Record<string, string[]>} */
const tsPaths = {
// Always include core alias.
"@moodle/lms/core/*": ["./public/lib/js/esm/src/*"],
};
for (const [componentPath, componentName] of Object.entries(componentPathMap)) {
const runtimeAliasKey = `@moodle/lms/${componentName}/*`;
const targetPattern = `./${path
.join(componentPath, "js", "esm", "src", "*")
.replace(/\\/g, "/")}`;
tsPaths[runtimeAliasKey] = [targetPattern];
}
const tsconfig = {
compilerOptions: { paths: tsPaths },
};
// If tsconfig paths didn't change, skip regeneration
let previousPaths = null;
let hasWarningHeader = false;
if (fs.existsSync(tsconfigOut)) {
try {
const previousContent = fs.readFileSync(tsconfigOut, "utf8");
hasWarningHeader = previousContent.startsWith(TS_ALIASES_WARNING);
const previousTsconfig = /** @type {{compilerOptions?: {paths?: Record<string, string[]>}}} */ (
parseJsonWithComments(previousContent)
);
previousPaths = previousTsconfig.compilerOptions?.paths ?? {};
} catch {
// ignore parse errors and treat as "no previous cache"
previousPaths = null;
}
}
if (previousPaths && hasWarningHeader && pathsEqual(previousPaths, tsPaths)) {
console.log("✓ Generating tsconfig.aliases.json was skipped. No alias modifications detected.");
return;
}
// Write tsconfig.aliases.json
fs.writeFileSync(tsconfigOut, stringifyFlatArrays(tsconfig));
console.log("✓ Generating tsconfig.aliases.json");
}
-324
View File
@@ -1,324 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Core esbuild library for Moodle ESM components.
*
* This is the single source of all build logic. The Grunt tasks
* (.grunt/tasks/react.js) import from here rather than duplicating
* configuration or build steps.
*
* Source layout convention:
* <component>/js/esm/src/**\/*.{ts,tsx} → <component>/js/esm/build/**\/*.js
*
* Exports:
* createBuildConfig(isDev) esbuild config object; pass isDev=true
* to disable minification / add sourcemaps.
* buildPluginComponents(isDev) Glob for every js/esm/src tree across
* core and plugins, compile all in parallel.
* buildSingleFile(filePath, isDev) Compile one source file; used by the
* Grunt watch task on incremental changes.
* watchComponents(isDev) Start esbuild's native watch mode so the
* compiler rebuilds affected files on save.
* resolveComponentPaths(entry) Map an absolute source path to its
* relative input path and output path.
*
* @copyright 2026 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
import esbuild from "esbuild";
import { glob } from "glob";
import chalk from "chalk";
import path from "path";
import fs from "fs";
const projectRoot = process.cwd();
/**
* Resolve a path from the current project root.
*
* @param {...string} segments Path segments to resolve.
* @returns {string} Absolute path from project root.
*/
const fromRoot = (...segments) => path.resolve(projectRoot, ...segments);
/**
* Create an incremental dot progress indicator.
* Prints one dot per completed build and wraps lines for readability.
*
* @param {number} total Total number of items to build.
* @returns {{ start: () => void, tick: () => void, succeed: (msg: string) => void, fail: (msg: string) => void }}
*/
function createDotProgress(total) {
const dotsPerLine = 60;
let printed = 0;
return {
start: () => {
process.stdout.write(`${chalk.cyan("Building")} `);
},
tick: () => {
printed++;
process.stdout.write(chalk.cyan("."));
if (printed % dotsPerLine === 0 && printed < total) {
process.stdout.write(` ${chalk.dim(`[${printed}/${total}]`)}\n`);
}
},
succeed: (msg) => {
process.stdout.write(` ${chalk.dim(`[${printed}/${total}]`)}\n`);
process.stdout.write(`${chalk.green("✓")} ${msg}\n`);
},
fail: (msg) => {
process.stdout.write(` ${chalk.dim(`[${printed}/${total}]`)}\n`);
process.stdout.write(`${chalk.red("✗")} ${msg}\n`);
},
};
}
/**
* Build a single React component entry file.
*
* @param {string} entry Absolute entry file path.
* @param {import('esbuild').BuildOptions} buildConfig Shared esbuild configuration.
* @returns {Promise<{file: string, output?: string, error: Error|null}>}
*/
async function buildComponent(entry, buildConfig) {
const resolved = resolveComponentPaths(entry);
if (!resolved) {
return { file: entry, error: new Error(`Unknown path pattern: ${entry}`) };
}
const { file, output } = resolved;
fs.mkdirSync(path.dirname(output), { recursive: true });
try {
await esbuild.build({
...buildConfig,
entryPoints: [entry],
outfile: output,
});
return { file, output, error: null };
} catch (error) {
return { file, error: error instanceof Error ? error : new Error(String(error)) };
}
}
/**
* Resolve source and output paths for a component entry.
*
* @param {string} entry Absolute component source path.
* @returns {{file: string, output: string} | null} Relative file info and output path, or null for unsupported paths.
*/
export function resolveComponentPaths(entry) {
const rel = path.relative(projectRoot, entry);
if (rel.includes(path.join('esm', 'src'))) {
const [part, rawFile] = rel.split(path.join('esm', 'src'));
const file = rawFile.replace(/^[\/\\]/, '');
return {
file,
output: fromRoot(part, 'esm', 'build', file.replace(/\.(ts|tsx)$/, '.js')),
};
}
return null;
}
/**
* Run all builds in parallel, showing incremental dot progress.
*
* @param {string[]} entryPoints Absolute entry file paths.
* @param {import('esbuild').BuildOptions} buildConfig Shared esbuild configuration.
* @returns {Promise<{errors: {file: string, output?: string, error: Error|null}[]}>}
*/
async function runParallelBuilds(entryPoints, buildConfig) {
const total = entryPoints.length;
/** @type {{file: string, output?: string, error: Error|null}[]} */
const errors = [];
const startTime = Date.now();
const progress = createDotProgress(total);
progress.start();
await Promise.all(entryPoints.map(async (entry) => {
const result = await buildComponent(entry, buildConfig);
if (result.error) {
errors.push(result);
}
progress.tick();
}));
const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
const succeeded = total - errors.length;
if (errors.length > 0) {
progress.fail(`${succeeded}/${total} built · ${elapsed}s`);
for (const e of errors) {
console.error(chalk.red(`${e.file}: ${e.error?.message ?? ''}`));
}
} else {
progress.succeed(chalk.bold(`${total} components built`) + chalk.dim(` · ${elapsed}s`));
}
return { errors };
}
/**
* Create the shared esbuild build configuration.
*
* @param {boolean} isDev Whether development mode is enabled.
* @returns {import('esbuild').BuildOptions} esbuild configuration object.
*/
export function createBuildConfig(isDev) {
return {
bundle: true,
format: "esm",
external: ["react", "react/*", "react-dom", "react-dom/*", "@moodlehq/design-system", "@moodlehq/design-system/*", "@moodle/lms", "@moodle/lms/*"],
jsx: "automatic",
minify: !isDev,
sourcemap: isDev ? 'inline' : false,
jsxDev: isDev,
keepNames: isDev,
treeShaking: !isDev,
define: { 'process.env.NODE_ENV': isDev ? '"development"' : '"production"' },
};
}
/**
* Build all plugin and core React components.
*
* @param {boolean} isDev Whether development mode is enabled.
* @returns {Promise<void>}
*/
export async function buildPluginComponents(isDev) {
console.log(chalk.green('> Building components...'));
const entryPoints = glob.sync("**/js/esm/src/**/*.{ts,tsx}", {
cwd: projectRoot,
absolute: true,
ignore: [
`${process.cwd()}/node_modules/**`,
`${process.cwd()}/vendor/**`,
],
});
const buildConfig = createBuildConfig(isDev);
const { errors } = await runParallelBuilds(entryPoints, buildConfig);
if (errors.length > 0) {
throw new Error(`React build failed: ${errors.length} component(s) could not be built`);
}
}
/**
* Start esbuild in native watch mode over all React components.
*
* Creates a single incremental build context for all entry points so that
* esbuild can reuse its internal graph between rebuilds instead of starting
* from scratch on every file change.
*
* @param {boolean} isDev Whether to build in development mode.
* @param {((srcFiles: string[]) => void) | undefined} [onRebuild] Called with the rebuilt entry source
* files (relative to project root) after each non-initial successful rebuild. Use this to run
* follow-up tasks such as linting without coupling them to this module.
* @returns {Promise<import('esbuild').BuildContext|null>} The active context, or null if no source files exist.
*/
export async function watchComponents(isDev, onRebuild) {
const entryPoints = glob.sync("**/js/esm/src/**/*.{ts,tsx}", {
cwd: projectRoot,
absolute: true,
ignore: [
`${process.cwd()}/node_modules/**`,
`${process.cwd()}/vendor/**`,
],
});
if (entryPoints.length === 0) {
return null;
}
const buildConfig = createBuildConfig(isDev);
// Map each source file to an {in, out} pair so esbuild can write each
// component to its custom output directory while sharing a single context.
// The 'out' path is relative to outdir (projectRoot) and has no extension —
// esbuild appends the appropriate extension automatically.
// Build entry pairs and ensure output directories exist in a single pass.
const entryPairs = entryPoints.flatMap(entry => {
const resolved = resolveComponentPaths(entry);
if (!resolved) {
return [];
}
fs.mkdirSync(path.dirname(resolved.output), { recursive: true });
return [{ in: entry, out: path.relative(projectRoot, resolved.output).replace(/\.js$/, '') }];
});
// Report build results to the terminal after every build (initial and on each change).
// metafile: true populates result.metafile.outputs so we know which files were written.
// On a rebuild only the affected outputs appear, so it effectively names the changed file.
/** @type {import('esbuild').Plugin} */
const watchReporter = {
name: 'watch-reporter',
setup(build) {
let isInitial = true;
let startTime = 0;
build.onStart(() => {
startTime = Date.now();
});
build.onEnd(result => {
const now = new Date().toLocaleTimeString();
const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
if (result.errors.length > 0) {
console.error(chalk.red(`[${now}] ✗ Build failed (${result.errors.length} error(s))`) + chalk.dim(` · ${elapsed}s`));
return;
}
const outputs = Object.keys(result.metafile?.outputs ?? {});
console.log(chalk.green(`[${now}] ✓ ${outputs.length} component(s) built`) + chalk.dim(` · ${elapsed}s`));
if (isInitial) {
isInitial = false;
} else if (onRebuild) {
// entryPoint is the source file (relative to projectRoot) that triggered
// this rebuild. Pass it to the caller so they can run follow-up tasks
// (e.g. linting) without this module needing to know about them.
const srcFiles = Object.values(result.metafile?.outputs ?? {})
.map(output => output.entryPoint)
.filter(/** @param {string|undefined} f */ f => !!f);
onRebuild(/** @type {string[]} */ (srcFiles));
}
});
},
};
const ctx = await esbuild.context({
...buildConfig,
entryPoints: entryPairs,
outdir: projectRoot,
metafile: true,
plugins: [watchReporter],
});
await ctx.watch();
return ctx;
}
-266
View File
@@ -1,266 +0,0 @@
{
'plugins': [
'@babel',
'promise',
'jsdoc'
],
'extends': [
'eslint:recommended',
'plugin:promise/recommended'
],
'env': {
'browser': true,
// Enable ES6+ features by default.
// See http://eslint.org/docs/user-guide/configuring#specifying-environments
// Note: The YUI override must exactly match this when disabling the ES6+ version because those features are not supported by Shifter.
'es2020': true,
'amd': true
},
'globals': {
'M': true,
'Y': true
},
// Warn about unused eslint-disable statements.
'reportUnusedDisableDirectives': true,
'rules': {
// See http://eslint.org/docs/rules/ for all rules and explanations of all
// rules.
// === Possible Errors ===
'comma-dangle': 'off',
'no-console': 'error',
'no-empty': 'warn',
'no-extra-parens': 'off',
'no-prototype-builtins': 'off',
'no-unreachable': 'warn',
// === Best Practices ===
// (these mostly match our jshint config)
'array-callback-return': 'warn',
'block-scoped-var': 'warn',
'complexity': 'warn',
'consistent-return': 'warn',
'curly': 'error',
'dot-notation': 'warn',
'no-alert': 'warn',
'no-caller': 'error',
'no-div-regex': 'error',
'no-empty-function': 'warn',
'no-eq-null': 'error',
'no-eval': 'error',
'no-extend-native': 'error',
'no-extra-bind': 'warn',
'no-floating-decimal': 'warn',
'no-global-assign': 'warn',
'no-implied-eval': 'error',
'no-invalid-this': 'error',
'no-iterator': 'error',
'no-labels': 'error',
'no-loop-func': 'error',
'no-multi-spaces': 'warn',
'no-multi-str': 'error',
'no-new-func': 'error',
'no-new-wrappers': 'error',
'no-octal-escape': 'error',
'no-proto': 'error',
'no-redeclare': 'warn',
'no-restricted-globals': ['error', { 'name': 'Notification' }],
'no-return-assign': 'error',
'no-script-url': 'error',
'no-self-compare': 'error',
'no-sequences': 'warn',
'no-throw-literal': 'warn',
'no-unmodified-loop-condition': 'error',
'no-unused-expressions': 'error',
'no-useless-call': 'warn',
'no-useless-escape': 'warn',
'wrap-iife': ['error', 'any'],
// === Variables ===
'no-undef-init': 'error',
'no-unused-vars': ['error', { 'caughtErrors': 'none' }],
// === Stylistic Issues ===
'array-bracket-spacing': 'warn',
'block-spacing': 'warn',
'brace-style': ['warn', '1tbs'],
'camelcase': 'warn',
'capitalized-comments': ['warn', 'always', { 'ignoreConsecutiveComments': true }],
'comma-spacing': ['warn', { 'before': false, 'after': true }],
'comma-style': ['warn', 'last'],
'computed-property-spacing': 'error',
'consistent-this': 'off',
'eol-last': 'off',
'func-call-spacing': ['warn', 'never'],
'func-names': 'off',
'func-style': 'off',
// indent currently not doing well with our wrapping style, so disabled.
'indent': ['off', 4, { 'SwitchCase': 1 }],
'key-spacing': ['warn', { 'beforeColon': false, 'afterColon': true, 'mode': minimum }],
'keyword-spacing': 'warn',
'linebreak-style': ['error', 'unix'],
'lines-around-comment': 'off',
'max-len': ['error', 132],
'max-lines': 'off',
'max-depth': 'warn',
'max-nested-callbacks': ['warn', 5],
'max-params': 'off',
'max-statements': 'off',
'max-statements-per-line': ['warn', { max: 2 }],
'new-cap': ['warn', { 'properties': false }],
'new-parens': 'warn',
'newline-per-chained-call': 'off',
'no-array-constructor': 'off',
'no-bitwise': 'error',
'no-continue': 'off',
'no-inline-comments': 'off',
'no-lonely-if': 'off',
'no-mixed-operators': 'off',
'no-multiple-empty-lines': 'warn',
'no-negated-condition': 'off',
'no-nested-ternary': 'warn',
'no-new-object': 'off',
'no-plusplus': 'off',
'no-tabs': 'error',
'no-ternary': 'off',
'no-trailing-spaces': 'error',
'no-underscore-dangle': 'off',
'no-unneeded-ternary': 'off',
'no-whitespace-before-property': 'warn',
'object-curly-newline': 'off',
'object-curly-spacing': 'warn',
'object-property-newline': 'off',
'one-var': 'off',
'one-var-declaration-per-line': ['warn', 'initializations'],
'operator-assignment': 'off',
'operator-linebreak': 'off',
'padded-blocks': 'off',
'quote-props': ['warn', 'as-needed', {'unnecessary': false, 'keywords': true, 'numbers': true}],
'quotes': 'off',
'semi': 'error',
'semi-spacing': ['warn', {'before': false, 'after': true}],
'sort-vars': 'off',
'space-before-blocks': 'warn',
'space-before-function-paren': ['warn', 'never'],
'space-in-parens': 'warn',
'space-infix-ops': 'warn',
'space-unary-ops': 'warn',
'spaced-comment': 'warn',
'unicode-bom': 'error',
'wrap-regex': 'off',
// === Promises (override plugin:promise/recommended) ===
'promise/always-return': 'warn',
'promise/no-return-wrap': 'warn',
'promise/param-names': 'warn',
'promise/catch-or-return': ['warn', {terminationMethod: ['catch', 'fail', 'always'], allowFinally: true}],
'promise/no-native': 'warn',
'promise/avoid-new': 'warn',
// === Deprecations ===
"no-restricted-properties": ['warn', {
'object': 'M',
'property': 'str',
'message': 'Use "core/str" module or M.util.get_string()'
}],
},
overrides: [
{
files: ["**/yui/src/**/*.js"],
'env': {
// Disable ES6+ for YUI files.
'es2020': false,
},
// Disable some rules which we can't safely define for YUI rollups.
rules: {
'no-undef': 'off',
'no-unused-vars': 'off',
'no-unused-expressions': 'off',
// === JSDocs ===
"jsdoc/check-access": 'off',
"jsdoc/check-alignment": 'off',
"jsdoc/check-param-names": 'off',
"jsdoc/check-property-names": 'off',
"jsdoc/empty-tags": 'off',
"jsdoc/implements-on-classes": 'off',
"jsdoc/multiline-blocks": 'off',
"jsdoc/require-jsdoc": 'off',
"jsdoc/require-param": 'off',
"jsdoc/require-param-name": 'off',
"jsdoc/require-param-type": 'off',
"jsdoc/require-property": 'off',
"jsdoc/require-property-name": 'off',
"jsdoc/require-property-type": 'off',
}
},
{
files: ["**/amd/src/*.js", "**/amd/src/**/*.js", "Gruntfile.js", ".grunt/*.js", ".grunt/tasks/*.js", "jsdoc.conf.js"],
// We're using babel transpiling so use their parser
// for linting.
parser: '@babel/eslint-parser',
// Check AMD with some slightly stricter rules.
rules: {
'no-implicit-globals': 'error',
// Disable all of the rules that have babel versions.
'new-cap': 'off',
// Not using this rule for the time being because it isn't
// compatible with jQuery and ES6.
'no-invalid-this': 'off',
'object-curly-spacing': 'off',
'quotes': 'off',
'semi': 'off',
'no-unused-expressions': 'off',
// Enable all of the babel version of these rules.
'@babel/new-cap': ['warn', { 'properties': false }],
// Not using this rule for the time being because it isn't
// compatible with jQuery and ES6.
'@babel/no-invalid-this': 'off',
'@babel/object-curly-spacing': 'warn',
'@babel/semi': 'error',
'@babel/no-unused-expressions': 'error',
// === Promises ===
// We have Promise now that we're using ES6.
'promise/no-native': 'off',
'promise/avoid-new': 'off',
// === JSDocs ===
'jsdoc/check-access': 'error',
'jsdoc/check-alignment': 1, // Recommended.
'jsdoc/check-param-names': 'error',
'jsdoc/check-property-names': 'error',
'jsdoc/empty-tags': 'error',
'jsdoc/implements-on-classes': 'error',
'jsdoc/multiline-blocks': 'error',
'jsdoc/require-jsdoc': 'error',
'jsdoc/require-param': 'error',
'jsdoc/require-param-name': 'error',
'jsdoc/require-param-type': 'error',
'jsdoc/require-property': 'error',
'jsdoc/require-property-name': 'error',
'jsdoc/require-property-type': 'error'
},
parserOptions: {
'sourceType': 'module',
'requireConfigFile': false
}
},
{
files: ["**/*.ts", "**/*.tsx"],
parser: '@typescript-eslint/parser',
parserOptions: {
sourceType: 'module',
ecmaFeatures: {
jsx: true
},
allowSyntheticDefaultImports: true
},
rules: {
// promise/no-native crashes on TypeScript ASTs (same reason it is
// disabled for AMD files above). Native Promises are standard in TS.
'promise/no-native': 'off',
'promise/avoid-new': 'off',
}
}
]
}
-24
View File
@@ -1,24 +0,0 @@
{
"indentation": ["on",{
"Feature": 0,
"Background": 2,
"Scenario": 2,
"Examples": 4,
"example": 6,
"Step": 4,
"given": 4,
"and": 4
}],
"no-dupe-feature-names": "on",
"no-dupe-scenario-names": "off",
"no-empty-file": "on",
"no-files-without-scenarios": "on",
"no-multiple-empty-lines": "on",
"no-partially-commented-tag-lines": "on",
"no-trailing-spaces": "on",
"no-unnamed-features": "on",
"no-unnamed-scenarios": "on",
"no-scenario-outlines-without-examples": "on",
"no-examples-in-scenarios": "on",
"new-line-at-eof": ["on", "yes"]
}
-9
View File
@@ -1,9 +0,0 @@
**/yui/build/** -diff
**/amd/build/** -diff
**.js.map -diff
**-min.js -diff
**.min.js -diff
# Remove composer lock file changes from standard diff views.
/composer.lock -diff
/lib/js/bundles/*/*.js -diff
-2
View File
@@ -1,2 +0,0 @@
# Primary donations pages.
custom: ["https://moodle.com/donations/"]
-7
View File
@@ -1,7 +0,0 @@
*** PLEASE DO NOT OPEN PULL REQUESTS VIA GITHUB ***
The moodle.git repository at Github is just a mirror of the official repository. We do not accept pull requests at Github.
See CONTRIBUTING.md guidelines for how to contribute patches for Moodle. Thank you.
--
-6
View File
@@ -1,6 +0,0 @@
> [!IMPORTANT]
> PLEASE DO NOT PUBLISH SECURITY FINDINGS PUBLICLY.
If you discover a potential security issue, please report it via our [Security Submission Form](https://moodle.org/security/report).
For more information about our security processes and responsible disclosure policy, see the [Security Procedures documentation](https://moodledev.io/general/development/process/security).
-1
View File
@@ -1 +0,0 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1231.24 314.44" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1{fill:#f48020;}.cls-2,.cls-3{fill:#383738;stroke:#4a4a4c;}.cls-2{stroke-width:2.37px;}.cls-3{stroke-width:2.38px;}.cls-4{fill:#585858;}</style></defs><title>Moodle_Logo_UseonBlack_RGB</title><path class="cls-1" d="M1086.3,235.34a53.42,53.42,0,0,0,16.71,29q13.26,12.27,29.48,12.27,11.29,0,24.56-5.89,16.23-6.88,16.22-16.22l58-.49q-12.29,29-41.76,45.2-27.52,15.23-60.43,15.24-42.25,0-70-26.29t-27.75-68.54q0-43.73,27.75-69.51t72-25.8q48.15,0,75.17,31.94,25.07,29.47,25.06,79.1Zm89.91-33.91q-3.43-17.69-14.73-29-12.8-12.28-29.49-12.29-17.21,0-28.74,11.79t-15.47,29.48Z"/><path class="cls-1" d="M965.45,308.54V0h55V308.54Z"/><path class="cls-1" d="M892.69,308.54V290.36q-7.38,9.83-25.06,15.72a92.31,92.31,0,0,1-30,5.41q-39.31,0-63.13-27T750.7,217.65q0-39.3,23.34-65.84t62.15-26.53q43.71,0,56.5,23.58V0h53.55V308.54Zm0-102.68q0-14.75-14-28.26t-28.74-13.51q-21.12,0-33.41,17.2-10.8,15.24-10.8,37.33,0,21.63,10.8,36.85,12.29,17.71,33.41,17.69,12.78,0,27.76-12t15-24.81Z"/><path class="cls-1" d="M647,313.45q-41.77,0-69-26.53t-27.27-68.3q0-41.73,27.27-68.28t69-26.53q41.75,0,69.27,26.53t27.52,68.28q0,41.79-27.52,68.3T647,313.45ZM647,168q-19.89,0-30.58,15.07t-10.68,35.79q0,20.73,9.94,35.05,11.43,16.31,31.32,16.28t31.32-16.28q10.44-14.31,10.44-35.05t-9.94-35Q667.42,168,647,168Z"/><path class="cls-1" d="M448.07,313.45q-41.76,0-69-26.53t-27.27-68.3q0-41.73,27.27-68.28t69-26.53q41.74,0,69.28,26.53t27.5,68.28q0,41.79-27.5,68.3T448.07,313.45Zm0-145.43q-19.89,0-30.59,15.07t-10.69,35.79q0,20.73,9.94,35.05,11.43,16.31,31.34,16.28t31.32-16.28q10.42-14.31,10.44-35.05t-9.94-35Q468.45,168,448.07,168Z"/><path class="cls-1" d="M288.89,309.11V201q0-33.9-28-33.9t-28,33.9V309.11h-55V201q0-33.9-27.52-33.9-28,0-28,33.9V309.11h-55V194.65q0-35.37,24.56-53.54,21.61-16.22,58.46-16.22,37.35,0,55,19.16,15.23-19.16,55.51-19.16,36.86,0,58.45,16.22,24.57,18.16,24.57,53.54V309.11Z"/><path class="cls-2" d="M.76,145.76"/><path class="cls-3" d="M1.73,145.32"/><path class="cls-4" d="M173.86,116.85l55.08-40.1-.7-2.44C135,83.92,80.42,96.44,0,144.13l.73,2.38,21-.67c15.17.52,30.85,1.26,46,1.32-1,24.09.83,32.65.83,32.65,51.92,17.58,101.22,1.53,127.14-43.9A248.72,248.72,0,0,0,173.86,116.85Z"/><path class="cls-4" d="M113.78,110c-.3-1.08-2.23-1.48-4.28-.9a4.73,4.73,0,0,0-3.14,2.19c-18.53,5-49.16,13.72-70.73,21l-1.33.45c-16.68,5.61-24.73,8.49-25.22,12.55-2.29,18.44-.87,42.18-.86,42.48l.19,6.4c-9.74,27.56.06,49.6,8.38,69.77.06-24.92,1.07-45.22-6-71-.2-3.82-1.49-30.36.61-47.34.34-2.75,11.65-6.56,23.63-10.59l1.33-.44c22-7.42,53.57-16.39,71.9-21.29a6.75,6.75,0,0,0,2.29-.25C112.64,112.43,114.08,111.09,113.78,110Z"/></svg>

Before

Width:  |  Height:  |  Size: 2.7 KiB

-31
View File
@@ -1,31 +0,0 @@
name: 'Close Pull Requests'
on:
pull_request_target:
types: opened
workflow_dispatch:
jobs:
close:
# Avoid forks to run this job
if: github.repository_owner == 'moodle'
name: Close Pull Requests
runs-on: ubuntu-latest
steps:
- uses: dessant/repo-lockdown@v4
with:
process-only: prs
close-pr: true
skip-closed-pr-comment: true
pr-comment: >
**Please, don't open pull requests via GitHub.**
This repository (moodle.git) at GitHub is just a mirror of the official Moodle repository.
For how to contribute patches for Moodle see
[CONTRIBUTING.md](https://github.com/moodle/moodle/blob/main/CONTRIBUTING.md).
Closing this pull request.
-118
View File
@@ -1,118 +0,0 @@
name: Run tests in a Composed Moodle Setup
on:
push:
branches-ignore:
- main
- MOODLE_[0-9]+_STABLE
tags-ignore:
- v[0-9]+.[0-9]+.[0-9]+*
workflow_dispatch:
inputs:
phpunit_extra_options:
description: Additional options to apply to PHPUnit
required: false
default: ''
env:
php: 8.4
jobs:
PHPUnit:
runs-on: ${{ matrix.os }}
services:
exttests:
image: moodlehq/moodle-exttests
ports:
- 8080:80
redis:
image: redis
ports:
- 6379:6379
postgres:
image: ${{ matrix.db == 'pgsql' && 'postgres:16' || '' }}
env:
POSTGRES_DB: test
POSTGRES_USER: test
POSTGRES_PASSWORD: test
ports:
- 5432:5432
strategy:
fail-fast: false
matrix:
include:
# MySQL builds always run with the lowest PHP supported version.
- os: ubuntu-24.04
php: 8.3
extensions:
db: mysqli
# PostgreSQL builds always run with the highest PHP supported version.
- os: ubuntu-24.04
php: 8.4
db: pgsql
steps:
- name: Run MySQL Server
if: ${{ matrix.db == 'mysqli' }}
run: |
docker run --rm \
-e MYSQL_DATABASE=test \
-e MYSQL_USER=test \
-e MYSQL_PASSWORD=test \
-e MYSQL_ROOT_PASSWORD=test \
-p 3306:3306 \
-d \
--tmpfs /var/lib/mysql:rw,noexec,nosuid,size=1024M \
mysql:8.4 \
--skip-log-bin \
--collation-server=utf8mb4_bin
- name: Configuring git vars
uses: rlespinasse/github-slug-action@v5
- name: Setting up PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: ${{ matrix.extensions }}
ini-values: max_input_vars=5000
coverage: none
tools: composer
- name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
uses: actions/checkout@v6
with:
path: 'moodle'
- name: 'Preparing the environment'
run: |
echo "pathtophp=$(which php)" >> $GITHUB_ENV # Inject installed pathtophp to env. The template config needs it.
sudo locale-gen en_AU.UTF-8
- name: Create the new Composer Project
run: |
mkdir testsite
cp moodle/.github/workflows/composed/composer.json testsite/composer.json
cp moodle/.github/workflows/composed/config.php testsite/config.php
mkdir -p testsite/data/moodledata
mkdir -p testsite/data/phpunitdata
- name: Install the Moodle test site
working-directory: testsite
run: |
composer install --no-interaction
- name: Setting up PHPUnit
working-directory: testsite
env:
dbtype: ${{ matrix.db }}
run: |
php moodle/public/admin/tool/phpunit/cli/init.php --no-composer-self-update
- name: Running PHPUnit tests
working-directory: testsite
env:
dbtype: ${{ matrix.db }}
phpunit_options: ${{ secrets.phpunit_options }}
run: |
vendor/bin/phpunit $phpunit_options ${{ inputs.phpunit_extra_options }}
-25
View File
@@ -1,25 +0,0 @@
{
"type": "project",
"require": {
"moodle/composer-installer": "^1",
"moodle/moodle-composer-scaffold": "^1",
"moodle/moodle": "@dev",
"moodle/moodle-testing": "^1.0"
},
"repositories": [
{
"name": "moodleundertest",
"type": "path",
"url": "../moodle"
}
],
"config": {
"audit": {
"block-insecure": false
},
"allow-plugins": {
"moodle/composer-installer": true,
"moodle/moodle-composer-scaffold": true
}
}
}
-67
View File
@@ -1,67 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Template configuraton file for GitHub Actions CI/CD using Composer.
*
* @package core
* @copyright 2020 onwards Eloy Lafuente (stronk7) {@link https://stronk7.com}
* @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
// This cannot be used out from a GitHub Actions workflow, so just exit.
getenv('GITHUB_WORKFLOW') || die; // phpcs:ignore moodle.Files.MoodleInternal.MoodleInternalGlobalState
unset($CFG);
global $CFG;
$CFG = new stdClass();
$CFG->dbtype = getenv('dbtype');
$CFG->dblibrary = 'native';
$CFG->dbhost = '127.0.0.1';
$CFG->dbname = 'test';
$CFG->dbuser = 'test';
$CFG->dbpass = 'test';
$CFG->prefix = 'm_';
$CFG->dboptions = ['dbcollation' => 'utf8mb4_bin'];
$host = 'localhost';
$CFG->wwwroot = "http://{$host}";
$CFG->dataroot = __DIR__ . '/data/moodledata';
$CFG->admin = 'admin';
$CFG->directorypermissions = 0777;
// Debug options - possible to be controlled by flag in future.
$CFG->debug = (E_ALL); // DEBUG_DEVELOPER.
$CFG->debugdisplay = 1;
$CFG->debugstringids = 1; // Add strings=1 to url to get string ids.
$CFG->perfdebug = 15;
$CFG->debugpageinfo = 1;
$CFG->allowthemechangeonurl = 1;
$CFG->passwordpolicy = 0;
$CFG->cronclionly = 0;
$CFG->pathtophp = getenv('pathtophp');
$CFG->phpunit_dataroot = __DIR__ . '/data/phpunitdata';
$CFG->phpunit_prefix = 't_';
$CFG->routerconfigured = true;
define('TEST_EXTERNAL_FILES_HTTP_URL', 'http://localhost:8080');
define('TEST_EXTERNAL_FILES_HTTPS_URL', 'http://localhost:8080');
define('TEST_SESSION_REDIS_HOST', 'localhost');
define('TEST_CACHESTORE_REDIS_TESTSERVERS', 'localhost');
-73
View File
@@ -1,73 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Template configuraton file for github actions CI/CD.
*
* @package core
* @copyright 2020 onwards Eloy Lafuente (stronk7) {@link https://stronk7.com}
* @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
// This cannot be used out from a github actions workflow, so just exit.
getenv('GITHUB_WORKFLOW') || die; // phpcs:ignore moodle.Files.MoodleInternal.MoodleInternalGlobalState
unset($CFG);
global $CFG;
$CFG = new stdClass();
$CFG->dbtype = getenv('dbtype');
$CFG->dblibrary = 'native';
$CFG->dbhost = '127.0.0.1';
$CFG->dbname = 'test';
$CFG->dbuser = 'test';
$CFG->dbpass = 'test';
$CFG->prefix = 'm_';
$CFG->dboptions = ['dbcollation' => 'utf8mb4_bin'];
$host = 'localhost';
$CFG->wwwroot = "http://{$host}";
$CFG->dataroot = realpath(dirname(__DIR__)) . '/moodledata';
$CFG->admin = 'admin';
$CFG->directorypermissions = 0777;
// Debug options - possible to be controlled by flag in future.
$CFG->debug = (E_ALL); // DEBUG_DEVELOPER.
$CFG->debugdisplay = 1;
$CFG->debugstringids = 1; // Add strings=1 to url to get string ids.
$CFG->perfdebug = 15;
$CFG->debugpageinfo = 1;
$CFG->allowthemechangeonurl = 1;
$CFG->passwordpolicy = 0;
$CFG->cronclionly = 0;
$CFG->pathtophp = getenv('pathtophp');
$CFG->phpunit_dataroot = realpath(dirname(__DIR__)) . '/phpunitdata';
$CFG->phpunit_prefix = 't_';
$CFG->routerconfigured = true;
define('TEST_EXTERNAL_FILES_HTTP_URL', 'http://localhost:8080');
define('TEST_EXTERNAL_FILES_HTTPS_URL', 'http://localhost:8080');
define('TEST_SESSION_REDIS_HOST', 'localhost');
define('TEST_CACHESTORE_REDIS_TESTSERVERS', 'localhost');
// TODO: add others (solr, mongodb, memcached, ldap...).
// Too much for now: define('PHPUNIT_LONGTEST', true); // Only leaves a few tests out and they are run later by CI.
require_once(__DIR__ . '/lib/setup.php');
-143
View File
@@ -1,143 +0,0 @@
name: One by One Testing
# Run all the individual unit tests one by one, with
# fully independent PHPUnit executions. Useful to
# detect issues with some tests that are using stuff
# that has been made available by others, but is not
# available when running individually.
#
# Note that we aren't using PHPUnit's own isolation
# here but completely separated runs, one for each
# test.
#
# The workflow will fail reporting all the tests
# that have failed (and will pass if no failure is
# detected, of course).
#
# It's only executed via workflow dispatch (automated
# or manual), not by push/tag. And acceptd configuration
# of phpunit, specially useful to run it with PHPUnit's
# own isolation or any other option.
on:
workflow_dispatch:
inputs:
phpunit_extra_options:
description: Additional options to apply to PHPUnit
required: false
default: ''
env:
chunks: 7
jobs:
collect:
name: Collect individual unit tests
runs-on: ubuntu-latest
outputs:
matrix: ${{steps.individual-tests.outputs.matrix }}
steps:
- name: Checking out code
uses: actions/checkout@v4
- name: Looking for all individual tests
id: individual-tests
run: |
count=0 # Number of individual tests found.
while read -r testfile; do # For each test file.
while read -r testname; do # For each unit test in a file.
count=$((count + 1))
# Sent it to the correct chunk file.
chunk=$(((($count % $chunks)) + 1))
echo "$testname $testfile" >> ./chunk_$chunk.txt
done < <(grep "function test_" "${testfile}" | sed -r "s/^.*function (test_[a-zA-Z0-9_]+).*/\1/")
done < <(find . -name "*_test.php" -not -path "*/fixtures/*")
# Generate the matrix to run tests.
echo "matrix=$(ls -1 chunk_*.txt | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
echo "$count individual tests collected in $chunks files"
- name: Upload individual tests files
uses: actions/upload-artifact@v4
with:
name: individual_tests
path: chunk_*.txt
retention-days: 1
test:
name: Run tests
needs: collect
runs-on: ubuntu-latest
services:
exttests:
image: moodlehq/moodle-exttests
ports:
- 8080:80
redis:
image: redis
ports:
- 6379:6379
strategy:
fail-fast: false
matrix:
file: ${{ fromJson(needs.collect.outputs.matrix) }}
steps:
- name: Setting up DB pgsql
uses: m4nu56/postgresql-action@v1
with:
postgresql version: 16
postgresql db: test
postgresql user: test
postgresql password: test
- name: Setting up PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.4
ini-values: max_input_vars=5000
coverage: none
- name: Checking out code
uses: actions/checkout@v4
- name: Download individual test files
uses: actions/download-artifact@v4
with:
name: individual_tests # Make all the chunk files available for the next steps.
- name: Setting up PHPUnit
env:
dbtype: pgsql
run: |
echo "pathtophp=$(which php)" >> $GITHUB_ENV
cp .github/workflows/config-template.php config.php
mkdir ../moodledata
sudo locale-gen en_AU.UTF-8
php public/admin/tool/phpunit/cli/init.php --no-composer-self-update
- name: Run PHPUnit test (one by one)
env:
dbtype: pgsql
run: |
status=0
count=0
while read -r line; do # For each line in the chunk file
count=$((count + 1))
filter="${line% *}"
file="${line#* }"
# Run the individual unit test and report problems if needed to.
if ! php vendor/bin/phpunit \
--fail-on-empty-test-suite \
--fail-on-warning \
--fail-on-risky \
--filter "$filter" ${{ inputs.phpunit_extra_options }} \
"$file" >/dev/null 2>&1; then
if [ $status -eq 0 ]; then
echo "Problems found, list of PHPUnit commands failing:"
fi
echo "vendor/bin/phpunit --filter '${filter}' ${{ inputs.phpunit_extra_options }} $file"
status=$((status + 1))
fi
done < ${{ matrix.file }}
echo "Finished: $count individual tests executed, $status tests failed"
exit $status
-128
View File
@@ -1,128 +0,0 @@
name: Core
on:
push:
branches-ignore:
- main
- MOODLE_[0-9]+_STABLE
tags-ignore:
- v[0-9]+.[0-9]+.[0-9]+*
workflow_dispatch:
inputs:
phpunit_extra_options:
description: Additional options to apply to PHPUnit
required: false
default: ''
env:
php: 8.4
jobs:
Grunt:
runs-on: ubuntu-24.04
steps:
- name: Checking out code
uses: actions/checkout@v4
- name: Configuring node & npm
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- name: Installing node stuff
run: npm install
- name: Running grunt
run: npx grunt
- name: Looking for uncommitted changes
# Add all files to the git index and then run diff --cached to see all changes.
# This ensures that we get the status of all files, including new files.
# We ignore npm-shrinkwrap.json to make the tasks immune to npm changes.
run: |
git add .
git reset -- npm-shrinkwrap.json
git diff --cached --exit-code
PHPUnit:
runs-on: ${{ matrix.os }}
services:
exttests:
image: moodlehq/moodle-exttests
ports:
- 8080:80
redis:
image: redis
ports:
- 6379:6379
postgres:
image: ${{ matrix.db == 'pgsql' && 'postgres:16' || '' }}
env:
POSTGRES_DB: test
POSTGRES_USER: test
POSTGRES_PASSWORD: test
ports:
- 5432:5432
strategy:
fail-fast: false
matrix:
include:
# MySQL builds always run with the lowest PHP supported version.
- os: ubuntu-24.04
php: 8.3
extensions:
db: mysqli
# PostgreSQL builds always run with the highest PHP supported version.
- os: ubuntu-24.04
php: 8.4
db: pgsql
steps:
- name: Run MySQL Server
if: ${{ matrix.db == 'mysqli' }}
run: |
docker run --rm \
-e MYSQL_DATABASE=test \
-e MYSQL_USER=test \
-e MYSQL_PASSWORD=test \
-e MYSQL_ROOT_PASSWORD=test \
-p 3306:3306 \
-d \
--tmpfs /var/lib/mysql:rw,noexec,nosuid,size=1024M \
mysql:8.4 \
--skip-log-bin \
--collation-server=utf8mb4_bin
- name: Configuring git vars
uses: rlespinasse/github-slug-action@v4
- name: Setting up PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: ${{ matrix.extensions }}
ini-values: max_input_vars=5000
coverage: none
- name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
uses: actions/checkout@v4
- name: Setting up PHPUnit
env:
dbtype: ${{ matrix.db }}
run: |
echo "pathtophp=$(which php)" >> $GITHUB_ENV # Inject installed pathtophp to env. The template config needs it.
cp .github/workflows/config-template.php config.php
mkdir ../moodledata
sudo locale-gen en_AU.UTF-8
php public/admin/tool/phpunit/cli/init.php --no-composer-self-update
- name: Running PHPUnit tests
env:
dbtype: ${{ matrix.db }}
phpunit_options: ${{ secrets.phpunit_options }}
run: vendor/bin/phpunit $phpunit_options ${{ inputs.phpunit_extra_options }}
- name: Git status
run: git status
-23
View File
@@ -1,23 +0,0 @@
name: Web Installer Testing
on:
workflow_dispatch:
jobs:
InstallationTest:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
php: [8.3, 8.4]
steps:
- name: Construct repository URL
run: echo "REPOSITORY_URL=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" >> $GITHUB_ENV
shell: bash
- uses: moodlehq/moodle-webinstaller-test@main
with:
repository: ${{ env.REPOSITORY_URL }}
branch: ${{ github.ref_name }}
php: ${{ matrix.php }}
-149
View File
@@ -1,149 +0,0 @@
name: Windows Testing
on:
workflow_dispatch:
inputs:
phpunit_extra_options:
description: Additional options to apply to PHPUnit
required: false
default: ''
env:
php: 8.4
jobs:
Grunt:
runs-on: windows-latest
steps:
- name: Set git to use LF
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checking out code
uses: actions/checkout@v4
- name: Configuring node & npm
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- name: Installing node stuff
run: npm ci
- name: Running grunt
run: npx grunt
- name: Looking for uncommitted changes
# Add all files to the git index and then run diff --cached to see all changes.
# This ensures that we get the status of all files, including new files.
# We ignore npm-shrinkwrap.json to make the tasks immune to npm changes.
run: |
git add .
git reset -- npm-shrinkwrap.json
git diff --cached --exit-code
PHPUnit:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: windows-latest
php: 8.4
# Ideally we should use mysql/mariadb, but they are 4x slower without tweaks and configuration
# so let's run only postgres (1.5h vs 6h) only, If some day we want to improve the mysql runs,
# this is the place to enable them.
# db: mysqli
db: pgsql
extensions: exif, fileinfo, gd, intl, pgsql, mysql, redis, soap, sodium, zip
- os: windows-latest
php: 8.3
db: pgsql
extensions: exif, fileinfo, gd, intl, pgsql, mysql, redis, soap, sodium, zip
steps:
- name: Setting up DB mysql
if: ${{ matrix.db == 'mysqli' }}
uses: shogo82148/actions-setup-mysql@v1
with:
mysql-version: 8.4
user: test
password: test
- name: Creating DB mysql
if: ${{ matrix.db == 'mysqli' }}
run: mysql --host 127.0.0.1 -utest -ptest -e 'CREATE DATABASE IF NOT EXISTS test COLLATE = utf8mb4_bin;';
- name: Setting up DB pgsql
if: ${{ matrix.db == 'pgsql' }}
run: |
# TODO: Remove these conf. modifications when php74 or php80 are lowest.
# Change to old md5 auth, because php73 does not support it.
# #password_encryption = scram-sha-256
(Get-Content "$env:PGDATA\postgresql.conf"). `
replace('#password_encryption = scram-sha-256', 'password_encryption = md5') | `
Set-Content "$env:PGDATA\postgresql.conf"
(Get-Content "$env:PGDATA\pg_hba.conf"). `
replace('scram-sha-256', 'md5') | `
Set-Content "$env:PGDATA\pg_hba.conf"
$pgService = Get-Service -Name postgresql*
Set-Service -InputObject $pgService -Status running -StartupType automatic
Start-Process -FilePath "$env:PGBIN\pg_isready" -Wait -PassThru
& $env:PGBIN\psql --command="CREATE USER test PASSWORD 'test'" --command="\du"
- name: Creating DB pgsql
if: ${{ matrix.db == 'pgsql' }}
run: |
& $env:PGBIN\createdb --owner=test test
$env:PGPASSWORD = 'test'
& $env:PGBIN\psql --username=test --host=localhost --list test
- name: Configuring git vars
uses: rlespinasse/github-slug-action@v4
- name: Setting up PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: ${{ matrix.extensions }}
ini-values: max_input_vars=5000
coverage: none
- name: Set git to use LF
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
uses: actions/checkout@v4
# Needs to be done after php is available, git configured and Moodle checkout has happened.
- name: Setting up moodle-exttests service
run: |
git clone https://github.com/moodlehq/moodle-exttests.git
nssm install php-built-in C:\tools\php\php.exe -S localhost:8080 -t D:\a\moodle\moodle\moodle-exttests
nssm start php-built-in
- name: Setting up redis service
run: |
choco install redis --version 5.0.7 --no-progress
nssm install redis redis-server
nssm start redis
- name: Setting up PHPUnit
env:
dbtype: ${{ matrix.db }}
shell: bash
run: |
echo "pathtophp=$(which php)" >> $GITHUB_ENV # Inject installed pathtophp to env. The template config needs it.
cp .github/workflows/config-template.php config.php
mkdir ../moodledata
php public/admin/tool/phpunit/cli/init.php --no-composer-self-update
- name: Running PHPUnit tests
env:
dbtype: ${{ matrix.db }}
phpunit_options: ${{ secrets.phpunit_options }}
run: vendor/bin/phpunit $phpunit_options ${{ inputs.phpunit_extra_options }}
+5 -36
View File
@@ -9,26 +9,15 @@
#
# See gitignore(5) man page for more details
#
# Swap files (vim)
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]
# Temporary files including undo
*~
#
/config.php
/lib/editor/tinymce/extra/tools/temp/
*~
*.swp
/tags
/TAGS
/cscope.*
/.patches/
/.idea/
.phpstorm.*
!/.phpstorm.meta.php/
/.phpstorm.meta.php/*
!/.phpstorm.meta.php/di.php
/nbproject/
CVS
.DS_Store
@@ -36,28 +25,8 @@ CVS
/.project
/.buildpath
/.cache
.phpunit.result.cache
phpunit.xml
# Composer support. Do not ignore composer.json, or composer.lock. These should be shipped by us.
# Composer support - only composer.json is to be in git, the rest is installed in each checkout.
composer.phar
composer.lock
/vendor/
/behat.yml
*/yui/build/*/*-coverage.js
/public/lib/yuilib/*/build/*/*-coverage.js
# lib/yuilib/version/module/module-coverage.js
/public/lib/yuilib/*/*/*-coverage.js
atlassian-ide-plugin.xml
/node_modules/
/.vscode/
moodle-plugin-ci.phar
.eslintignore
.stylelintignore
/jsdoc
/public/admin/tool/componentlibrary/docs
/public/admin/tool/componentlibrary/hugo/site/data/my-index.json
.hugo_build.lock
phpcs.xml
jsconfig.json
UPGRADING-CURRENT.md
.phpunit.cache
tsconfig.aliases.json
-169
View File
@@ -1,169 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* This is a babel plugin to add the Moodle module names to the AMD modules
* as part of the transpiling process.
*
* In addition it will also add a return statement for the default export if the
* module is using default exports. This is a highly specific Moodle thing because
* we're transpiling to AMD and none of the existing Babel 7 plugins work correctly.
*
* This will fix the issue where an ES6 module using "export default Foo" will be
* transpiled into an AMD module that returns {default: Foo}; Instead it will now
* just simply return Foo.
*
* Note: This means all other named exports in that module are ignored and won't be
* exported.
*
* @copyright 2018 Ryan Wyllie <ryan@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
"use strict";
/* eslint-env node */
module.exports = ({template, types}) => {
const fs = require('fs');
const path = require('path');
const cwd = process.cwd();
const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
/**
* Search the list of components that match the given file name
* and return the Moodle component for that file, if found.
*
* Throw an exception if no matching component is found.
*
* @throws {Error}
* @param {string} searchFileName The file name to look for.
* @return {string} Moodle component
*/
function getModuleNameFromFileName(searchFileName) {
searchFileName = fs.realpathSync(searchFileName);
const relativeFileName = searchFileName.replace(`${cwd}${path.sep}`, '').replace(/\\/g, '/');
const [componentPath, file] = relativeFileName.split('/amd/src/');
const fileName = file.replace('.js', '');
// Check subsystems first which require an exact match.
const componentName = ComponentList.getComponentFromPath(componentPath);
if (componentName) {
return `${componentName}/${fileName}`;
}
// This matches the previous PHP behaviour that would throw an exception
// if it couldn't parse an AMD file.
throw new Error(`Unable to find module name for ${searchFileName} (${componentPath}::${file}}`);
}
/**
* This is heavily inspired by the babel-plugin-add-module-exports plugin.
* See: https://github.com/59naga/babel-plugin-add-module-exports
*
* This is used when we detect a module using "export default Foo;" to make
* sure the transpiled code just returns Foo directly rather than an object
* with the default property (i.e. {default: Foo}).
*
* Note: This means that we can't support modules that combine named exports
* with a default export.
*
* @param {String} path
* @param {String} exportObjectName
*/
function addModuleExportsDefaults(path, exportObjectName) {
const rootPath = path.findParent(path => {
return path.key === 'body' || !path.parentPath;
});
// HACK: `path.node.body.push` instead of path.pushContainer(due doesn't work in Plugin.post).
// This is hardcoded to work specifically with AMD.
rootPath.node.body.push(template(`return ${exportObjectName}.default`)());
}
return {
pre() {
this.seenDefine = false;
this.addedReturnForDefaultExport = false;
},
visitor: {
// Plugin ordering is only respected if we visit the "Program" node.
// See: https://babeljs.io/docs/en/plugins.html#plugin-preset-ordering
//
// We require this to run after the other AMD module transformation so
// let's visit the "Program" node.
Program: {
exit(path) {
path.traverse({
CallExpression(path) {
// If we find a "define" function call.
if (!this.seenDefine && path.get('callee').isIdentifier({name: 'define'})) {
// We only want to modify the first instance of define that we find.
this.seenDefine = true;
// Get the Moodle component for the file being processed.
var moduleName = getModuleNameFromFileName(this.file.opts.filename);
// The function signature of `define()` is:
// define = function (name, deps, callback) {...}
// Ensure that if the moduel supplied its own name that it is replaced.
if (path.node.arguments.length > 0) {
// Ensure that there is only one name.
if (path.node.arguments[0].type === 'StringLiteral') {
// eslint-disable-next-line
console.log(`Replacing module name '${path.node.arguments[0].extra.rawValue}' with ${moduleName}`);
path.node.arguments.shift();
}
}
// Add the module name as the first argument to the define function.
path.node.arguments.unshift(types.stringLiteral(moduleName));
// Add a space after the define function in the built file so that previous versions
// of Moodle will not try to add the module name to the file when it's being served
// by PHP. This forces the regex in PHP to not match for this file.
path.node.callee.name = 'define ';
}
// Check for any Object.defineProperty('exports', 'default') calls.
if (!this.addedReturnForDefaultExport && path.get('callee').matchesPattern('Object.defineProperty')) {
const [identifier, prop] = path.get('arguments');
const objectName = identifier.get('name').node;
const propertyName = prop.get('value').node;
if ((objectName === 'exports' || objectName === '_exports') && propertyName === 'default') {
addModuleExportsDefaults(path, objectName);
this.addedReturnForDefaultExport = true;
}
}
},
AssignmentExpression(path) {
// Check for an exports.default assignments.
if (
!this.addedReturnForDefaultExport &&
(
path.get('left').matchesPattern('exports.default') ||
path.get('left').matchesPattern('_exports.default')
)
) {
const objectName = path.get('left.object.name').node;
addModuleExportsDefaults(path, objectName);
this.addedReturnForDefaultExport = true;
}
}
}, this);
}
}
}
};
};
-455
View File
@@ -1,455 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Helper functions for working with Moodle component names, directories, and sources.
*
* @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
"use strict";
/* eslint-env node */
/** @var {Object} A list of subsystems in Moodle */
const componentData = {};
/**
* Load details of all moodle modules.
*
* @returns {object}
*/
const fetchComponentData = () => {
const fs = require('fs');
const path = require('path');
const glob = require('glob');
const gruntFilePath = process.cwd();
if (!Object.entries(componentData).length) {
componentData.subsystems = {};
componentData.pathList = [];
componentData.components = {};
componentData.standardComponents = {};
// Fetch the component definiitions from the distributed JSON file.
const components = JSON.parse(fs.readFileSync(`${gruntFilePath}/lib/components.json`));
const pluginData = JSON.parse(fs.readFileSync(`${gruntFilePath}/lib/plugins.json`));
componentData.pluginTypes = components.plugintypes
const standardPlugins = Object.entries(pluginData.standard).map(
([pluginType, pluginNames]) => {
return pluginNames.map(pluginName => `${pluginType}_${pluginName}`);
}
).reduce((acc, val) => acc.concat(val), []);
// Build the list of moodle subsystems.
componentData.subsystems['public/lib'] = 'core';
componentData.pathList.push(`${process.cwd()}/public/lib`);
for (const [component, thisPath] of Object.entries(components.subsystems)) {
if (thisPath) {
// Prefix "core_" to the front of the subsystems.
componentData.subsystems[thisPath] = `core_${component}`;
componentData.pathList.push(`${process.cwd()}/${thisPath}`);
}
}
// The list of components includes the list of subsystems.
componentData.components = Object.fromEntries(
Object.entries(componentData.subsystems)
.map(([path, name]) => ([path, name]))
);
const subpluginAdder = (subpluginType, subpluginTypePath) => {
glob.sync(`${subpluginTypePath}/*/version.php`).forEach(versionPath => {
const componentPath = fs.realpathSync(path.dirname(versionPath));
const componentName = path.basename(componentPath);
const frankenstyleName = `${subpluginType}_${componentName}`;
componentData.components[`${subpluginTypePath}/${componentName}`] = frankenstyleName;
componentData.pathList.push(componentPath);
});
};
// Go through each of the plugintypes.
Object.entries(components.plugintypes).forEach(([pluginType, pluginTypePath]) => {
// We don't allow any code in this place..?
glob.sync(`${pluginTypePath}/*/version.php`).forEach(versionPath => {
const componentPath = fs.realpathSync(path.dirname(versionPath));
const componentName = path.basename(componentPath);
const frankenstyleName = `${pluginType}_${componentName}`;
componentData.components[`${pluginTypePath}/${componentName}`] = frankenstyleName;
componentData.pathList.push(componentPath);
// Look for any subplugins.
const subPluginConfigurationFile = `${componentPath}/db/subplugins.json`;
if (fs.existsSync(subPluginConfigurationFile)) {
const subpluginList = JSON.parse(fs.readFileSync(fs.realpathSync(subPluginConfigurationFile)));
if (subpluginList.subplugintypes) {
Object.entries(subpluginList.subplugintypes).forEach(([subpluginType, subpluginTypePath]) => {
subpluginAdder(
subpluginType,
`${pluginTypePath}/${componentName}/${subpluginTypePath}`
);
});
} else if (subpluginList.plugintypes) {
Object.entries(subpluginList.plugintypes).forEach(([subpluginType, subpluginTypePath]) => {
subpluginAdder(subpluginType, `public/${subpluginTypePath}`);
});
}
}
});
});
// Create a list of the standard subsystem and plugins.
componentData.standardComponents = Object.fromEntries(
Object.entries(componentData.components).filter(([, name]) => {
if (name === 'core' || name.startsWith('core_')) {
return true;
}
return standardPlugins.indexOf(name) !== -1;
})
);
componentData.componentMapping = Object.fromEntries(
Object.entries(componentData.components).map(([path, name]) => [name, path])
);
}
return componentData;
};
/**
* Get the list of component paths.
*
* @param {string} relativeTo
* @returns {array}
*/
const getComponentPaths = (relativeTo = '') => fetchComponentData().pathList.map(componentPath => {
return componentPath.replace(relativeTo, '');
});
/**
* Get the list of paths to build AMD sources.
*
* @returns {Array}
*/
const getAmdSrcGlobList = () => {
const globList = [];
fetchComponentData().pathList.forEach(componentPath => {
globList.push(`${componentPath}/amd/src/*.js`);
globList.push(`${componentPath}/amd/src/**/*.js`);
});
return globList;
};
/**
* Get the list of paths to build YUI sources.
*
* @param {String} relativeTo
* @returns {Array}
*/
const getYuiSrcGlobList = relativeTo => {
const globList = [];
fetchComponentData().pathList.forEach(componentPath => {
const relativeComponentPath = componentPath.replace(relativeTo, '');
globList.push(`${relativeComponentPath}/yui/src/**/*.js`);
});
return globList;
};
/**
* Get the list of paths to thirdpartylibs.xml.
*
* @param {String} relativeTo
* @returns {Array}
*/
const getThirdPartyLibsList = relativeTo => {
const fs = require('fs');
const path = require('path');
const pathList = fetchComponentData().pathList
.map(componentPath => path.relative(relativeTo, componentPath) + '/thirdpartylibs.xml')
.map(componentPath => componentPath.replace(/\\/g, '/'))
.filter(path => fs.existsSync(path));
pathList.push('lib/thirdpartylibs.xml');
return pathList.sort();
};
/**
* Get the list of thirdparty library paths.
*
* @returns {array}
*/
const getThirdPartyPaths = () => {
const DOMParser = require('@xmldom/xmldom').DOMParser;
const fs = require('fs');
const path = require('path');
const xpath = require('xpath');
const thirdpartyfiles = getThirdPartyLibsList(fs.realpathSync('./'));
const libs = ['node_modules/', 'vendor/'];
const addLibToList = lib => {
if (!lib.match('\\*') && fs.statSync(lib).isDirectory()) {
// Ensure trailing slash on dirs.
lib = lib.replace(/\/?$/, '/');
}
// Look for duplicate paths before adding to array.
if (libs.indexOf(lib) === -1) {
libs.push(lib);
}
};
thirdpartyfiles.forEach(function(file) {
const dirname = path.dirname(file);
const xmlContent = fs.readFileSync(file, 'utf8');
const doc = new DOMParser().parseFromString(xmlContent);
const nodes = xpath.select("/libraries/library/location/text()", doc);
nodes.forEach(function(node) {
let lib = path.posix.join(dirname, node.toString());
addLibToList(lib);
});
});
return libs;
};
/**
* Find the name of the component matching the specified path.
*
* @param {String} path
* @returns {String|null} Name of matching component.
*/
const getComponentFromPath = path => {
const componentList = fetchComponentData().components;
if (componentList.hasOwnProperty(path)) {
return componentList[path];
}
return null;
};
/**
* Check whether the supplied path, relative to the Gruntfile.js, is in a known component.
*
* @param {String} checkPath The path to check. This can be with either Windows, or Linux directory separators.
* @returns {String|null}
*/
const getOwningComponentDirectory = checkPath => {
const path = require('path');
// Fetch all components into a reverse sorted array.
// This ensures that components which are within the directory of another component match first.
const pathList = Object.keys(fetchComponentData().components).sort().reverse();
for (const componentPath of pathList) {
// If the componentPath is the directory being checked, it will be empty.
// If the componentPath is a parent of the directory being checked, the relative directory will not start with ..
if (!path.relative(componentPath, checkPath).startsWith('..')) {
return componentPath;
}
}
return null;
};
/**
* Get the latest tag in a remote GitHub repository.
*
* @param {string} url The remote repository.
* @returns {Array}
*/
const getRepositoryTags = async(url) => {
const gtr = require('git-tags-remote');
try {
const tags = await gtr.get(url);
if (tags !== undefined) {
return tags;
}
} catch (error) {
return [];
}
return [];
};
/**
* Get the list of thirdparty libraries that could be upgraded.
*
* @returns {Array}
*/
const getThirdPartyLibsUpgradable = async() => {
const libraries = getThirdPartyLibsData().filter((library) => !!library.repository);
const upgradableLibraries = [];
const versionCompare = (a, b) => {
if (a === b) {
return 0;
}
const aParts = a.split('.');
const bParts = b.split('.');
for (let i = 0; i < Math.min(aParts.length, bParts.length); i++) {
const aPart = parseInt(aParts[i], 10);
const bPart = parseInt(bParts[i], 10);
if (aPart > bPart) {
// 1.1.0 > 1.0.9
return 1;
} else if (aPart < bPart) {
// 1.0.9 < 1.1.0
return -1;
} else {
// Same version.
continue;
}
}
if (aParts.length > bParts.length) {
// 1.0.1 > 1.0
return 1;
}
// 1.0 < 1.0.1
return -1;
};
for (let library of libraries) {
upgradableLibraries.push(
getRepositoryTags(library.repository).then((tagMap) => {
library.version = library.version.replace(/^v/, '');
const currentVersion = library.version.replace(/moodle-/, '');
const currentMajorVersion = library.version.split('.')[0];
const tags = [...tagMap]
.map((tagData) => tagData[0])
.filter((tag) => !tag.match(/(alpha|beta|rc)/))
.map((tag) => tag.replace(/^v/, ''))
.sort((a, b) => versionCompare(b, a));
if (!tags.length) {
library.warning = "Unable to find any comparable tags.";
return library;
}
library.latestVersion = tags[0];
tags.some((tag) => {
if (!tag) {
return false;
}
// See if the version part matches.
const majorVersion = tag.split('.')[0];
if (majorVersion === currentMajorVersion) {
library.latestSameMajorVersion = tag;
return true;
}
return false;
});
if (versionCompare(currentVersion, library.latestVersion) > 0) {
// Moodle somehow has a newer version than the latest version.
library.warning = `Newer version found: ${currentVersion} > ${library.latestVersion} for ${library.name}`;
return library;
}
if (library.version !== library.latestVersion) {
// Delete version and add it again at the end of the array. That way, current and new will stay closer.
delete library.version;
library.version = currentVersion;
return library;
}
return null;
})
);
}
return (await Promise.all(upgradableLibraries)).filter((library) => !!library);
};
/**
* Get the list of paths to build react sources.
*
* @param {string} relativeTo
* @returns {string[]}
*/
const getReactTsSrcGlobList = (relativeTo = '') => {
const globList = [];
fetchComponentData().pathList.forEach(componentPath => {
const relativeComponentPath = componentPath.replace(relativeTo, '');
globList.push(`${relativeComponentPath}/js/esm/src/**/*.ts`);
globList.push(`${relativeComponentPath}/js/esm/src/**/*.tsx`);
});
return globList.map(componentPath => componentPath.replace(/\\/g, '/'));
};
/**
* Get the list of thirdparty libraries.
*
* @returns {Array}
*/
const getThirdPartyLibsData = () => {
const DOMParser = require('@xmldom/xmldom').DOMParser;
const fs = require('fs');
const xpath = require('xpath');
const path = require('path');
const libraryList = [];
const libraryFields = [
'location',
'name',
'version',
'repository',
];
const thirdpartyfiles = getThirdPartyLibsList(fs.realpathSync('./'));
thirdpartyfiles.forEach(function(libraryPath) {
const xmlContent = fs.readFileSync(libraryPath, 'utf8');
const doc = new DOMParser().parseFromString(xmlContent);
const libraries = xpath.select("/libraries/library", doc);
for (const library of libraries) {
const libraryData = [];
for (const field of libraryFields) {
libraryData[field] = xpath.select(`${field}/text()`, library)?.toString();
}
libraryData.location = path.join(path.dirname(libraryPath), libraryData.location);
libraryList.push(libraryData);
}
});
return libraryList.sort((a, b) => a.location.localeCompare(b.location));
};
module.exports = {
fetchComponentData,
getAmdSrcGlobList,
getComponentFromPath,
getComponentPaths,
getOwningComponentDirectory,
getYuiSrcGlobList,
getThirdPartyLibsList,
getThirdPartyPaths,
getThirdPartyLibsUpgradable,
getReactTsSrcGlobList,
};
-19
View File
@@ -1,19 +0,0 @@
# Moodle JavaScript Documentation
```
.-..-.
_____ | || |
/____/-.---_ .---. .---. .-.| || | .---.
| | _ _ |/ _ \/ _ \/ _ || |/ __ \
* | | | | | || |_| || |_| || |_| || || |___/
|_| |_| |_|\_____/\_____/\_____||_|\_____)
Moodle - the world's open source learning platform
```
## About
This generated documentation includes API documentation for JavaScript written in the AMD and ES2015 module formats within Moodle.
## Related information
See [https://moodledev.io](https://moodledev.io) for other related Developer Documentation.
-131
View File
@@ -1,131 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Helper functions for working with Moodle component names, directories, and sources.
*
* @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
"use strict";
/* eslint-env node */
// Do not include any plugins as stanard.
const plugins = [];
plugins.push('plugins/markdown');
/**
* Get the source configuration.
*
* @return {Object}
*/
const getSource = () => {
const glob = require('glob');
const path = require('path');
const ComponentList = require(path.resolve('.grunt/components.js'));
const thirdPartyPaths = ComponentList.getThirdPartyPaths();
const source = {
include: [],
includePattern: ".+\\.js$",
};
let includeList = [];
ComponentList.getAmdSrcGlobList().forEach(async pattern => {
includeList.push(...glob.sync(pattern));
});
const cwdLength = process.cwd().length + 1;
includeList.forEach(path => {
if (source.include.indexOf(path) !== -1) {
// Ensure no duplicates.
return;
}
const relPath = path.substring(cwdLength);
if (thirdPartyPaths.indexOf(relPath) !== -1) {
return;
}
source.include.push(path);
});
source.include.push('.grunt/jsdoc/README.md');
return source;
};
const tags = {
// Allow the use of unknown tags.
// We have a lot of legacy uses of these.
allowUnknownTags: true,
// We make use of jsdoc and closure dictionaries as standard.
dictionaries: [
'jsdoc',
'closure',
],
};
// Template configuraiton.
const templates = {
cleverLinks: false,
monospaceLinks: false,
};
module.exports = {
opts: {
destination: "./public/jsdoc/",
template: "node_modules/docdash",
},
plugins,
recurseDepth: 10,
source: getSource(),
sourceType: 'module',
tags,
templates,
docdash: {
collapse: true,
search: true,
sort: true,
sectionOrder: [
"Namespaces",
"Modules",
"Events",
"Classes",
"Externals",
"Mixins",
"Tutorials",
"Interfaces"
],
"menu": {
"Developer Docs": {
href: "https://moodledev.io",
target: "_blank",
"class": "menu-item",
id: "devdocs"
},
"MDN Docs": {
href: "https://developer.mozilla.org/en-US/docs/Web/JavaScript",
target: "_blank",
"class": "menu-item",
id: "mdndocs",
},
},
typedefs: true,
},
};
-138
View File
@@ -1,138 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import * as Components from '../../components.js';
const componentData = Components.fetchComponentData();
/**
* The standard components shipped with core Moodle.
*
* @type {Object}
*/
export const standardComponents = componentData.standardComponents;
/**
* All components of the current Moodle instance.
*
* @type {Object}
*/
export const allComponents = componentData.components;
/**
* Get all components of the current Moodle instance.
*
* @returns {Array}
*/
export const getAllComponents = () => {
let components = new Map(Object.entries(componentData.pluginTypes).map(([value, path]) => ([path,{
path,
value,
name: `${value} (plugin type)`,
}])));
Object
.entries(componentData.components)
.filter(([path, value]) => Object.values(componentData.standardComponents).includes(value))
.forEach(([path, value]) => {
const entry = {
path,
value,
name: value,
};
if (Object.values(componentData.subsystems).includes(value)) {
if (components.has(path)) {
entry.name = `${value} (subsystem / plugintype)`;
} else {
entry.name = `${value} (subsystem)`;
}
}
components.set(path, entry);
});
return Array.from(components.values());
};
/**
* Whether the specified component is a standard component shipped with core Moodle.
*
* @param {string} componentName
* @returns {boolean}
*/
export const isStandardComponent = (componentName) => {
if (Object.values(componentData.standardComponents).includes(componentName)) {
return true;
}
if (Object.keys(componentData.pluginTypes).includes(componentName)) {
return true;
}
return false;
};
export const rewritePlugintypeAsSubsystem = (componentName) => {
if (Object.keys(componentData.pluginTypes).includes(componentName)) {
const pluginTypePath = componentData.pluginTypes[componentName];
if (Object.keys(componentData.subsystems).includes(pluginTypePath)) {
return true;
}
}
return false;
};
/**
* Whether the specified component is a community component.
*
* @param {string} componentName
* @returns {boolean}
*/
export const isCommunityComponent = (componentName) => {
if (isStandardComponent(componentName)) {
return false;
}
return Object.values(componentData.components).indexOf(componentName) !== -1;
};
/**
* Sort method for components.
*
* This method sorts components putting `core` first, followed by core subsystems, then everything else.
*
* @param {String} a
* @param {String} b
* @returns {Number}
*/
export const sortComponents = (a, b) => {
// Always put 'core' first.
if (a === 'core') {
return -1;
} else if (b === 'core') {
return 1;
}
// Put core subsystems next.
if (a.startsWith('core_') && !b.startsWith('core_')) {
return -1;
} else if (b.startsWith('core_') && !a.startsWith('core_')) {
return 1;
}
// Sort alphabetically for everything else.
return a.localeCompare(b);
};
-85
View File
@@ -1,85 +0,0 @@
#!/usr/bin/env node
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import inquirer from 'inquirer';
import chalk from 'chalk';
import { createNote } from './note.mjs';
import { getInitialValues, getIssueNumberFromBranchName } from './helpers.mjs';
import * as Prompts from './prompts.mjs';
import logger from './logger.mjs';
export default async (options) => {
// Processs the initial values.
const initialValues = getInitialValues(options);
// Fetch information.
const messages = [];
const { issueNumber } = await inquirer.prompt([
Prompts.getIssuePrompt(getIssueNumberFromBranchName()),
], initialValues);
let selection = {};
let notePath;
do {
selection = {};
selection = await inquirer.prompt([
Prompts.getComponentsPrompt(),
Prompts.getTypePrompt(),
Prompts.getMessagePromptInput(),
], initialValues);
if (selection.message === '') {
selection = Object.assign(
selection,
await inquirer.prompt([
Prompts.getMessagePromptEditor(),
]),
);
}
logger.info(`
Creating upgrade note with the following options:
- Issue: ${chalk.bold(issueNumber)}
- Component: ${chalk.bold(selection.components)}
- Type: ${chalk.bold(selection.type)}
- Message:
${chalk.bold(selection.message)}
`);
messages.push({
components: [selection.components],
type: selection.type,
message: selection.message,
});
// Save the note so far.
if (notePath) {
await createNote(issueNumber, messages, notePath);
logger.info(`Updated note at: ${chalk.underline(chalk.bold(notePath))}`);
} else {
notePath = await createNote(issueNumber, messages);
logger.info(`Note created at: ${chalk.underline(chalk.bold(notePath))}`);
}
selection = Object.assign(
selection,
await inquirer.prompt([
Prompts.getAddAnotherPrompt(),
], initialValues),
);
} while (selection.addAnother);
};
-357
View File
@@ -1,357 +0,0 @@
#!/usr/bin/env node
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import chalk from 'chalk';
import { getAllComponents } from './components.mjs';
import { getCombinedNotesByComponent, deleteAllNotes } from './note.mjs';
import { getNoteName } from './noteTypes.mjs';
import { writeFile, readFile, unlink } from 'fs/promises';
import { join as joinPath } from 'path';
import logger from './logger.mjs';
import { getCurrentVersion } from './helpers.mjs';
/**
* Helper to fetch the current notes from a file.
*
* @param {string} file
* @returns {Promise<string>}
*/
const getCurrentNotes = async (file) => {
try {
return await readFile(file, 'utf8');
} catch (error) {
return null;
}
}
/**
* Update the UPGRADING.md file.
*
* @param {string} upgradeNotes
* @param {Object} options
* @param {boolean} options.deleteNotes
* @returns {Promise<void>}
*/
const updateUpgradeNotes = async (upgradeNotes, options) => {
const fileName = 'UPGRADING.md';
// Write the notes to a file.
logger.info(`Writing notes to ${chalk.underline(chalk.bold(fileName))}`);
// Prepend to the existing file.
const existingContent = await getCurrentNotes(fileName);
if (existingContent) {
await writeFile(fileName, getUpdatedNotes(existingContent, upgradeNotes));
} else {
// This should not normally happen.
await writeFile(fileName, upgradeNotes);
}
if (options.deleteNotes) {
logger.warn(`>>> Deleting all notes <<<`)
// Delete the notes.
deleteAllNotes();
}
};
/**
* Create the current summary notes.
*
* @param {string} upgradeNotes
* @returns {Promise<void>}
*/
const createCurrentSummary = async (upgradeNotes) => {
const fileName = 'UPGRADING-CURRENT.md';
const notes = `# Moodle upgrade notes\n\n${upgradeNotes}`;
await writeFile(fileName, notes);
logger.info(`Running upgrade notes written to ${chalk.underline(chalk.bold(fileName))}`);
};
/**
* Get the indexes of the lines that contain the version headings.
*
* @param {array<string>} lines
* @returns {array<object>}
*/
const getVersionLineIndexes = (lines) => {
const h2Indexes = [];
lines.forEach((line, index) => {
const matches = line.match(/^##\s(?<version>.*)$/);
if (matches) {
h2Indexes.push({
index,
line,
version: matches.groups.version,
});
}
});
return h2Indexes;
};
/**
* Find the index of the Unreleased heading.
*
* @param {array<object>} versionHeadings
* @returns {number}
*/
const findUnreleasedHeadingIndex = (versionHeadings) => versionHeadings.findIndex((heading) => {
if (heading.version === 'Unreleased') {
// Used if version cannot be guessed.
return true;
}
if (heading.version.endsWith('+')) {
// Weekly release for a stable branch.
return true;
}
if (heading.version.match(/beta|rc\d/)) {
// Beta and RC rolls are treated as weeklies.
return true;
}
if (heading.version.endsWith('dev')) {
// Development version.
return true;
}
return false;
});
/**
* Get the before and after content, to facilitate replacing any existing Unreleased notes.
*
* @param {array<string>} lines
* @returns {Object} {beforeContent: string, afterContent: string}
*/
const getBeforeAndAfterContent = (lines) => {
const existingLines = lines.split('\n');
const versionHeadings = getVersionLineIndexes(existingLines);
if (versionHeadings.length > 0) {
const unreleasedHeadingIndex = findUnreleasedHeadingIndex(versionHeadings);
if (unreleasedHeadingIndex !== -1) {
const beforeContent = existingLines.slice(0, versionHeadings[unreleasedHeadingIndex].index).join('\n');
if (versionHeadings.length > unreleasedHeadingIndex + 1) {
const afterContent = existingLines.slice(versionHeadings[unreleasedHeadingIndex + 1].index).join('\n');
return {
beforeContent,
afterContent,
};
}
return {
beforeContent,
afterContent: '',
};
}
return {
beforeContent: existingLines.slice(0, versionHeadings[0].index).join('\n'),
afterContent: existingLines.slice(versionHeadings[0].index).join('\n'),
};
}
return {
beforeContent: existingLines.join('\n'),
afterContent: '',
}
};
/**
* Get the notes for the component.
*
* @param {string} types
* @param {Number} headingLevel
* @returns {string}
*/
const getNotesForComponent = (types, headingLevel) => {
let upgradeNotes = '';
Object.entries(types).forEach(([type, notes]) => {
upgradeNotes += '#'.repeat(headingLevel);
upgradeNotes += ` ${getNoteName(type)}\n\n`;
notes.forEach(({ message, issueNumber }) => {
// Split the message into lines, removing empty lines.
const messageLines = message
.split('\n')
// Remove empty lines between tables, and list entries, but not after lists.
.filter((line, index, lines) => {
if (line.trim().length === 0) {
// This line is empty.
// If it's the first line in the file, remove it.
if (index === 0) {
return false;
}
// This is the last line in the file, remove it.
if (index === lines.length - 1) {
return false;
}
// If the previous line relates to a table, remove this line.
if (lines[index - 1].match(/^\s*\|/)) {
return false;
}
// If the next line is also empty, do not remove this line.
if (lines[index + 1].trim().length === 0) {
return true;
}
// Do not remove the line if the previous line was a list item.
if (lines[index - 1].match(/^\s*[-*]\s/)) {
return true;
}
if (lines[index - 1].match(/^\s*\d+\.\s/)) {
return true;
}
// Preserve all other empty lines by default.
return true;
}
// Keep any line which has content.
return true;
});
const firstLine = messageLines.shift().trim();
upgradeNotes += `- ${firstLine}\n`;
messageLines
.forEach((line) => {
upgradeNotes += ` ${line}`.trimEnd() + `\n`;
});
upgradeNotes += `\n For more information see [${issueNumber}](https://tracker.moodle.org/browse/${issueNumber})\n`;
});
upgradeNotes += '\n';
});
return upgradeNotes;
};
/**
* Get the updated notes mixed with existing content.
*
* @param {string} existingContent
* @param {string} upgradeNotes
*/
const getUpdatedNotes = (existingContent, upgradeNotes) => {
const { beforeContent, afterContent } = getBeforeAndAfterContent(existingContent);
const newContent = `${beforeContent}\n${upgradeNotes}\n${afterContent}`
.split('\n')
.filter((line, index, lines) => {
if (line === '' && lines[index - 1] === '') {
// Remove multiple consecutive empty lines.
return false;
}
return true;
})
.join('\n');
return newContent;
};
/**
* Update the notes for each component.
*/
const updateComponentNotes = (
notes,
version,
notesFileName = 'UPGRADING.md',
removeEmpty = false,
) => {
return getAllComponents().map(async (component) => {
logger.verbose(`Updating notes for ${component.name} into ${component.path}`);
const fileName = joinPath(component.path, notesFileName);
const existingContent = await getCurrentNotes(fileName);
if (!existingContent) {
if (!notes[component.value]) {
// No existing notes, and no new notes to add.
return;
}
} else {
if (!notes[component.value]) {
// There is existing content, but nothing to add.
if (removeEmpty) {
logger.verbose(`Removing empty notes file ${fileName}`);
await unlink(fileName);
}
return;
}
}
const componentNotes = notes[component.value];
let upgradeNotes = `## ${version}\n\n`;
upgradeNotes += getNotesForComponent(componentNotes, 3);
if (existingContent) {
await writeFile(fileName, getUpdatedNotes(existingContent, upgradeNotes));
} else {
await writeFile(
fileName,
`# ${component.name} Upgrade notes\n\n${upgradeNotes}`,
);
}
});
}
/**
* Generate the upgrade notes for a new release.
*
* @param {string|undefined} version
* @param {Object} options
* @param {boolean} options.generateUpgradeNotes
* @param {boolean} options.deleteNotes
* @returns {Promise<void>}
*/
export default async (version, options = {}) => {
const notes = await getCombinedNotesByComponent();
if (Object.keys(notes).length === 0) {
logger.warn('No notes to generate');
return;
}
if (!version) {
version = await getCurrentVersion();
}
// Generate the upgrade notes for this release.
// We have
// - a title with the release name
// - the change types
// - which contain the components
// - which document each change
let upgradeNotes = `## ${version}\n\n`;
Object.entries(notes).forEach(([component, types]) => {
upgradeNotes += `### ${component}\n\n`;
upgradeNotes += getNotesForComponent(types, 4);
});
await Promise.all([
createCurrentSummary(upgradeNotes),
...updateComponentNotes(notes, version, 'UPGRADING-CURRENT.md', true),
]);
if (options.generateUpgradeNotes) {
await Promise.all(updateComponentNotes(notes, version));
await updateUpgradeNotes(upgradeNotes, options);
}
};
-244
View File
@@ -1,244 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import chalk from 'chalk';
import branchName from 'current-git-branch';
import { isStandardComponent, isCommunityComponent, rewritePlugintypeAsSubsystem } from './components.mjs';
import { isValidNoteName } from './noteTypes.mjs';
import logger from './logger.mjs';
import { readFile } from 'fs/promises';
/**
* Validate an issue number input
*
* @param {string} input
* @returns {string|boolean}
*/
export const validateIssueNumber = (input) => {
if (!input) {
return 'You must provide a tracker issue number';
}
if (input.match(/^[a-zA-Z]*-\d+$/)) {
return true;
}
if (input.match(/^\d+$/)) {
return true;
}
return 'The issue number was not recognised as a valid issue number';
};
/**
* Format an issue number input.
*
* @param {string} input
* @returns {string}
*/
export const formatIssueNumber = (input) => {
if (input.match(/^[a-zA-Z]*-\d+$/)) {
return input;
}
if (input.match(/^\d+$/)) {
return `MDL-${input}`;
}
return input;
};
/**
* Get the issue number, based off current git branch name
*
* @returns {string|null}
*/
export const getIssueNumberFromBranchName = () => {
const issueNumber = String(branchName()).match(/^[a-zA-Z]*-\d+/);
if (issueNumber) {
return formatIssueNumber(issueNumber[0]);
}
return null;
};
/**
* Validate a component.
*
* @param {string} input
* @returns {string|boolean}
*/
export const validateComponent = (input) => {
if (isStandardComponent(input)) {
return true;
}
if (isCommunityComponent(input)) {
return 'Currently only core plugins are supported.';
}
return 'The component was not recognised as a standard component';
};
export const formatComponent = (input) => {
if (rewritePlugintypeAsSubsystem(input)) {
return `core_${input}`;
}
return input;
}
/**
* Get the initial values from the options.
*
* @param {object} options
* @returns {object}
*/
export const getInitialValues = (options) => {
const initialValues = {};
const type = getInitialTypeValue(options);
if (type) {
initialValues.type = type;
}
const issueNumber = getInitialIssueValue(options);
if (issueNumber) {
initialValues.issueNumber = issueNumber;
}
const component = getInitialComponentValue(options);
if (component) {
initialValues.components = component;
}
const message = getInitialMessageValue(options);
if (message) {
initialValues.message = message
initialValues.addAnother = false;
}
return initialValues;
};
/**
* Get the initial type value.
*
* @param {Object} options
* @returns {string|undefined}
*/
const getInitialTypeValue = (options) => {
if (!options.type) {
return;
}
options.type = options.type.trim().toLowerCase();
if (isValidNoteName(options.type)) {
return options.type;
}
logger.warn(`Note type "${chalk.underline(chalk.red(options.type))}" is not valid.`);
};
/**
* Get the initial issue number value.
*
* @param {Object} options
* @returns {string|undefined}
*/
const getInitialIssueValue = (options) => {
if (!options.issue) {
return;
}
options.issue = options.issue.trim().toUpperCase();
const issueNumberValidated = validateIssueNumber(options.issue);
if (issueNumberValidated === true) {
const issueNumber = formatIssueNumber(options.issue);
if (issueNumber !== options.issue) {
logger.warn(
`Issue number "${chalk.underline(chalk.red(options.issue))}" was updated to ` +
`"${chalk.underline(chalk.green(issueNumber))}"`
);
}
return issueNumber;
} else {
logger.warn(`Issue number "${chalk.underline(chalk.red(options.issue))}" is not valid: ${issueNumberValidated}`);
}
};
/**
* Get the initial component value.
*
* @param {Object} options
* @returns {string|undefined}
*/
const getInitialComponentValue = (options) => {
if (!options.component) {
return;
}
options.component = options.component.trim().toLowerCase();
const componentValidated = validateComponent(options.component);
if (componentValidated === true) {
const component = formatComponent(options.component);
if (component !== options.component) {
logger.warn(
`Component "${chalk.underline(chalk.red(options.component))}" was updated to ` +
`"${chalk.underline(chalk.green(component))}"`
);
}
return component;
} else {
logger.warn(`Component "${chalk.underline(chalk.red(options.component))}" is not valid: ${componentValidated}`);
}
};
/**
* Get the initial message value.
*
* @param {Object} options
* @returns {string|undefined}
*/
const getInitialMessageValue = (options) => {
if (!options.message) {
return;
}
return options.message.trim();
};
/**
* Get the current version from the project /version.php file.
*
* @returns {Promise<string>}
*/
export const getCurrentVersion = async () => {
const versionRegex = new RegExp(/^ *\$release *= *['\"](?<release>[^ \+]+\+?) *\(Build:.*/m);
try {
const versionFile = await readFile('public/version.php', 'utf8');
const match = versionFile.match(versionRegex);
if (match) {
return match.groups.release;
}
} catch(error) {
logger.error('Unable to read the version file');
}
return "Unreleased";
}
-30
View File
@@ -1,30 +0,0 @@
#!/usr/bin/env node
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import winston from 'winston';
const logger = winston.createLogger({
level: 'info',
format: winston.format.combine(
winston.format.colorize(),
winston.format.simple()
),
transports: [
new winston.transports.Console(),
],
});
export default logger;
-194
View File
@@ -1,194 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import yaml from 'js-yaml';
import path from 'path';
import { writeFile, mkdir, readdir, readFile, unlink } from 'fs/promises';
import { isValidNoteName, sortNoteTypes } from './noteTypes.mjs';
import { sortComponents } from './components.mjs';
const unreleasedPath = path.resolve('.upgradenotes');
/**
* Get the filename for the note.
*
* @param {string} issueNumnber The issue number
* @returns {string}
*/
const getFilename = (issueNumber) => {
const dateTimeFormat = new Intl.DateTimeFormat(undefined, {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
fractionalSecondDigits: 2,
timeZone: 'UTC',
});
const date = Object.fromEntries(
dateTimeFormat.formatToParts(new Date())
.filter((p) => p.type !== 'literal')
.map((p) => ([p.type, p.value]))
);
const dateString = [
date.year,
date.month,
date.day,
date.hour,
date.minute,
date.second,
date.fractionalSecond,
].join('');
return `${issueNumber}-${dateString}.yml`;
};
/**
* Create a new note.
*
* @param {string} issueNumber
* @param {[type: string]: {message: string}} messages
* @returns {string} The path to the note on disk
*/
export const createNote = async (
issueNumber,
messages,
notePath,
) => {
const note = {
issueNumber,
notes: {},
};
messages.forEach(({components, type, message}) => {
note.notes[components] = note.notes[components] || [];
note.notes[components].push({message, type});
});
if (!notePath) {
notePath = path.resolve(unreleasedPath, getFilename(issueNumber));
}
const noteContent = yaml.dump(note);
await mkdir(unreleasedPath, {recursive: true});
await writeFile(notePath, noteContent);
return notePath;
};
/**
* Get all unreleased notes.
*
* @returns {Promise<{issueNumber: string, components: string[], types: {[type: string]: {message: string}[]}}[]>
*/
export const getAllNotes = async () => {
const files = await readdir(unreleasedPath);
const notes = files
.filter((file) => file.endsWith('.yml'))
.map(async (file) => {
const filePath = path.resolve(unreleasedPath, file);
const fileContent = await readFile(filePath, 'utf8');
return {
...yaml.load(fileContent),
filePath,
};
});
return Promise.all(notes);
};
/**
* Get the list of notes, grouped by note type, then component.
*
* @returns {Promise<{[type: string]: {[components: string]: {message: string, issueNumber: string}[]}}>}
*/
export const getCombinedNotes = async () => {
const notes = await getAllNotes();
const combinedNotes = {};
notes.forEach((note) => {
Object.entries(note.notes).forEach(([components, data]) => {
data.forEach((entry) => {
if (!isValidNoteName(entry.type)) {
throw new Error(`Invalid note type: "${entry.type}" in file ${note.filePath}`);
}
combinedNotes[entry.type] = combinedNotes[entry.type] || {};
combinedNotes[entry.type][components] = combinedNotes[entry.type][components] || [];
combinedNotes[entry.type][components].push({message: entry.message, issueNumber: note.issueNumber});
});
});
});
return combinedNotes;
};
/**
* Get the list of notes, grouped by component, then by note type.
*
* @returns {Promise<{[component: string]: {[type: string]: {message: string, issueNumber: string}[]}}>}
*/
export const getCombinedNotesByComponent = async () => {
const notes = await getAllNotes();
const combinedNotes = {};
notes.forEach((note) => {
Object.entries(note.notes).forEach(([component, data]) => {
combinedNotes[component] = combinedNotes[component] || {};
data.forEach((entry) => {
if (!isValidNoteName(entry.type)) {
throw new Error(`Invalid note type: "${entry.type}" in file ${note.filePath}`);
}
combinedNotes[component][entry.type] = combinedNotes[component][entry.type] || [];
combinedNotes[component][entry.type].push({
component,
message: entry.message,
issueNumber: note.issueNumber,
type: entry.type,
});
});
});
});
// Sort notes by note type.
Object.entries(combinedNotes).forEach(([component, types]) => {
combinedNotes[component] = Object.fromEntries(
Object.entries(types).sort(([a], [b]) => sortNoteTypes(a, b))
);
});
// Sort components.
return Object.fromEntries(
Object.entries(combinedNotes).sort(([a], [b]) => sortComponents(a, b))
);
};
/**
* Delete all unreleased notes.
*
* @returns {Promise<void>}
*/
export const deleteAllNotes = async () => {
const files = await readdir(unreleasedPath);
return Promise.all(
files
.filter((item, index) => files.indexOf(item) === index)
.filter((file) => file.endsWith('.yml'))
.map((file) => unlink(`${unreleasedPath}/${file}`))
);
};
-80
View File
@@ -1,80 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* The note types.
*
* Matches the suggested order in https://keepachangelog.com/en/1.1.0/.
* @type {Object<string, string>}
*/
const noteTypes = {
'improved': 'Added',
'changed': 'Changed',
'deprecated': 'Deprecated',
'removed': 'Removed',
'fixed': 'Fixed',
};
/**
* The preferred order of note types.
*
* @type {string[]}
*/
const preferredOrder = Object.keys(noteTypes);
/**
* Comparison method to sort note types.
*
* @param {String} a
* @param {String} b
* @returns {Number}
*/
export const sortNoteTypes = (a, b) => {
const aIndex = preferredOrder.indexOf(a);
const bIndex = preferredOrder.indexOf(b);
if (aIndex === -1) {
return 1;
}
if (bIndex === -1) {
return -1;
}
return aIndex - bIndex;
};
/**
* Get the note names.
*
* @returns {string[]}
*/
export const getNoteNames = () => Object.keys(noteTypes);
/**
* Get the human-readable note name.
*
* @param {string} type
* @returns {string}
*/
export const getNoteName = (type) => noteTypes[type];
/**
* Whether the note name is valid.
*
* @param {string} type
* @returns {boolean}
*/
export const isValidNoteName = (type) => noteTypes[type] !== undefined;
-153
View File
@@ -1,153 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import inquirer from 'inquirer';
import SearchList from 'inquirer-search-list';
import { getNoteNames } from './noteTypes.mjs';
import { getAllComponents } from './components.mjs';
import {
formatComponent,
formatIssueNumber,
validateComponent,
validateIssueNumber,
} from './helpers.mjs';
/**
* A Search List which accepts an initial value.
*/
class SearchListWithInitialValue extends SearchList {
constructor(options, ...args) {
super(options, ...args);
if (options.default) {
const pointer = this.filterList.findIndex((item) => {
return item.value === options.default;
});
if (pointer > -1) {
this.pointer = pointer;
}
}
}
}
inquirer.registerPrompt('search-list', SearchListWithInitialValue);
/**
* Get the issue type prompt.
*
* @param {string} defaultData The initially selected value
* @returns {Object}
*/
export const getTypePrompt = (defaultData) => ({
default: defaultData,
type: 'search-list',
message: 'Type of change',
name: 'type',
choices: getNoteNames(),
validate: (selection) => {
if (selection.length < 1) {
return 'You must select at least one type of change';
}
return true;
},
});
/**
* Get the component prompt.
*
* @param {string} [defaultValue='core'] The initally selected value.
* @returns
*/
export const getComponentsPrompt = (defaultValue) => {
if (!defaultValue ) {
defaultValue = 'core';
}
return {
choices: getAllComponents(),
default: defaultValue,
type: 'search-list',
message: 'Component',
name: 'components',
validate: validateComponent,
filter: formatComponent,
};
};
/**
* Get the issue number prompt as an inline input.
*
* @param {string} defaultData
* @returns {object}
*/
export const getIssuePrompt = (defaultData) => ({
default: defaultData,
type: 'input',
message: 'Tracker issue number',
name: 'issueNumber',
validate: validateIssueNumber,
filter: formatIssueNumber,
});
/**
* Get a message prompt.
*
* @param {string} defaultData
* @returns
*/
export const getMessagePromptEditor = (defaultData) => ({
default: defaultData,
type: process.stdin.isTTY ? 'editor' : 'input',
postfix: '.md',
message: 'Message',
name: 'message',
waitUserInput: false,
validate: (input) => {
if (!input) {
return 'You must provide a message';
}
return true;
},
// Remove any trailing whitespace.
filter: (input) => input.split('\n').map((line) => line.trimEnd()).join('\n'),
});
/**
* Get a message prompt.
*
* @param {string} defaultData
* @returns
*/
export const getMessagePromptInput = (defaultData) => ({
default: defaultData,
type: 'input',
message: 'Message (leave empty to use editor)',
name: 'message',
filter: (input) => input.trim(),
});
/**
* Get a prompt to ask the user if they wish to add another entry.
*
* @returns {Object}
*/
export const getAddAnotherPrompt = () => ({
type: 'confirm',
message: 'Do you want to add another note?',
default: false,
name: 'addAnother',
});
-58
View File
@@ -1,58 +0,0 @@
#!/usr/bin/env node
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import { getAllComponents } from './components.mjs';
import { getCombinedNotesByComponent } from './note.mjs';
import logger from './logger.mjs';
import { existsSync } from 'fs';
/**
* Generate links to component-specific upgrade notes for each component.
*
* @param {string|undefined} tag The git tag to link to
* @returns {Promise<void>}
*/
export default async (tag) => {
const notes = await getCombinedNotesByComponent();
if (Object.keys(notes).length === 0) {
logger.warn('No notes to generate');
return;
}
if (!tag) {
logger.error('No tag provided');
return;
}
// Generate the links for the components which have upgrade notes in this release.
let upgradeNotes = `### Component API updates\n<!--cspell: disable -->\n\n`;
const componentList = Object.fromEntries(
Object.values(getAllComponents()).map(({path, value}) => [value, path]),
);
Object.entries(notes)
.map(([component]) => ({
component,
componentPath: componentList[component],
}))
.filter(({ componentPath }) => existsSync(`./${componentPath}/UPGRADING.md`))
.forEach(({component, componentPath}) => {
upgradeNotes += `- [${component}](https://github.com/moodle/moodle/blob/${tag}/${componentPath}/UPGRADING.md)\n`;
});
console.log(upgradeNotes);
};
-142
View File
@@ -1,142 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* Component Library build tasks.
*
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
/**
* Get a child path of the component library.
*
* @param {string} path
* @returns {string}
*/
const getCLPath = path => `public/admin/tool/componentlibrary/${path}`;
/**
* Get a spawn handler.
*
* This is a generic function to write the spawn output, and then to exit if required and mark the async task as
* complete.
*
* @param {Promise} done
* @returns {function}
*/
const getSpawnHandler = done => (error, result, code) => {
grunt.log.write(result);
if (error) {
grunt.log.error(result.stdout);
process.exit(code);
}
done();
};
/**
* Spawn a function against Node with the provided args.
*
* @param {array} args
* @returns {object}
*/
const spawnNodeCall = (args) => grunt.util.spawn({
cmd: 'node',
args,
}, getSpawnHandler(grunt.task.current.async()));
/**
* Build the docs using Hugo.
*
* @returns {Object} Reference to the spawned task
*/
const docsBuild = () => spawnNodeCall([
'node_modules/hugo-bin/cli.js',
'--config', getCLPath('config.yml'),
'--cleanDestinationDir',
]);
/**
* Build the docs index using the hugo-lunr-indexer.
*
* @returns {Object} Reference to the spawned task
*/
const indexBuild = () => spawnNodeCall([
'node_modules/hugo-lunr-indexer/bin/hli.js',
'-i', getCLPath('content/**'),
'-o', getCLPath('hugo/site/data/my-index.json'),
'-l', 'yaml',
'-d', '---',
]);
/**
* Build the hugo CSS.
*
* @returns {Object} Reference to the spawned task
*/
const cssBuild = () => spawnNodeCall([
'node_modules/sass/sass.js',
'--style', 'expanded',
'--source-map',
'--embed-sources',
'--precision', 6,
'--load-path', `${process.cwd()}/public`,
getCLPath('hugo/scss/docs.scss'),
getCLPath('hugo/dist/css/docs.css'),
]);
// Register the various component library tasks.
grunt.registerTask('componentlibrary:docsBuild', 'Build the component library', docsBuild);
grunt.registerTask('componentlibrary:cssBuild', 'Build the component library', cssBuild);
grunt.registerTask('componentlibrary:indexBuild', 'Build the component library', indexBuild);
grunt.registerTask('componentlibrary', 'Build the component library', [
'componentlibrary:docsBuild',
'componentlibrary:cssBuild',
'componentlibrary:indexBuild',
]);
grunt.config.merge({
watch: {
componentLibraryDocs: {
files: [
getCLPath('content/**/*.md'),
getCLPath('hugo'),
],
tasks: ['componentlibrary:docsBuild', 'componentlibrary:indexBuild'],
},
componentLibraryCSS: {
files: [
getCLPath('hugo/scss/**/*.scss'),
'hugo',
],
tasks: ['componentlibrary:cssBuild'],
},
},
});
// Add the 'componentlibrary' task as a startup task.
grunt.moodleEnv.startupTasks.push('componentlibrary');
return {
docsBuild,
cssBuild,
indexBuild,
};
};
-72
View File
@@ -1,72 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
const files = grunt.moodleEnv.files;
// Project configuration.
grunt.config.merge({
eslint: {
// Even though warnings dont stop the build we don't display warnings by default because
// at this moment we've got too many core warnings.
// To display warnings call: grunt eslint --show-lint-warnings
// To fail on warnings call: grunt eslint --max-lint-warnings=0
// Also --max-lint-warnings=-1 can be used to display warnings but not fail.
options: {
quiet: (!grunt.option('show-lint-warnings')) && (typeof grunt.option('max-lint-warnings') === 'undefined'),
maxWarnings: ((typeof grunt.option('max-lint-warnings') !== 'undefined') ? grunt.option('max-lint-warnings') : -1)
},
// Check AMD src files.
amd: {src: files ? files : grunt.moodleEnv.amdSrc},
// Check YUI module source files.
yui: {src: files ? files : grunt.moodleEnv.yuiSrc},
// Check React source files.
'react': {
options: {
fix: true,
},
src: files ? files : grunt.moodleEnv.reactSrc,
},
},
});
grunt.loadNpmTasks('grunt-eslint');
// On watch, we dynamically modify config to build only affected files. This
// method is slightly complicated to deal with multiple changed files at once (copied
// from the grunt-contrib-watch readme).
let changedFiles = Object.create(null);
const onChange = grunt.util._.debounce(function() {
const files = Object.keys(changedFiles);
grunt.config('eslint.amd.src', files);
grunt.config('eslint.yui.src', files);
changedFiles = Object.create(null);
}, 200);
grunt.event.on('watch', (action, filepath) => {
changedFiles[filepath] = action;
onChange();
});
};
-92
View File
@@ -1,92 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
/**
* Get the list of feature files to pass to the gherkin linter.
*
* @returns {Array}
*/
const getGherkinLintTargets = () => {
if (grunt.moodleEnv.files) {
// Specific files were requested. Only check these.
return grunt.moodleEnv.files;
}
if (grunt.moodleEnv.inComponent) {
return [`${grunt.moodleEnv.runDir}/tests/behat/*.feature`];
}
return ['**/tests/behat/*.feature'];
};
const handler = function() {
const done = this.async();
const options = grunt.config('gherkinlint.options');
// Grab the gherkin-lint linter and required scaffolding.
const linter = require('gherkin-lint/dist/linter.js');
const featureFinder = require('gherkin-lint/dist/feature-finder.js');
const configParser = require('gherkin-lint/dist/config-parser.js');
const formatter = require('gherkin-lint/dist/formatters/stylish.js');
// Run the linter.
return linter.lint(
featureFinder.getFeatureFiles(grunt.file.expand(options.files)),
configParser.getConfiguration(configParser.defaultConfigFileName)
)
.then(results => {
// Print the results out uncondtionally.
formatter.printResults(results);
return results;
})
.then(results => {
// Report on the results.
// The done function takes a bool whereby a falsey statement causes the task to fail.
return results.every(result => result.errors.length === 0);
})
.then(done); // eslint-disable-line promise/no-callback-in-promise
};
grunt.registerTask('gherkinlint', 'Run gherkinlint against the current directory', handler);
grunt.config.set('gherkinlint', {
options: {
files: getGherkinLintTargets(),
}
});
grunt.config.merge({
watch: {
gherkinlint: {
files: [grunt.moodleEnv.inComponent ? 'tests/behat/*.feature' : '**/tests/behat/*.feature'],
tasks: ['gherkinlint'],
},
},
});
// Add the 'gherkinlint' task as a startup task.
grunt.moodleEnv.startupTasks.push('gherkinlint');
return handler;
};
-139
View File
@@ -1,139 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
/**
* Generate the PHPCS configuration.
*
* @param {Object} thirdPartyPaths
*/
const phpcsIgnore = (thirdPartyPaths) => {
const {toXML} = require('jstoxml');
const config = {
_name: 'ruleset',
_attrs: {
name: "MoodleCore",
},
_content: [
{
rule: {
_attrs: {
ref: './phpcs.xml.dist',
},
},
},
],
};
thirdPartyPaths.forEach(library => {
config._content.push({
'exclude-pattern': library,
});
});
grunt.file.write('phpcs.xml', toXML(config, {
header: true,
indent: ' ',
}) + "\n");
};
/**
* Extracts ignore entries from a local ignore file.
*
* @param {string} componentPath the file path to the component, relative to the code base directory
* @param {string} ignoreFilePath the path to the ignore file
* @return {array} array of ignore paths to be included in the global ignore files
*/
const getEntriesFromLocalIgnoreFile = (componentPath, ignoreFilePath) => {
const ignorePaths = [];
if (grunt.file.exists(ignoreFilePath)) {
const ignoreFile = grunt.file.read(ignoreFilePath);
const entries = ignoreFile.split('\n');
entries.forEach(entry => {
entry = entry.trim();
if (entry.length > 0 && !entry.startsWith('#') && !entry.startsWith('!')) {
while (entry.startsWith('/')) {
entry = entry.substring(1);
}
ignorePaths.push(componentPath + '/' + entry);
}
});
}
return ignorePaths;
};
/**
* Generate ignore files (utilising thirdpartylibs.xml data)
*/
const handler = function() {
const path = require('path');
const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
// An array of paths to third party directories.
const thirdPartyPaths = ComponentList.getThirdPartyPaths();
const localStylelintIgnorePaths = [];
const localEslintIgnorePaths = [];
ComponentList.getComponentPaths(process.cwd() + '/').forEach(componentPath => {
const localEslintIgnorePath = process.cwd() + '/' + componentPath + '/.eslintignore';
const localEslintIgnoreEntries = getEntriesFromLocalIgnoreFile(componentPath, localEslintIgnorePath);
if (localEslintIgnoreEntries.length > 0) {
localEslintIgnorePaths.push(...localEslintIgnoreEntries);
}
const localStylelintIgnorePath = process.cwd() + '/' + componentPath + '/.stylelintignore';
const localStylelintIgnoreEntries = getEntriesFromLocalIgnoreFile(componentPath, localStylelintIgnorePath);
if (localStylelintIgnoreEntries.length > 0) {
localStylelintIgnorePaths.push(...localStylelintIgnoreEntries);
}
});
// Generate .eslintignore.
const eslintIgnores = [
'# Generated by "grunt ignorefiles"',
// Do not ignore the .grunt directory.
'!/.grunt',
// Ignore all yui/src meta directories and build directories.
'*/**/yui/src/*/meta/',
'*/**/build/',
].concat(thirdPartyPaths).concat(localEslintIgnorePaths);
grunt.file.write('.eslintignore', eslintIgnores.join('\n') + '\n');
// Generate .stylelintignore.
const stylelintIgnores = [
'# Generated by "grunt ignorefiles"',
'**/yui/build/*',
'public/theme/boost/style/moodle.css',
'public/theme/classic/style/moodle.css',
'jsdoc/styles/*.css',
'public/admin/tool/componentlibrary/hugo/dist/css/docs.css',
].concat(thirdPartyPaths).concat(localStylelintIgnorePaths);
grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
phpcsIgnore(thirdPartyPaths);
};
grunt.registerTask('ignorefiles', 'Generate ignore files for linters', handler);
return handler;
};
-218
View File
@@ -1,218 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
/**
* Function to generate the destination for the minification task
* (e.g. build/file.min.js). This function will be passed to
* the rename property of files array when building dynamically:
* http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically
*
* @param {String} destPath the current destination
* @param {String} srcPath the matched src path
* @return {String} The rewritten destination path.
*/
const babelRename = function(destPath, srcPath) {
destPath = srcPath.replace(`amd/src`, `amd/build`);
destPath = destPath.replace(/\.js$/, '.min.js');
return destPath;
};
module.exports = grunt => {
// Load the React build tasks.
require('./react')(grunt);
// Load the Ignorefiles tasks.
require('./ignorefiles')(grunt);
// Load the Shifter tasks.
require('./shifter')(grunt);
// Load ESLint.
require('./eslint')(grunt);
// Load jsconfig.
require('./jsconfig')(grunt);
// Load JSDoc.
require('./jsdoc')(grunt);
const path = require('path');
// Register JS tasks.
grunt.registerTask('yui', ['eslint:yui', 'shifter']);
grunt.registerTask('amd', ['ignorefiles', 'eslint:amd', 'rollup']);
grunt.registerTask('js', ['amd', 'yui', 'react']);
// Register NPM tasks.
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-rollup');
const babelTransform = require('@babel/core').transform;
const babel = (options = {}) => {
return {
name: 'babel',
transform: (code, id) => {
grunt.log.debug(`Transforming ${id}`);
options.filename = id;
const transformed = babelTransform(code, options);
return {
code: transformed.code,
map: transformed.map
};
}
};
};
// Note: We have to use a rate limit plugin here because rollup runs all tasks asynchronously and in parallel.
// When we kick off a full run, if we kick off a rollup of every file this will fork-bomb the machine.
// To work around this we use a concurrent Promise queue based on the number of available processors.
const rateLimit = () => {
const queue = [];
let queueRunner;
const startQueue = () => {
if (queueRunner) {
return;
}
queueRunner = setTimeout(() => {
const limit = Math.max(1, require('os').cpus().length / 2);
grunt.log.debug(`Starting rollup with queue size of ${limit}`);
runQueue(limit);
}, 100);
};
// The queue runner will run the next `size` items in the queue.
const runQueue = (size = 1) => {
queue.splice(0, size).forEach(resolve => {
grunt.log.debug(`Item resolved. Kicking off next one.`);
resolve();
});
};
return {
name: 'ratelimit',
// The options hook is run in parallel.
// We can return an unresolved Promise which is queued for later resolution.
options: async(options) => {
return new Promise(resolve => {
queue.push(resolve);
startQueue();
return options;
});
},
// When an item in the queue completes, start the next item in the queue.
generateBundle: (options, bundle) => {
grunt.log.debug(`Finished output phase for ${Object.keys(bundle).join(', ')}`);
runQueue();
},
};
};
const terser = require('rollup-plugin-terser').terser;
grunt.config.merge({
rollup: {
options: {
format: 'esm',
dir: 'output',
sourcemap: true,
treeshake: false,
context: 'window',
plugins: [
rateLimit(),
babel({
sourceMaps: true,
comments: false,
compact: false,
plugins: [
'transform-es2015-modules-amd-lazy',
'system-import-transformer',
// This plugin modifies the Babel transpiling for "export default"
// so that if it's used then only the exported value is returned
// by the generated AMD module.
//
// It also adds the Moodle plugin name to the AMD module definition
// so that it can be imported as expected in other modules.
path.resolve('.grunt/babel-plugin-add-module-to-define.js')
],
presets: [
['@babel/preset-env', {
modules: false,
useBuiltIns: false
}]
]
}),
terser({
// Do not mangle variables.
// Makes debugging easier.
mangle: false,
}),
],
},
dist: {
files: [{
expand: true,
src: grunt.moodleEnv.files ? grunt.moodleEnv.files : grunt.moodleEnv.amdSrc,
rename: babelRename
}],
},
},
});
grunt.config.merge({
watch: {
amd: {
files: grunt.moodleEnv.inComponent
? ['amd/src/*.js', 'amd/src/**/*.js']
: ['**/amd/src/**/*.js'],
tasks: ['amd']
},
},
});
// Add the 'js' task as a startup task.
grunt.moodleEnv.startupTasks.push('js');
// On watch, we dynamically modify config to build only affected files. This
// method is slightly complicated to deal with multiple changed files at once (copied
// from the grunt-contrib-watch readme).
let changedFiles = Object.create(null);
const onChange = grunt.util._.debounce(function() {
const files = Object.keys(changedFiles);
grunt.config('rollup.dist.files', [{expand: true, src: files, rename: babelRename}]);
changedFiles = Object.create(null);
}, 200);
grunt.event.on('watch', function(action, filepath) {
changedFiles[filepath] = action;
onChange();
});
return {
babelRename,
};
};
-83
View File
@@ -1,83 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
// @ts-nocheck
/**
* @copyright 2022 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
const configuration = {
compilerOptions: {
baseUrl: ".",
paths: {
},
target: "es2015",
allowSyntheticDefaultImports: false,
},
exclude: [
"node_modules",
],
include: [],
};
/**
* Generate jsconfig.json with AMD module path aliases for all components.
*
* @param {object} grunt The Grunt instance.
*/
const generateJsconfig = (grunt) => {
const jsconfigData = Object.assign({}, configuration);
const path = require('path');
const {fetchComponentData} = require(path.join(process.cwd(), '.grunt', 'components.js'));
const componentData = fetchComponentData().components;
for (const [thisPath, component] of Object.entries(componentData)) {
jsconfigData.compilerOptions.paths[`${component}/*`] = [`${thisPath}/amd/src/*`];
jsconfigData.include.push(`${thisPath}/amd/src/**/*`);
}
grunt.file.write('jsconfig.json', JSON.stringify(jsconfigData, null, " ") + "\n");
grunt.log.write('✓ Generating jsconfig.json\n');
};
/**
* Generate tsconfig.aliases.json with TypeScript path aliases for all ESM components.
*
* @returns {Promise<void>}
*/
const generateTsAliases = async() => {
const {generateAliases} = await import('../../.esbuild/generate-aliases.mjs');
generateAliases();
};
module.exports = (grunt) => {
const handler = async function() {
const done = this.async();
try {
generateJsconfig(grunt);
await generateTsAliases();
done();
} catch (err) {
grunt.log.error(err.message);
done(false);
}
};
grunt.registerTask('jsconfig', 'Generate a jsconfig configuration compatible with the LSP', handler);
};
-52
View File
@@ -1,52 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = (grunt) => {
const path = require('path');
grunt.registerTask('jsdoc', 'Generate JavaScript documentation using jsdoc', function() {
const done = this.async();
const configuration = path.resolve('.grunt/jsdoc/jsdoc.conf.js');
grunt.util.spawn({
cmd: 'jsdoc',
args: [
'--configure',
configuration,
]
}, function(error, result, code) {
if (result.stdout) {
grunt.log.write(result.stdout);
}
if (result.stderr) {
grunt.log.error(result.stderr);
}
if (error) {
grunt.fail.fatal(`JSDoc failed with error code ${code}`);
} else {
grunt.log.write('JSDoc completed successfully'.green);
}
done();
});
});
};
-111
View File
@@ -1,111 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
// @ts-nocheck
/**
* Grunt tasks for building React components.
*
* @copyright Meirza <meirza.arson@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
/**
* Register react task — build or watch React components.
*
* Modes:
* grunt react — production build
* grunt react:dev — development build (sourcemaps, no minification)
* grunt react:watch — esbuild native watch (dev mode, incremental context)
*
* Note: react:watch uses esbuild's own context.watch() and is intentionally
* separate from grunt-contrib-watch. This keeps esbuild's incremental build
* graph alive between rebuilds rather than restarting from scratch on each change.
*/
grunt.registerTask('react', 'Build all React components', function(mode) {
const done = this.async();
const isWatch = mode === 'watch';
const isDev = isWatch || mode === 'dev';
if (isWatch) {
const path = require('path');
const {spawn} = require('child_process');
// Run ESLint on the rebuilt source files in check-only mode (no --fix)
// to avoid writing changes that would re-trigger esbuild.
const eslintBin = path.join(grunt.moodleEnv.gruntFilePath, 'node_modules', '.bin', 'eslint');
const onRebuild = (srcFiles) => {
if (srcFiles.length === 0) {
return;
}
const absSrcFiles = srcFiles.map(f => path.join(grunt.moodleEnv.gruntFilePath, f));
spawn(eslintBin, absSrcFiles, {stdio: 'inherit'})
.on('error', err => grunt.log.error(`ESLint: ${err.message}`));
};
(async() => {
try {
const {watchComponents} = await import('../../.esbuild/plugin/plugincomponents.mjs');
const { generateAliases } = await import('../../.esbuild/generate-aliases.mjs');
const { buildPluginComponents } = await import('../../.esbuild/plugin/plugincomponents.mjs');
generateAliases();
await buildPluginComponents(isDev);
const ctx = await watchComponents(true, onRebuild);
if (!ctx) {
grunt.log.warn('No React source files found. Nothing to watch.');
done();
return;
}
grunt.log.ok('esbuild is watching for React changes. Press Ctrl+C to stop.');
// Keep the process alive until the user interrupts. done() is intentionally
// not called here — grunt's async mechanism holds the process open.
process.on('SIGINT', async() => {
await ctx.dispose();
done();
});
} catch (err) {
grunt.log.error(err.message);
done(false);
}
})();
return;
}
grunt.log.writeln(`Building React components in ${isDev ? 'DEVELOPMENT' : 'PRODUCTION'} mode...`);
(async() => {
try {
const {generateAliases} = await import('../../.esbuild/generate-aliases.mjs');
const {buildPluginComponents} = await import('../../.esbuild/plugin/plugincomponents.mjs');
generateAliases();
await buildPluginComponents(isDev);
done();
} catch (err) {
grunt.log.error(err.message);
done(false);
}
})();
});
};
-43
View File
@@ -1,43 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
grunt.loadNpmTasks('grunt-sass');
grunt.config.merge({
sass: {
dist: {
files: {
"public/theme/boost/style/moodle.css": "public/theme/boost/scss/preset/default.scss",
"public/theme/classic/style/moodle.css": "public/theme/classic/scss/classicgrunt.scss"
}
},
options: {
implementation: require('sass'),
includePaths: [
"public/theme/boost/scss/",
"public/theme/classic/scss/",
]
}
},
});
};
-155
View File
@@ -1,155 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
/* eslint-env node */
module.exports = grunt => {
/**
* Shifter task. Is configured with a path to a specific file or a directory,
* in the case of a specific file it will work out the right module to be built.
*
* Note that this task runs the invidiaul shifter jobs async (becase it spawns
* so be careful to to call done().
*/
const handler = function() {
const done = this.async();
const options = grunt.config('shifter.options');
const async = require('async');
const path = require('path');
// Run the shifter processes one at a time to avoid confusing output.
async.eachSeries(options.paths, function(src, filedone) {
var args = [];
args.push(path.normalize(process.cwd() + '/node_modules/shifter/bin/shifter'));
// Always ignore the node_modules directory.
args.push('--excludes', 'node_modules');
// Determine the most appropriate options to run with based upon the current location.
if (grunt.file.isMatch('**/yui/**/*.js', src)) {
// When passed a JS file, build our containing module (this happen with
// watch).
grunt.log.debug('Shifter passed a specific JS file');
src = path.dirname(path.dirname(src));
options.recursive = false;
} else if (grunt.file.isMatch('**/yui/src', src)) {
// When in a src directory --walk all modules.
grunt.log.debug('In a src directory');
args.push('--walk');
options.recursive = false;
} else if (grunt.file.isMatch('**/yui/src/*', src)) {
// When in module, only build our module.
grunt.log.debug('In a module directory');
options.recursive = false;
} else if (grunt.file.isMatch('**/yui/src/*/js', src)) {
// When in module src, only build our module.
grunt.log.debug('In a source directory');
src = path.dirname(src);
options.recursive = false;
}
if (grunt.option('watch')) {
grunt.fail.fatal('The --watch option has been removed, please use `grunt watch` instead');
}
// Add the stderr option if appropriate
if (grunt.option('verbose')) {
args.push('--lint-stderr');
}
if (grunt.option('no-color')) {
args.push('--color=false');
}
var execShifter = function() {
grunt.log.ok("Running shifter on " + src);
grunt.util.spawn({
cmd: "node",
args: args,
opts: {cwd: src, stdio: 'inherit', env: process.env}
}, function(error, result, code) {
if (code) {
grunt.fail.fatal('Shifter failed with code: ' + code);
} else {
grunt.log.ok('Shifter build complete.');
filedone();
}
});
};
// Actually run shifter.
if (!options.recursive) {
execShifter();
} else {
// Check that there are yui modules otherwise shifter ends with exit code 1.
if (grunt.file.expand({cwd: src}, '**/yui/src/**/*.js').length > 0) {
args.push('--recursive');
execShifter();
} else {
grunt.log.ok('No YUI modules to build.');
filedone();
}
}
}, done);
};
// Register the shifter task.
grunt.registerTask('shifter', 'Run Shifter against the current directory', handler);
// Configure it.
grunt.config.set('shifter', {
options: {
recursive: true,
// Shifter takes a relative path.
paths: grunt.moodleEnv.files ? grunt.moodleEnv.files : [grunt.moodleEnv.runDir]
}
});
grunt.config.merge({
watch: {
yui: {
files: grunt.moodleEnv.inComponent
? ['yui/src/*.json', 'yui/src/**/*.js']
: ['**/yui/src/**/*.js'],
tasks: ['yui']
},
},
});
// On watch, we dynamically modify config to build only affected files. This
// method is slightly complicated to deal with multiple changed files at once (copied
// from the grunt-contrib-watch readme).
let changedFiles = Object.create(null);
const onChange = grunt.util._.debounce(function() {
const files = Object.keys(changedFiles);
grunt.config('shifter.options.paths', files);
changedFiles = Object.create(null);
}, 200);
grunt.event.on('watch', (action, filepath) => {
changedFiles[filepath] = action;
onChange();
});
return handler;
};
-49
View File
@@ -1,49 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
/**
* Generate ignore files (utilising thirdpartylibs.xml data)
*/
const handler = function() {
const path = require('path');
// Are we in a YUI directory?
if (path.basename(path.resolve(grunt.moodleEnv.cwd, '../../')) == 'yui') {
grunt.task.run('yui');
// Are we in an AMD directory?
} else if (grunt.moodleEnv.inAMD) {
grunt.task.run('amd');
// Are we in an ESM source directory?
} else if (grunt.moodleEnv.inEsm) {
grunt.task.run('react');
} else {
// Run all of the requested startup tasks.
grunt.moodleEnv.startupTasks.forEach(taskName => grunt.task.run(taskName));
}
};
// Register the startup task.
grunt.registerTask('startup', 'Run the correct tasks for the current directory', handler);
return handler;
};
-35
View File
@@ -1,35 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
// Load the ignorefiles tasks.
require('./ignorefiles')(grunt);
// Load the Style Lint tasks.
require('./stylelint')(grunt);
// Load the SASS tasks.
require('./sass')(grunt);
// Add the 'css' task as a startup task.
grunt.moodleEnv.startupTasks.push('css');
};
-187
View File
@@ -1,187 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2021 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
const getCssConfigForFiles = files => {
return {
stylelint: {
css: {
// Use a fully-qualified path.
src: files,
options: {
quietDeprecationWarnings: true,
configOverrides: {
rules: {
// These rules have to be disabled in .stylelintrc for scss compat.
"at-rule-no-unknown": true,
}
}
}
},
},
};
};
const getScssConfigForFiles = files => {
return {
stylelint: {
scss: {
options: {
quietDeprecationWarnings: true,
customSyntax: 'postcss-scss',
},
src: files,
},
},
};
};
/**
* Register any stylelint tasks.
*
* @param {Object} grunt
* @param {Array} files
* @param {String} fullRunDir
*/
const registerStyleLintTasks = () => {
const glob = require('glob');
// The stylelinters do not handle the case where a configuration was provided but no files were included.
// Keep track of whether any files were found.
let hasCss = false;
let hasScss = false;
// The stylelint processors do not take a path argument. They always check all provided values.
// As a result we must check through each glob and determine if any files match the current directory.
const scssFiles = [];
const cssFiles = [];
const requestedFiles = grunt.moodleEnv.files;
if (requestedFiles) {
// Grunt was called with a files argument.
// Check whether each of the requested files matches either the CSS or SCSS source file list.
requestedFiles.forEach(changedFilePath => {
let matchesGlob;
// Check whether this watched path matches any watched SCSS file.
matchesGlob = grunt.moodleEnv.scssSrc.some(watchedPathGlob => {
return glob.sync(watchedPathGlob).indexOf(changedFilePath) !== -1;
});
if (matchesGlob) {
scssFiles.push(changedFilePath);
hasScss = true;
}
// Check whether this watched path matches any watched CSS file.
matchesGlob = grunt.moodleEnv.cssSrc.some(watchedPathGlob => {
return glob.sync(watchedPathGlob).indexOf(changedFilePath) !== -1;
});
if (matchesGlob) {
cssFiles.push(changedFilePath);
hasCss = true;
}
});
} else {
// Grunt was called without a list of files.
// The start directory (runDir) may be a child dir of the project.
// Check each scssSrc file to see if it's in the start directory.
// This means that we can lint just mod/*/styles.css if started in the mod directory.
grunt.moodleEnv.scssSrc.forEach(path => {
if (path.startsWith(grunt.moodleEnv.runDir)) {
scssFiles.push(path);
hasScss = true;
}
});
grunt.moodleEnv.cssSrc.forEach(path => {
if (path.startsWith(grunt.moodleEnv.runDir)) {
cssFiles.push(path);
hasCss = true;
}
});
}
// Register the tasks.
const scssTasks = ['sass'];
if (hasScss) {
grunt.config.merge(getScssConfigForFiles(scssFiles));
scssTasks.unshift('stylelint:scss');
}
scssTasks.unshift('ignorefiles');
const cssTasks = ['ignorefiles'];
if (hasCss) {
grunt.config.merge(getCssConfigForFiles(cssFiles));
cssTasks.push('stylelint:css');
}
// The tasks must be registered, even if empty to ensure a consistent command list.
// They jsut won't run anything.
grunt.registerTask('scss', scssTasks);
grunt.registerTask('rawcss', cssTasks);
};
// Register CSS tasks.
grunt.loadNpmTasks('grunt-stylelint');
// Register the style lint tasks.
registerStyleLintTasks();
grunt.registerTask('css', ['scss', 'rawcss']);
const getCoreThemeMatches = () => {
const scssMatch = 'scss/**/*.scss';
if (grunt.moodleEnv.inTheme) {
return [scssMatch];
}
if (grunt.moodleEnv.runDir.startsWith('theme')) {
return [`*/${scssMatch}`];
}
return [`theme/*/${scssMatch}`];
};
// Add the watch configuration for rawcss, and scss.
grunt.config.merge({
watch: {
rawcss: {
files: [
'**/*.css',
],
excludes: [
'**/moodle.css',
'**/editor.css',
'jsdoc/styles/*.css',
],
tasks: ['rawcss']
},
scss: {
files: getCoreThemeMatches(),
tasks: ['scss']
},
},
});
};
-42
View File
@@ -1,42 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2023 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
/**
* Generate upgradable third-party libraries (utilising thirdpartylibs.xml data)
*/
grunt.registerTask('upgradablelibs', 'Generate upgradable third-party libraries', async function() {
const done = this.async();
const path = require('path');
const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
// An array of third party libraries that have a newer version in their repositories.
const thirdPartyLibs = await ComponentList.getThirdPartyLibsUpgradable({progress: true});
for (let library of thirdPartyLibs) {
grunt.log.ok(JSON.stringify(Object.assign({}, library), null, 4));
}
done();
});
};
-276
View File
@@ -1,276 +0,0 @@
/**
* This is a wrapper task to handle the grunt watch command. It attempts to use
* Watchman to monitor for file changes, if it's installed, because it's much faster.
*
* If Watchman isn't installed then it falls back to the grunt-contrib-watch file
* watcher for backwards compatibility.
*/
/* eslint-env node */
module.exports = grunt => {
/**
* This is a wrapper task to handle the grunt watch command. It attempts to use
* Watchman to monitor for file changes, if it's installed, because it's much faster.
*
* If Watchman isn't installed then it falls back to the grunt-contrib-watch file
* watcher for backwards compatibility.
*/
const watchHandler = function() {
const async = require('async');
const watchTaskDone = this.async();
let watchInitialised = false;
let watchTaskQueue = {};
let processingQueue = false;
const watchman = require('fb-watchman');
const watchmanClient = new watchman.Client();
// Grab the tasks and files that have been queued up and execute them.
var processWatchTaskQueue = function() {
if (!Object.keys(watchTaskQueue).length || processingQueue) {
// If there is nothing in the queue or we're already processing then wait.
return;
}
processingQueue = true;
// Grab all tasks currently in the queue.
var queueToProcess = watchTaskQueue;
// Reset the queue.
watchTaskQueue = {};
async.forEachSeries(
Object.keys(queueToProcess),
function(task, next) {
var files = queueToProcess[task];
var filesOption = '--files=' + files.join(',');
grunt.log.ok('Running task ' + task + ' for files ' + filesOption);
// Spawn the task in a child process so that it doesn't kill this one
// if it failed.
var args = [task, filesOption];
if (grunt.option('force')) {
args.push('--force');
}
grunt.util.spawn(
{
// Spawn with the grunt bin.
grunt: true,
// Run from current working dir and inherit stdio from process.
opts: {
cwd: grunt.moodleEnv.fullRunDir,
stdio: 'inherit'
},
args: args
},
function(err, res, code) {
if (code !== 0) {
// The grunt task failed.
grunt.log.error(err);
}
// Move on to the next task.
next();
}
);
},
function() {
// No longer processing.
processingQueue = false;
// Once all of the tasks are done then recurse just in case more tasks
// were queued while we were processing.
processWatchTaskQueue();
}
);
};
const originalWatchConfig = grunt.config.get(['watch']);
const watchConfig = Object.keys(originalWatchConfig).reduce(function(carry, key) {
if (key == 'options') {
return carry;
}
const value = originalWatchConfig[key];
const taskNames = value.tasks;
const files = value.files;
let excludes = [];
if (value.excludes) {
excludes = value.excludes;
}
taskNames.forEach(function(taskName) {
carry[taskName] = {
files,
excludes,
};
});
return carry;
}, {});
watchmanClient.on('error', function(error) {
// We have to add an error handler here and parse the error string because the
// example way from the docs to check if Watchman is installed doesn't actually work!!
// See: https://github.com/facebook/watchman/issues/509
if (error.message.match('Watchman was not found')) {
// If watchman isn't installed then we should fallback to the other watch task.
grunt.log.ok('It is recommended that you install Watchman for better performance using the "watch" command.');
// Fallback to the old grunt-contrib-watch task.
grunt.renameTask('watch-grunt', 'watch');
grunt.task.run(['watch']);
// This task is finished.
watchTaskDone(0);
} else {
grunt.log.error(error);
// Fatal error.
watchTaskDone(1);
}
});
watchmanClient.on('subscription', function(resp) {
if (resp.subscription !== 'grunt-watch') {
return;
}
resp.files.forEach(function(file) {
grunt.log.ok('File changed: ' + file.name);
var fullPath = grunt.moodleEnv.fullRunDir + '/' + file.name;
Object.keys(watchConfig).forEach(function(task) {
const fileGlobs = watchConfig[task].files;
var match = fileGlobs.some(function(fileGlob) {
return grunt.file.isMatch(`**/${fileGlob}`, fullPath);
});
if (match) {
// If we are watching a subdirectory then the file.name will be relative
// to that directory. However the grunt tasks expect the file paths to be
// relative to the Gruntfile.js location so let's normalise them before
// adding them to the queue.
var relativePath = fullPath.replace(grunt.moodleEnv.gruntFilePath + '/', '');
if (task in watchTaskQueue) {
if (!watchTaskQueue[task].includes(relativePath)) {
watchTaskQueue[task] = watchTaskQueue[task].concat(relativePath);
}
} else {
watchTaskQueue[task] = [relativePath];
}
}
});
});
processWatchTaskQueue();
});
process.on('SIGINT', function() {
// Let the user know that they may need to manually stop the Watchman daemon if they
// no longer want it running.
if (watchInitialised) {
grunt.log.ok('The Watchman daemon may still be running and may need to be stopped manually.');
}
process.exit();
});
// Initiate the watch on the current directory.
watchmanClient.command(['watch-project', grunt.moodleEnv.fullRunDir], function(watchError, watchResponse) {
if (watchError) {
grunt.log.error('Error initiating watch:', watchError);
watchTaskDone(1);
return;
}
if ('warning' in watchResponse) {
grunt.log.error('warning: ', watchResponse.warning);
}
var watch = watchResponse.watch;
var relativePath = watchResponse.relative_path;
watchInitialised = true;
watchmanClient.command(['clock', watch], function(clockError, clockResponse) {
if (clockError) {
grunt.log.error('Failed to query clock:', clockError);
watchTaskDone(1);
return;
}
// Generate the expression query used by watchman.
// Documentation is limited, but see https://facebook.github.io/watchman/docs/expr/allof.html for examples.
// We generate an expression to match any value in the files list of all of our tasks, but excluding
// all value in the excludes list of that task.
//
// [anyof, [
// [allof, [
// [anyof, [
// ['match', validPath, 'wholename'],
// ['match', validPath, 'wholename'],
// ],
// [not,
// [anyof, [
// ['match', invalidPath, 'wholename'],
// ['match', invalidPath, 'wholename'],
// ],
// ],
// ],
var matchWholeName = fileGlob => ['match', fileGlob, 'wholename'];
var matches = Object.keys(watchConfig).map(function(task) {
const matchAll = [];
matchAll.push(['anyof'].concat(watchConfig[task].files.map(matchWholeName)));
if (watchConfig[task].excludes.length) {
matchAll.push(['not', ['anyof'].concat(watchConfig[task].excludes.map(matchWholeName))]);
}
return ['allof'].concat(matchAll);
});
matches = ['anyof'].concat(matches);
var sub = {
expression: matches,
// Which fields we're interested in.
fields: ["name", "size", "type"],
// Add our time constraint.
since: clockResponse.clock
};
if (relativePath) {
/* eslint-disable camelcase */
sub.relative_root = relativePath;
}
watchmanClient.command(['subscribe', watch, 'grunt-watch', sub], function(subscribeError) {
if (subscribeError) {
// Probably an error in the subscription criteria.
grunt.log.error('failed to subscribe: ', subscribeError);
watchTaskDone(1);
return;
}
grunt.log.ok('Listening for changes to files in ' + grunt.moodleEnv.fullRunDir);
});
});
});
};
// Rename the grunt-contrib-watch "watch" task because we're going to wrap it.
grunt.renameTask('watch', 'watch-grunt');
// Register the new watch handler.
grunt.registerTask('watch', 'Run tasks on file changes', watchHandler);
grunt.config.merge({
watch: {
options: {
nospawn: true // We need not to spawn so config can be changed dynamically.
},
},
});
return watchHandler;
};
-111
View File
@@ -1,111 +0,0 @@
#!/usr/bin/env node
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import { Argument, Option, program } from 'commander';
import chalk from 'chalk';
import { getNoteNames } from './notes/src/noteTypes.mjs';
import createAction from './notes/src/create.mjs';
import generateAction from './notes/src/generate.mjs';
import generateReleaseNotesLinks from './notes/src/releasenotes.mjs';
import logger from './notes/src/logger.mjs';
console.log(`
${chalk.bold(chalk.underline(chalk.green('Moodle Upgrade Notes Generator')))}
This tool is used to generate the upgrade notes for changes you make in Moodle.
Please remember that the intended audience of these changes is
${chalk.italic('plugin developers')} who need to know how to update their plugins
for a new Moodle version.
Upgrade notes should not be used to document changes for site administrators, or
for internal API changes which are not expected to be used outside of the
relevant component.
`)
program.configureHelp({
helpWidth: 100,
});
program.on('option:verbose', () => {
logger.level = 'verbose';
});
program.addOption(
new Option(
'-v, --verbose',
'Output more information during the generation process',
)
.default(false)
);
// Define the command line options.
program
.command('create')
.summary('Generate a new upgrade note')
.addOption(
new Option('-t, --type <type>', `The type of change to document. Valid types are: ${getNoteNames().join(', ')}`)
)
.addOption(new Option('-i, --issue <issue>', 'The tracker issue number'))
.addOption(new Option('-c, --component <component>', 'The component to write a note for'))
.addOption(new Option(
'-m, --message <message>',
'The message to use for the upgrade note',
))
.action((options) => createAction(options));
program
.command('summary')
.summary('Generate a local copy of the upgrade notes summary')
.addArgument(
new Argument('[version]', 'The Moodle version to create the summary notes for')
)
.action((version) => generateAction(version));
program
.command('releasenotes')
.summary('Generate a list of upgrade notes for individual components in markdown format for the release notes')
.addArgument(
new Argument('[tag]', 'The Moodle tag')
)
.action((tag) => generateReleaseNotesLinks(tag));
program
.command('release')
.summary('Generate the markdown copies of the upgrade notes for a Moodle release')
.addArgument(
new Argument('[version]', 'The Moodle version to create the release notes for')
)
.addOption(
new Option(
'--generate-upgrade-notes',
'Generate the UPGRADING.md notes for the release. ' +
'Note: This option is intended for use by the release manager when generating the upgrade notes.',
)
.default(true)
)
.addOption(
new Option(
'-d, --delete-notes',
'Delete the notes after generating the UPGRADING.md notes for the release. ' +
'Note: This option is intended for use by the release manager when generating the upgrade notes.' +
'This option has no effect unless --generate-upgrade-notes is also set.'
)
.default(false)
)
.action((version, options) => generateAction(version, options));
program.parse();
-2
View File
@@ -1,2 +0,0 @@
**/amd/**
/*.js
-58
View File
@@ -1,58 +0,0 @@
// NOTE: We use eslint now. This file is used only by shifter. We keep the configuration
// here because shifter uses jshint after modules have been concating. Eslint can't
// currently do this.
{
"asi": false,
"bitwise": true,
"boss": false,
"browser": true,
"curly": true,
"debug": false,
"eqeqeq": false,
"eqnull": false,
"es5": false,
"esnext": false,
"evil": false,
"expr": false,
"forin": false,
"funcscope": false,
"globalstrict": false,
"immed": true,
"indent": 4,
"iterator": false,
"lastsemic": false,
"latedef": true,
"laxbreak": true,
"laxcomma": false,
"loopfunc": false,
"maxerr": 500,
"maxlen": 132,
"multistr": false,
"newcap": true,
"noarg": true,
"noempty": true,
"nomen": false,
"onecase": false,
"onevar": false,
"passfail": false,
"plusplus": false,
"predef": [
"M",
"define",
"require"
],
"proto": false,
"regexdash": false,
"regexp": false,
"scripturl": false,
"shadow": false,
"smarttabs": false,
"strict": false,
"sub": false,
"supernew": false,
"trailing": true,
"undef": true,
"unused": true,
"white": false,
"yui": true
}
-1
View File
@@ -1 +0,0 @@
lts/jod
-40
View File
@@ -1,40 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Helper file for PhpStorm, and other IDEs, to provide better code completion.
*
* @package core
* @copyright 2024 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace PHPSTORM_META;
// Assume that anything returned by \core\di::get('...') is an instance of the first argument.
override(\core\di::get(0), map([
'' => '@',
]));
// Assume that anything returned by \Psr\Container\ContainerInterface::get('...') is an instance of the first argument.
override(\Psr\Container\ContainerInterface::get(0), map([
'' => '@',
]));
// Assume that anything returned by \DI\Container::get('...') is an instance of the first argument.
override(\DI\Container::get(0), map([
'' => '@',
]));
-5
View File
@@ -1,5 +0,0 @@
{
"coverage": false,
"lint": "config",
"clean": true
}
-107
View File
@@ -1,107 +0,0 @@
{
"customSyntax": "postcss-scss",
"plugins": [
"stylelint-csstree-validator"
],
"rules": {
"csstree/validator": {
"syntaxExtensions": [
"sass"
]
},
"at-rule-empty-line-before": [ "always",
{"except": [ "blockless-after-blockless"], ignore: ["after-comment", "inside-block"]}
],
"at-rule-name-case": "lower",
"at-rule-name-space-after": "always-single-line",
"at-rule-no-unknown": null, # Enabled for non-scss in grunt.
"at-rule-semicolon-newline-after": "always",
"at-rule-semicolon-space-before": "never",
"block-closing-brace-newline-after": "always",
"block-closing-brace-newline-before": "always",
"block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
"block-opening-brace-newline-after": "always",
"block-opening-brace-space-after": "always-single-line",
"block-opening-brace-space-before": "always",
"color-hex-case": ["lower", { "severity": "warning" }],
"color-hex-length": ["short", { "severity": "warning" }],
"color-no-invalid-hex": true,
"declaration-bang-space-after": "never",
"declaration-bang-space-before": "always",
"declaration-block-no-duplicate-properties": true,
"declaration-block-no-shorthand-property-overrides": true,
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
"declaration-block-trailing-semicolon": "always",
"declaration-colon-newline-after": "always-multi-line",
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"declaration-no-important": true,
"font-family-no-duplicate-names": true,
"function-calc-no-unspaced-operator": true,
"function-comma-newline-after": "always-multi-line",
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-linear-gradient-no-nonstandard-direction": true,
"function-max-empty-lines": 0,
"function-name-case": "lower",
"function-parentheses-newline-inside": "always-multi-line",
"function-parentheses-space-inside": "never-single-line",
"function-url-scheme-disallowed-list": ["data"],
"function-whitespace-after": "always",
"indentation": 4,
"keyframe-declaration-no-important": true,
"length-zero-no-unit": [true, { "severity": "warning" }],
"max-empty-lines": 2,
"max-line-length": [132, { "severity": "warning" }],
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-parentheses-space-inside": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "always",
"media-query-list-comma-newline-after": "always-multi-line",
"media-query-list-comma-space-after": "always-single-line",
"media-query-list-comma-space-before": "never",
"no-empty-source": true,
"no-eol-whitespace": true,
"no-extra-semicolons": [true, { "severity": "warning" }],
"no-invalid-double-slash-comments": true,
"no-unknown-animations": true,
"property-case": "lower",
"property-no-unknown": true,
"selector-attribute-brackets-space-inside": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-operator-space-before": "never",
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-list-comma-newline-after": "always",
"selector-list-comma-space-before": "never",
"selector-max-empty-lines": 0,
"selector-pseudo-class-case": "lower",
"selector-pseudo-class-no-unknown": true,
"selector-pseudo-class-parentheses-space-inside": "never",
"selector-pseudo-element-case": "lower",
"selector-pseudo-element-no-unknown": true,
"selector-type-case": "lower",
"selector-type-no-unknown": true,
"string-no-newline": true,
"time-min-milliseconds": 100,
"unit-disallowed-list": ["pt"],
"unit-case": "lower",
"unit-no-unknown": true,
"value-keyword-case": ["lower", {"ignoreKeywords": ["/(@|$)/"]}],
"value-list-comma-newline-after": "always-multi-line",
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never",
},
"overrides": [
{
"files": ["**/yui/**/*.css"],
"rules": {
}
}
]
}
@@ -1,7 +0,0 @@
issueNumber: MDL-51152
notes:
enrol_manual:
- message: >-
The unused parameter 'roleid' has been removed from the external
function `unenrol_users()`
type: removed
@@ -1,22 +0,0 @@
issueNumber: MDL-71368
notes:
core:
- message: >
The `arg_separator.output` has been changed from a default of `amp;` to
a default of `&` in line with PHP defaults.
If you were previously relying on the legacy default when using
`http_build_query()` then you should _actively_ specify the value as the
third
parameter, for example:
```
http_build_query($formdata, '', '&amp;');
```
type: changed
@@ -1,8 +0,0 @@
issueNumber: MDL-73602
notes:
core:
- message: >-
Removed `qtype_random` from core.
`core\component::is_valid_plugin_name` has an additional check to ensure no-one can create a new plugin called qtype_random,
as this would conflict with the support for restoring old backups.
type: removed
@@ -1,8 +0,0 @@
issueNumber: MDL-75067
notes:
tool_behat:
- message: >-
The `behat_session_trait::ensure_element_[does_not_]exists(...)` methods
now accept optional `$container` parameter to define the parent node to
look within
type: improved
@@ -1,5 +0,0 @@
issueNumber: MDL-77894
notes:
core:
- message: Appending an exclamation mark to template names ignores theme overrides
type: improved
@@ -1,10 +0,0 @@
issueNumber: MDL-78325
notes:
core_grades:
- message: >-
In Moodle 4.2, the legacy Gradebook base widget from 4.1 has been removed and
replaced with a simpler class-based system due to a breaking change and
excessive complexity in the old pattern. The files `core/grades/basewidget.js` and
templates in `grade/templates/searchwidget/` have been deleted,
with minimal expected third-party impact.
type: removed
@@ -1,13 +0,0 @@
issueNumber: MDL-79182
notes:
core:
- message: >
The following AMD modules have been removed following the final
deprecation process. It is no longer possible or necessary to manually
register modal types. See MDL-78324 for further details.
- `core/modal_registry`
- `core/modal_factory`
type: removed
@@ -1,7 +0,0 @@
issueNumber: MDL-79574
notes:
core:
- message: >-
The `\core\persistent::get_records(...)` class method now returns
instances keyed by record ID
type: changed
@@ -1,13 +0,0 @@
issueNumber: MDL-81514
notes:
core_group:
- message: >
`groups_print_activity_menu()` and `groups_get_activity_group()` now
include an additional `$participationonly` parameter, which is true by
default. This can be set false when we want the user to be able to
select a non-participation group within an activity, for example if a
teacher wants to filter assignment submissions by non-participation
groups. It should never be used when the menu is displayed to students,
as this may allow them to participate using non-participation groups.
Non-participation groups are labeled as such.
type: improved
@@ -1,8 +0,0 @@
issueNumber: MDL-81608
notes:
mod_quiz:
- message: >-
The language strings `addpagebreak` and `removepagebreak` have been
deprecated and should no longer be used. These have been replaced by
the `addpagebreakafter` and `removepagebreakafter` language strings.
type: deprecated
@@ -1,12 +0,0 @@
issueNumber: MDL-81961
notes:
core_question:
- message: |
core_question:
- message: |
Final deprecation of `moodle-question-chooser` YUI module.
type: removed
- message: |
Final deprecation of `core_question/qbank_chooser` template.
type: removed
type: removed
-13
View File
@@ -1,13 +0,0 @@
issueNumber: MDL-81962
notes:
core:
- message: The `moodle-core-notification-confirm` YUI module has been removed after an extensive deprecation period. Please use the AMD `core/modal` module as a replacement.
type: removed
- message: |
The following feaetures of the `moodle-core-notification` YUI module have been removed after an extensive deprecation process.:
- method: `keyDelegation`
- property: `lightbox`
There is no direct replacement for these features, but they were not widely used and their removal should not cause significant issues. If you were using these features, you will need to implement your own solutions for key delegation and lightbox functionality.
type: removed
@@ -1,7 +0,0 @@
issueNumber: MDL-82284
notes:
core:
- message: >-
Legacy constructors have been removed. These relate to PHP 4 and
earlier.
type: removed
@@ -1,15 +0,0 @@
issueNumber: MDL-83902
notes:
core_badges:
- message: >-
The following classes and functions are now also available in the following new
locations. They will continue to work in their old locations:
| Old classname/function | New classname/function |
| --- | --- |
| `\badge_award_selector_base` | `\core_badges\award_selector_base` |
| `\badge_potential_users_selector` | `\core_badges\potential_award_selector` |
| `\badge_existing_users_selector` | `\core_badges\existing_award_selector` |
| `process_manual_award()` | `\core_badges\award_manager::process_manual_award()` |
| `process_manual_revoke()` | `\core_badges\award_manager::process_manual_revoke()` |
type: improved
@@ -1,7 +0,0 @@
issueNumber: MDL-84082
notes:
core_reportbuilder:
- message: >-
The text filter "Contains" and "Not contains" operators now support `*`
and `?` wildcard characters for better text content filtering
type: improved
@@ -1,30 +0,0 @@
issueNumber: MDL-84960
notes:
core:
- message: >-
Several core web services now include a new initials field in user data
structures. This change is backward-compatible and only adds an optional
field; no existing fields or field semantics have been changed.
Client applications should ensure they can handle the additional initials
field in web service responses, but clients that ignore unknown fields can
continue working without changes. The affected web services are:
- core_enrol_get_enrolled_users
- core_enrol_get_enrolled_users_with_capability
- core_enrol_get_potential_users
- core_enrol_search_users
- core_user_get_users_by_field
- core_user_get_users
- core_user_get_course_user_profiles
- core_grades_get_enrolled_users_for_selector
- core_grades_get_gradable_users
- gradereport_grader_get_users_in_report
- core_message_get_contact_requests
- core_message_get_conversation_members
- core_message_message_search_users
- core_message_get_user_contacts
- core_message_get_member_info
- core_message_get_conversation_messages
- mod_assign_list_participants
- mod_assign_get_participant
- mod_forum_get_forum_discussions
type: improved
@@ -1,9 +0,0 @@
issueNumber: MDL-85233
notes:
core_filters:
- message: >-
MimeTeX support has been removed from both `filter_tex` and
`filter_algebra`. These filters now depend on LaTeX tools (`latex`,
`dvips`, and `convert`/`dvisvgm`), and as a result, the `pathmimetex`
setting has been removed.
type: removed
@@ -1,8 +0,0 @@
issueNumber: MDL-85322
notes:
block_html:
- message: >-
Treat Dashboard (pagetype 'my-index') as trusted in web services so
get_content_for_external preserves embedded HTML (e.g. iframes) on user
Dashboard.
type: changed
@@ -1,8 +0,0 @@
issueNumber: MDL-85336
notes:
core:
- message: >-
Redis connection timeout settings for cachestores and sessions have been
split into connection timeout and read timeout to allow for finer
control. These settings now also accept floats.
type: improved
@@ -1,9 +0,0 @@
issueNumber: MDL-85405
notes:
core_course:
- message: >-
The external function `core_course_get_course_contents` now includes the
`candisplay` property for each returned module. If this is false, the
module should not be displayed on the course page (for example, for
question banks).
type: improved
@@ -1,5 +0,0 @@
issueNumber: MDL-85621
notes:
core_badges:
- message: The create_issued_badge generator now returns the issued badge object.
type: changed
@@ -1,11 +0,0 @@
issueNumber: MDL-85621
notes:
core_badges:
- message: >-
The class core_badges_assertion has been deprecated and replaced by
\core_badges\achievement_credential.
The method badges_get_default_issuer() has also been deprecated because
it is no longer needed.
The file badges/endorsement.php has been removed because it stopped being used
when MDL-84323 was integrated.
type: deprecated
@@ -1,17 +0,0 @@
issueNumber: MDL-85975
notes:
core:
- message: >
`restore_qtype_plugin::unset_excluded_fields` now returns the modified
questiondata structure,
in order to support structures that contain arrays.
If your qtype plugin overrides
`restore_qtype_plugin::remove_excluded_question_data` without
calling the parent method, you may need to modify your overridden method
to use the returned
value.
type: fixed
@@ -1,8 +0,0 @@
issueNumber: MDL-86332
notes:
core_completion:
- message: >-
The `completion_info::clear_criteria` method takes an optional
`$removetypecriteria` to determine whether to remove course type
criteria from other courses that refer to the current course
type: changed
@@ -1,26 +0,0 @@
issueNumber: MDL-86493
notes:
mod_quiz:
- message: >-
The quiz overrides cache implementation has been replaced with a faster alternative with a different API.
This should be a transparent change but any direct references will still need to be updated.
type: deprecated
- message: >
`mod_quiz_cm_info_dynamic()` now uses the new `quiz_overrides` cache via `override_manager`, performing a single cache fetch per quiz/user.
This significantly reduces cache calls on course pages with many quizzes and groups.
The new `mod_quiz:quiz_overrides` cache is keyed by `quizid_userid` using datasource `\mod_quiz\cache\quiz_overrides_cache`.
This cache returns all applicable overrides for a user in a quiz (the user override, if any, plus all group overrides for groups they belong to in the quiz's course).
New class `\mod_quiz\local\quiz_overrides_cache_manager` to interact with the cache:
- `get_overrides(int $quizid, int $userid): array`
- `purge_for_user(int $quizid, int $userid): void`
- `purge_for_users(int $quizid, array $userids): void`
- `purge_for_group(int $quizid, int $groupid): void`
- `purge_for_group_members(int $groupid, array $userids): void`
Hook callbacks in `db/hooks.php` to keep the cache in sync with group
membership changes:
- `\core_group\hook\after_group_membership_added`
- `\core_group\hook\after_group_membership_removed`
type: improved
@@ -1,12 +0,0 @@
issueNumber: MDL-86524
notes:
core_question:
- message: >-
During restore of a question_set_reference, mapping of IDs in the
filtercondition is now delegated to qbank plugins.
If your qbank plugin defines a filter condition that uses database
IDs, add an override of `restore_filtercondition()` to the `condition`
class, which checks the condition's data and replaces the IDs with
mapped values if required. See
`qbank_managecategories\category_condition` for an example.
type: improved
@@ -1,7 +0,0 @@
issueNumber: MDL-86607
notes:
mod_feedback:
- message: >-
The method `feedback_init_feedback_session()` has been deprecated, along
with all other direct access to `$SESSION` from the module
type: deprecated
@@ -1,7 +0,0 @@
issueNumber: MDL-86660
notes:
core_courseformat:
- message: >-
The `$cm` attribute in `activityoverviewbase` has been updated to public
visibility, allowing direct access to the course module instance
type: changed
@@ -1,8 +0,0 @@
issueNumber: MDL-86660
notes:
core_courseformat:
- message: >-
A new `available` attribute has been added to `activityname_exporter`
class. It allows the external API to return the activity's availability
status relative to the current user.
type: changed
@@ -1,9 +0,0 @@
issueNumber: MDL-86660
notes:
core_courseformat:
- message: >-
Two new public static methods have been added to the `overviewtable`
class:
- `is_cm_displayable`: Determines if a course module should be listed in the overview table.
- `is_cm_available`: Checks if a course module is accessible to the user (and should therefore be rendered as a link).
type: changed
@@ -1,19 +0,0 @@
issueNumber: MDL-86678
notes:
core_reportbuilder:
- message: >-
The base entity class now implements a default `initialise` method, that
will automatically call each of the following methods to load entity
report data:
* `get_available_columns()`
* `get_available_filters()`
* `get_available_conditions()`
This change allows for a lot of boilerplate to be removed from report
entity classes
type: improved
@@ -1,12 +0,0 @@
issueNumber: MDL-86699
notes:
core_reportbuilder:
- message: >-
There are two new entities intended for reports specific to course
module data, in order to provide a baseline in terms of module reporting
and API usage:
*
`core_course\reportbuilder\local\entities\{course_module,course_module_base}`
type: improved
@@ -1,7 +0,0 @@
issueNumber: MDL-86699
notes:
mod_forum:
- message: >-
The forum report entity `->get_context_joins()` method is deprecated,
replaced with `->get_course_modules_joins(...)`
type: deprecated
@@ -1,17 +0,0 @@
issueNumber: MDL-86798
notes:
core_question:
- message: >
In order to prevent re-use of question version numbers after a version
is deleted, the `nextversion` column was added to
`question_bank_entries`. This serves as a counter incremented each time
a version is created.
Do not query this field directly. Instead use
`core_question\versions::get_next_version()` to read the value, which
will initialise it based on the existing versions if it is not set yet.
By default, it will increment the version number automatically, unless
you pass `increment: false`. Because of this, it is advisable to call
it inside a transaction, that is only committed after the version number
is used in a `question_versions` record.
type: fixed
@@ -1,7 +0,0 @@
issueNumber: MDL-86798
notes:
core_question:
- message: >-
`get_next_version()` from questionlib.php is now deprecated. Use
`\core_question\versions::get_next_version()` instead.
type: deprecated
@@ -1,5 +0,0 @@
issueNumber: MDL-86832
notes:
core_block:
- message: Removed block_activity_modules from Moodle 5.2.
type: removed
@@ -1,10 +0,0 @@
issueNumber: MDL-86839
notes:
core:
- message: >
"grunt watch" now accepts a force flag. Run "grunt watch -f" or "grunt
watch --force" to prevent grunt from cancelling builds when errors
occur. This is especially useful during development, because js build
files will be built even if, for example, jslint errors are still
present in the files.
type: improved
@@ -1,8 +0,0 @@
issueNumber: MDL-86846
notes:
core:
- message: >-
The `core/drag_handle` template has been modified to use a native HTML
button for a more accessible experience and a consistent look with other
buttons on the page.
type: changed
@@ -1,7 +0,0 @@
issueNumber: MDL-86854
notes:
core_courseformat:
- message: >-
Add core_courseformat\cmactions::move_before that will allow to move a coursemodule to a position before another coursemodule.
Add core_courseformat\cmactions::move_end_section that will allow to move a coursemodule the end of a section.
type: improved
@@ -1,8 +0,0 @@
issueNumber: MDL-86854
notes:
core_course:
- message: >-
Deprecates moveto_module (core_course) in favor of
cmactions::move_before or cmactions::move_end_section
(core_courseformat\local\cmactions).
type: deprecated
@@ -1,11 +0,0 @@
issueNumber: MDL-86855
notes:
qbank_columnsortorder:
- message: >-
The Behat selector `column move handle` for the `qbank_columnsortorder` plugin has been removed.
When interacting with the column's move handle, please use the move handle's accessible name and type.
For example:
- `And I drag "Move Created by" "button" and I drop it in "Move T" "button"`
type: removed
@@ -1,9 +0,0 @@
issueNumber: MDL-86856
notes:
core_course:
- message: >-
The following methods have been deprecated and should no longer be used:
- `course_delete_module`
- `course_module_flag_for_async_deletion`
Please consider using the equivalent methods, delete and delete_async, in `core_courseformat\local\cmactions` instead.
type: deprecated
@@ -1,5 +0,0 @@
issueNumber: MDL-86856
notes:
core_courseformat:
- message: Add delete method to the core_courseformat\cmactions
type: improved
@@ -1,7 +0,0 @@
issueNumber: MDL-86857
notes:
core_courseformat:
- message: >-
Add set_groupmode method to the core_courseformat\cmactions (course
format actions)
type: improved
@@ -1,7 +0,0 @@
issueNumber: MDL-86857
notes:
core_course:
- message: >-
Deprecates set_coursemodule_groupmode in favor of
core_courseformat\cmactions::set_groupmode
type: deprecated
@@ -1,7 +0,0 @@
issueNumber: MDL-86858
notes:
core_courseformat:
- message: >-
Create a new core_courseformat\cmactions::duplicate aiming to replace
the course/lib.php version
type: improved

Some files were not shown because too many files have changed in this diff Show More