mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-01 06:22:39 +01:00
Code Issues Projects Releases Wiki Activity
60,786 Commits 36 Branches 523 Tags
Commit Graph

60786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
26d3459747 MDL-39003 - version bump 2013-04-22 14:35:03 +01:00
Dan Poltawski
789ce8202b Merge branch 'MDL-39148-uninstall' of git://github.com/mudrd8mz/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 14:33:28 +01:00
Dan Poltawski
83a9917314 MDL-37514 mod_quiz: fix trailing whitespace 2013-04-22 14:20:58 +01:00
Alex Leontiev
bd166e618f 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.

Conflicts:
	mod/quiz/module.js
 2013-04-22 14:13:53 +01:00
Dan Poltawski
a745806063 MDL-39178 theme_nimble: fix whitespace 2013-04-22 14:00:53 +01:00
Dan Poltawski
90a470abbc MDL-39178 theme_magazine: fix whitespace 2013-04-22 13:59:28 +01:00
Dan Poltawski
9bc5a6b9d8 Merge branch 'w16_MDL-39178_m25_themesettings' of git://github.com/skodak/moodle 2013-04-22 13:57:57 +01:00
Dan Poltawski
816659ed9e Merge branch 'MDL-39249-upgrade-wizard' of git://github.com/mudrd8mz/moodle 2013-04-22 13:12:48 +01:00
Dan Poltawski
997f3022ad Merge branch 'MDL-39248-plugins-check' of git://github.com/mudrd8mz/moodle 2013-04-22 13:07:45 +01:00
Dan Poltawski
e65dfc0275 Merge branch 'MDL-39186' of git://github.com/timhunt/moodle 2013-04-22 13:05:53 +01:00
Dan Poltawski
8c82b67ef0 Merge branch 'MDL-38603-workshop-form' of git://github.com/mudrd8mz/moodle 2013-04-22 12:47:10 +01:00
Dan Poltawski
e39ef3d124 Merge branch 'wip-MDL-37942-master' of git://github.com/jason-platts/moodle 2013-04-22 12:42:10 +01:00
Dan Poltawski
4bb3f29e02 Merge branch 'w16_MDL-39141_m25_toolbar' of git://github.com/skodak/moodle 2013-04-22 12:38:47 +01:00
Dan Poltawski
3a3621821a Merge branch 'MDL-39173-master' of git://github.com/damyon/moodle 2013-04-22 11:41:41 +01:00
Damyon Wiese
f5e9aa843c Merge branch 'wip-mdl-38851' of git://github.com/rajeshtaneja/moodle 2013-04-22 15:11:59 +08:00
Frederic Massart
1dcbdba62f MDL-38614 form: Reduce size of description field 2013-04-22 14:18:04 +08:00
Damyon Wiese
00ec4acc8f Merge branch 'MDL-39182_master' of https://github.com/markn86/moodle 2013-04-22 14:00:11 +08:00
Mark Nelson
f5ad424b11 MDL-39182 mod_forum: display the post threshold warning message in a more noticeable area 2013-04-22 13:33:36 +08:00
Damyon Wiese
946f2b0826 MDL-36959 file_storage: Preserve each file in a hash collision 2013-04-22 12:07:43 +08:00
Damyon Wiese
e9cd87eef2 Merge branch 'w16_MDL-36959_m25_poolhashes' of git://github.com/skodak/moodle 2013-04-22 11:38:07 +08:00
Sam Hemelryk
6b39eee9fd Merge branch 'wip-MDL-38893-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 15:34:17 +12:00
Sam Hemelryk
851ef997df Merge branch 'MDL-38918-master' of git://github.com/lazydaisy/moodle 2013-04-22 15:25:46 +12:00
Sam Hemelryk
92809986aa Merge branch 'MDL-39231_master' of git://github.com/bmbrands/moodle 2013-04-22 15:24:58 +12:00
Damyon Wiese
b363d54ccd Merge branch 'MDL-39050' of git://github.com/timhunt/moodle 2013-04-22 10:25:46 +08:00
Damyon Wiese
924225f38b MDL-38898 theme_simple: Copy fixes for block dnd from bootstrap 2013-04-22 10:07:53 +08:00
Jason Fowler
c01404f99a MDL-38893 - Fixing layout of the debug boxes for cache information under bootstrap - patch provided by David Scotson <david.scotson@glasgow.ac.uk> 2013-04-22 10:04:43 +08:00
Damyon Wiese
80333fd96f Merge branch 'MDL-38898_master' of git://github.com/lazydaisy/moodle 2013-04-22 09:52:09 +08:00
Sam Hemelryk
54ed002fdc Merge branch 'wip-MDL-39118-master' of git://github.com/abgreeve/moodle 2013-04-22 13:41:45 +12:00
Adrian Greeve
e06d54289d MDL-39118 - mod_data: removed areamaxbytes option for uploading files and images. 
Setting the maximum size for a file or picture field to the course upload limit
would send a value of 0 to the file picker. This patch checks for this 0 value
and handles it appropriately.
 2013-04-22 09:28:51 +08:00
Sam Hemelryk
b88338f647 Merge branch 'MDL-38854_master' of git://github.com/bmbrands/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 12:12:58 +12:00
Sam Hemelryk
9c2cbcdc04 Merge branch 'MDL-39220' of git://github.com/colchambers/moodle 2013-04-22 11:37:34 +12:00
Sam Hemelryk
6801246c50 Merge branch 'wip-MDL-38900-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 11:10:51 +12:00
Sam Hemelryk
c26f34baf1 Merge branch 'MDL-39172' of git://github.com/jmvedrine/moodle 2013-04-22 11:02:39 +12:00
Sam Hemelryk
311c034744 MDL-38874 theme_bootstrap: tidy up whitespace 2013-04-22 10:43:38 +12:00
Sam Hemelryk
9fdb1c1a63 Merge branch 'MDL-38874_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 10:35:52 +12:00
David Scotson
16d795a4d3 MDL-39196 theme_bootstrap: improved display of login errors 2013-04-22 10:27:11 +12:00
Sam Hemelryk
48d253c100 Merge branch 'MDL-39241-master' of git://github.com/danpoltawski/moodle 2013-04-22 09:23:54 +12:00
Mary Evans
232affc96a MDL-38874 theme_bootstrap: added back CSS rules to fix advanced elements show/hide toggle in admin forms. 
While doing this I got a compile error so not sure but I am guessing the changes to fix that error will show up in the commit diff.
 2013-04-21 18:02:08 +01:00
Petr Škoda
abea8b437c MDL-39178 add missing update callback for all theme settings 2013-04-20 22:06:55 +02:00
Petr Škoda
fd4592bbbc MDL-36959 test reworked adding of files to sha1 content pool 2013-04-20 21:59:08 +02:00
Petr Škoda
d91e2c15db MDL-36959 rework adding of content files to the file pool 
This patch includes refreshing of borked files in file pool and basic prevention of race conditions. It also helps with diagnosing of file pool permission problems, detects coding errors and some other type of problems including sha1 collision jackpot.
 2013-04-20 21:41:41 +02:00
Mary Evans
c9ff4d0e0f MDL-38898 theme_bootstrap: Made changes to layout/general.php to enable drag-n-drop support in Bootstrap theme. 2013-04-20 02:10:11 +01:00
David Mudrák
7b1e0645c1 MDL-39249 Fix typo in available_update_deployer class 
I have accidentally spotted this typo while working on this branch. It
has never caused any harm as both parameters callerurl and returnurl are
always passed. Blame copy/pasting of code blocks.
 2013-04-20 03:01:36 +02:00
David Mudrák
5d7a4bab3f MDL-39249 Return to the correct page after successful update deployment 
The method available_update_deployer::make_execution_widget() used to
have hard-coded return URL. Now it accepts the return URL as the second
parameter and passes it to the mdeploy.php utility.

The callerurl parameter is now correctly passed and used.
 2013-04-20 03:00:19 +02:00
David Mudrák
b27c50e234 MDL-39248 Fix the plugins check screen strings 
Not all add-ons require administrator's attention during the upgrade
now. They are now listed only if there is an update available for them.

Also, it's not true any more that add-ons must be updated manually. They
can be updated using the automatic deployment feature, too.
 2013-04-20 00:52:47 +02:00
David Mudrák
2f838a4e93 MDL-39248 Display only plugins with available updates at plugins check 2013-04-20 00:42:02 +02:00
Tim Hunt
ba86e1d1ee MDL-39186 quiz password form: set param types. 2013-04-19 18:28:59 +01:00
David Scotson
13cb4ee0b4 MDL-38900 Change highlighted course section color 2013-04-19 16:39:29 +01:00
Dan Poltawski
b93945e9b9 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 
Conflicts:
	mod/scorm/module.js
 2013-04-19 15:20:02 +01:00
Dan Poltawski
aa15c5f3ff Merge branch 'MDL-38361' of https://github.com/prateeksachan/moodle 2013-04-19 15:11:33 +01:00