Commit graph

12183 commits

Author SHA1 Message Date
Aparup Banerjee
c197d5f028 MDL-17327 database : fixed comparisions in sql to be cross db compatible in data_get_advanced_search_sql()
This was failing under the MSSQL database drivers.
2012-04-03 15:06:09 +08:00
Aparup Banerjee
31b6200263 Merge branch 'wip-MDL-17327-master' of git://github.com/abgreeve/moodle 2012-04-03 14:58:27 +08:00
Andreas Grabs
abd2899cad MDL-31768 - it is not possible to add a picture to the thanks page in feedback 2012-04-02 11:16:32 +08:00
M Kassaei
011187104f MDL-32214 quiz regrading: with many attempts, PHP runs out of memory 2012-04-02 11:04:05 +08:00
Sam Hemelryk
880a40c5b1 Merge branch 'MDL-32256-cron-return' of git://github.com/mudrd8mz/moodle 2012-04-02 11:28:09 +12:00
Sam Hemelryk
4958b6f224 Merge branch 'MDL-32258-data-cron' of git://github.com/mudrd8mz/moodle 2012-04-02 11:24:54 +12:00
Sam Hemelryk
90ad4ed589 Merge branch 'master_MDL-31908_glossary_entrylist_print_version_not_showing_content' of git://github.com/kanikagoyal/moodle 2012-04-02 11:19:58 +12:00
Petr Skoda
54352ac979 MDL-32251 more E_STRICT fixes 2012-03-30 19:02:58 +02:00
Rossiani Wijaya
f9f281b8fe MDL-30843 and MDL-30842 - accessibility compliance: Add <label> for form input text and select tag 2012-03-30 16:26:58 +08:00
adrian@moodle.com
db546510a1 MDL-17327 - data - improved the sql query for very large advanced searches 2012-03-30 13:18:23 +08:00
Sam Hemelryk
4ae89dfea7 MDL-32018 mod_wiki: Fixed up whitespace after peer-review 2012-03-30 10:21:23 +13:00
Sam Hemelryk
4c4e659173 MDL-32018 mod_wiki: Fixed formatting of the page title so that is is consistent and secure 2012-03-30 10:21:23 +13:00
Sam Hemelryk
0c700cc48d MDL-32018 mod_wiki: Improved form definitions to ensure they consistent and secure 2012-03-30 10:21:23 +13:00
David Mudrak
ac381d0381 MDL-32258 database module does not have any data_cron() function to execute 2012-03-29 15:59:45 +02:00
David Mudrak
7b0f4a3711 MDL-32256 quiz_cron() now returns true as expected by the current API 2012-03-29 15:45:45 +02:00
Petr Skoda
caee6e6c26 MDL-32251 E_STRICT fixes part 3 2012-03-29 15:24:30 +02:00
Tim Hunt
76cf77e4d3 MDL-32240 quiz editing: check permissions questions are added.
We also check permissions when removing questions from the quiz, so that
we do not let users make mistakes they cannot immediately undo.
2012-03-29 14:14:12 +01:00
Dan Poltawski
0094c90c79 MDL-31775 lesson: fix undefined variable warnings 2012-03-27 20:01:06 +08:00
Sam Hemelryk
c194925278 Merge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle 2012-03-27 09:51:40 +13:00
Eloy Lafuente (stronk7)
a176999cc5 Merge branch 'MDL-32202' of git://github.com/stronk7/moodle 2012-03-26 21:36:08 +02:00
Eloy Lafuente (stronk7)
704f82e2bf MDL-32202 scorm: fix 2 invalid default="null" definitions
Note the whole file has been changed because its previous
(manual!) commit leaded to incorrect indentation, but really
only 2 definitions have been changed:

scorm->completionstatusrequired
scorm->completionscorerequired
2012-03-26 21:27:47 +02:00
Dan Poltawski
9e1a4be29d Merge branch 'MDL-31775' of git://github.com/rwijaya/moodle 2012-03-26 14:39:10 +08:00
Dan Poltawski
113022e559 Merge branch 'MDL-32172' of git://github.com/rwijaya/moodle 2012-03-26 12:23:15 +08:00
Dan Poltawski
a05c669af0 Merge branch 'master_MDL-31856_choice_responses_inconsistently_displayed' of git://github.com/kanikagoyal/moodle 2012-03-26 12:09:32 +08:00
Dan Poltawski
91216d5095 Merge branch 'MDL-27710' of git://github.com/rwijaya/moodle 2012-03-26 11:28:21 +08:00
Dan Poltawski
2ce1efb8ac Merge branch 'master_MDL-32080' of git://github.com/danmarsden/moodle 2012-03-26 10:51:38 +08:00
Dan Poltawski
17e2b27d31 MDL-29400 assignment: Require a file to be uploaded in form
Don't display 'File uploaded successfully' when no file uploaded for
both upload and uploadsingle
2012-03-26 11:19:57 +13:00
Kanika Goyal
0c758f8200 MDL-31908 Glossary: entry list format- printable version does not show content 2012-03-26 00:00:24 +05:30
Andrew Robert Nicols
a7026767bf MDL-32164 Add string for file encoding
AMOS BEGIN
  CPY [encoding,tool_uploaduser],[fileencoding,mod_data]
AMOS END
2012-03-23 09:38:25 +00:00
Rossiani Wijaya
0f6e2f02aa MDL-32172 Lesson Module: add variable initialization for 2012-03-23 15:36:39 +08:00
Kanika Goyal
d84e5f43d1 MDL-31856 Choice: if choice not open, responses inconsistently displayed 2012-03-23 08:56:13 +05:30
Rossiani Wijaya
639818fc94 MDL-27710 lesson module: add the following jump options: unseen branch page, random page and random branch 2012-03-23 10:20:52 +08:00
Dan Marsden
dbdc735559 MDL-32147 - use correct 404 for server type 2012-03-23 10:01:04 +13:00
Jason Fowler
bcab2b21b3 MDL-30482 - Glossary - Fixing the capability controls for the recent activity block 2012-03-22 16:19:38 +08:00
Dan Marsden
6ceef54c6e MDL-32147 SCORM improve performance of 404s for files inside SCORM packages. 2012-03-22 20:05:59 +13:00
Aparup Banerjee
a72996fe71 Revert "MDL-17327 - data - improved the sql query for very large advanced searches"
This reverts commit 72d4340a0e.

Testing cross db compatibility failed.
2012-03-22 09:21:25 +08:00
Sam Hemelryk
7aea08e1b0 MDL-31857 phpunit: PHPDoc and typo fixes during integration 2012-03-22 10:45:17 +13:00
Sam Hemelryk
3222f6eca1 Merge branch 'w12_MDL-31857_m23_phpunit' of git://github.com/skodak/moodle 2012-03-22 10:44:04 +13:00
Petr Skoda
5bd4040866 MDL-31857basic phpunit support
Thanks Eloy Lafuente, Tim Hunt and Sam Hemelryk for valuable feedback and ideas.
2012-03-21 10:31:37 +01:00
Dan Poltawski
0a4660484c Merge branch 'master_MDL-27469' of git://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/version.php
    mod/scorm/db/upgrade.php
2012-03-21 11:38:09 +08:00
Aparup Banerjee
5599f2062c Merge branch git://github.com/phalacee/moodle.git wip-MDL-30482-master
- resolved conflicts
 - fixed up tab --> spaces
2012-03-21 10:50:51 +08:00
Jason Fowler
c3963fbd9b MDL-30482 - Glossary - Adding capability to other areas using glossary 2012-03-21 10:22:53 +08:00
Aparup Banerjee
d7de3f2682 Merge branch 'wip-MDL-17327-master-v2' of git://github.com/abgreeve/moodle 2012-03-21 10:02:18 +08:00
adrian@moodle.com
72d4340a0e MDL-17327 - data - improved the sql query for very large advanced searches 2012-03-21 09:41:48 +08:00
Aaron Barnes
94db27498d MDL-27469 scorm: Add extra activity completion conditions 2012-03-21 09:48:38 +13:00
Sam Hemelryk
bc4340ca9c Merge branch 'MDL-32065-master-1' of git://git.luns.net.uk/moodle 2012-03-21 09:24:58 +13:00
Rossiani Wijaya
e053583fc7 MDL-31266 Lesson module: Improve feedback so that the responses are concatenated instead of overwritten 2012-03-20 21:56:18 +08:00
Rossiani Wijaya
49ef5d4c7f MDL-31775 Lesson Module: fixed start at last page seen bug 2012-03-20 17:32:58 +08:00
Aparup Banerjee
0e5c50e29a MDL-29848 glossary: fixed whitespace 2012-03-20 16:12:02 +08:00
Aparup Banerjee
aa4edcf614 Merge branch 'MDL-29848-master' of https://github.com/mackensen/moodle 2012-03-20 16:06:40 +08:00