moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55938 commits 37 branches 544 tags 1.3 GiB
Commit graph

12718 commits

Author SHA1 Message Date
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
Sam Hemelryk
ef844d0a15 Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle 2012-03-20 16:47:17 +13:00
Sam Hemelryk
0ca579f2cd MDL-11047 mod_quiz: bumped version in upgrade after conflict resolution 2012-03-20 16:46:19 +13:00
Sam Hemelryk
270bdf5265 Merge branch 'MDL-11047' of git://github.com/mackensen/moodle 
Conflicts:
	mod/quiz/version.php
 2012-03-20 14:04:04 +13:00
Sam Hemelryk
b896c12bca Merge branch 'w12_MDL-32079_m23_folderrev' of git://github.com/skodak/moodle 2012-03-20 11:34:21 +13:00
Sam Hemelryk
f7dbc2814c Merge branch 'MDL-32064' of git://github.com/timhunt/moodle 2012-03-20 10:37:38 +13:00
Sam Hemelryk
47def74bb8 Merge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle 2012-03-19 20:06:40 +13:00
Rajesh Taneja
476aea8d8b MDL-26674 wiki2.0: cleaned wiki event logging patch 2012-03-19 11:15:06 +08:00
Diane Villemure
b7921fc458 MDL-26674 wiki2.0: Fixed wiki activity log 2012-03-19 10:20:18 +08:00
Petr Skoda
fabbf4398b MDL-32094 some nasty quickforms hacks that should help with E_STRICT 
Note: we have stopped tracking our QuickForms hacks long ago.
 2012-03-18 18:39:37 +01:00
Petr Skoda
f20edd5208 MDL-32094 fix various E_STRICT compatibility problems 2012-03-18 18:37:24 +01:00
Petr Skoda
0ed6f71232 MDL-32094 fix E_STRICT issues in lesson API 
It is not possible to change method signatures in PHP...
 2012-03-18 18:36:04 +01:00
Petr Skoda
e7755fc627 MDL-32094 fix E_STRICT issues in assignment 2012-03-18 18:32:17 +01:00
Tim Hunt
ff3b7c85db MDL-32064 quiz navigation: JS form submit must fire submit event handlers. 2012-03-16 14:55:16 +00:00
Petr Skoda
60791f18cf MDL-32079 folder revision must be incremented after any file change 2012-03-16 10:11:07 +01:00
Dan Marsden
c1b81ff623 MDL-32080 SCORM - remove old css 2012-03-16 13:16:05 +13:00