mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-29 12:02:39 +01:00
Code Issues Projects Releases Wiki Activity
70,139 Commits 36 Branches 527 Tags
Commit Graph

70139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
ce0ce99c72 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-09-25 11:17:47 +01:00
Frederic Massart
16e7b52642 MDL-47294 repository_s3: Update S3 library to 0.5.1-dev 2014-09-25 14:11:09 +08:00
Jetha Chan
d24b8e52d3 MDL-45893 user_menu: revised based on action_menu 2014-09-25 13:43:06 +08:00
Ankit Agarwal
d31cc93876 MDL-47419 development: Add atlassian-ide-plugin.xml to .gitignore 2014-09-25 10:33:01 +05:30
Frederic Massart
189879851c MDL-47307 libraries: Update Markdown to v1.4.1 2014-09-25 10:53:34 +08:00
Sam Hemelryk
cbb1677cb9 MDL-3034 mod_choice: minor tidy up 2014-09-25 14:03:52 +12:00
Dan Marsden
7f68cc6541 MDL-47404 filelib: Prevent flash from treating files as uploads 
Flash treats files as uploads if filename is passed in content-disposition
this causes security to be enforced that causes issues with SCORM packages
 2014-09-25 13:21:47 +12:00
Sam Hemelryk
587d709145 MDL-47242: Fixed whitespace 2014-09-25 12:19:18 +12:00
Michael Aherne
54bdf1d406 MDL-3034 choice Support multiple answers 2014-09-25 11:33:55 +12:00
Petr Skoda
041f2822bb MDL-47300 import latest TCPDF 6.0.093 2014-09-25 09:48:13 +12:00
Dan Poltawski
79cf14b327 MDL-47378 mod_assign: prevent debugging notice 
Parameters come out of get_user_preferences as strings.
 2014-09-24 15:41:04 +01:00
Aparup Banerjee
eb60c78c77 MDL-47395 added cli_error() visual cue 2014-09-24 17:37:43 +08:00
Pavel Sokolov
5ae56c6e44 MDL-37707 mod_assign: Prevent user from switching to and from team submissions 2014-09-24 16:07:01 +08:00
Jetha Chan
5332483146 MDL-47242 theme_bootstrapbase: inverted color and RTL fixes 2014-09-24 15:53:42 +08:00
Frederic Massart
a5e706e8fe MDL-47358 gradereport_history: Improved default natural sorting by time 2014-09-24 15:41:30 +08:00
Damyon Wiese
c154b1f93d MDL-46171 assign: Peer review cleanups 
* Remove hardcoded table names
* Remove some code that was left in after debugging
* Add some comments about grades with no submission
* Set submission->latest to 0 on restore (it will get fixed later)
* Changed get_records_sql to get_recordset_sql in restore.
 2014-09-24 15:07:36 +08:00
Damyon Wiese
9e3eee671f MDL-46171 Assign: Always require a submission record if there is a grade 
Also - update unit tests to match the new expectations.
 2014-09-24 15:07:36 +08:00
Damyon Wiese
ad030ab4a5 MDL-46171 assign: And here is the benefit of the new column - simplify the SQL 2014-09-24 15:07:36 +08:00
Damyon Wiese
1523f9e0fb MDL-46171 Assign: Update code so latest field on assign_submission table is always set correctly 2014-09-24 15:07:36 +08:00
Damyon Wiese
587341138f MDL-46171 Assign: Add "latest" column + index to submission table. 2014-09-24 15:07:36 +08:00
Andrew Nicols
7d1cfe4c80 MDL-47195 libraries: Add horde IMAP from Horde 5.2.1 
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-09-24 14:59:13 +08:00
Andrew Nicols
4ba38f2abc MDL-47195 core: Add PSR-0 Autoloader 
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-09-24 14:59:12 +08:00
Eloy Lafuente (stronk7)
d3e70202fc Merge branch 'MDL-47248-master-rsssitelogo' of git://github.com/mudrd8mz/moodle 2014-09-24 01:37:22 +02:00
Eloy Lafuente (stronk7)
aec2b1c2da Merge branch 'MDL-47224' of git://github.com/aolley/moodle 2014-09-24 01:26:52 +02:00
Marina Glancy
cf10649795 MDL-45336 lesson: copied used strings from quiz 
AMOS BEGIN
 CPY [false,mod_quiz],[false,mod_lesson]
 CPY [fractionsaddwrong,mod_quiz],[fractionsaddwrong,mod_lesson]
 CPY [fractionsnomax,mod_quiz],[fractionsnomax,mod_lesson]
 CPY [notenoughsubquestions,mod_quiz],[notenoughsubquestions,mod_lesson]
 CPY [true,mod_quiz],[true,mod_lesson]
AMOS END
 2014-09-24 01:22:59 +02:00
Marina Glancy
e0c22222b6 MDL-45336 questionbank: use core strings instead of quiz 
AMOS BEGIN
 CPY [categories,mod_quiz],[categories,question]
 CPY [unusedcategorydeleted,mod_quiz],[unusedcategorydeleted,question]
 CPY [export,mod_quiz],[export,core_question]
 CPY [import,mod_quiz],[import,core_question]
AMOS END
 2014-09-24 01:22:59 +02:00
Marina Glancy
8766d1981c MDL-45336 qtype_numerical: use own strings instead of mod_quiz 
These strings have already been copied from mod_quiz to qtype_numerical but
in the qtype_numerical plugin code the translations from mod_quiz were used.
Even though the strings were already present we copy the translations.

AMOS BEGIN
 CPY [invalidnumericanswer,mod_quiz],[invalidnumericanswer,qtype_numerical]
 CPY [multiplier,mod_quiz],[qtype_numerical]
 CPY [invalidnumerictolerance,mod_quiz],[qtype_numerical]
AMOS END
 2014-09-24 01:22:59 +02:00
Marina Glancy
5a0221f7c0 MDL-45336 question: moved used string from quiz plugin 
AMOS BEGIN
 MOV [erroritemappearsmorethanoncewithdifferentweight,quiz_statistics],[erroritemappearsmorethanoncewithdifferentweight,question]
AMOS END
 2014-09-24 01:22:58 +02:00
Marina Glancy
5639baa843 MDL-45336 scorm: copied used string from quiz 
AMOS BEGIN
 CPY [deleteselected,quiz_overview],[deleteselected,mod_scorm]
AMOS END
 2014-09-24 01:22:58 +02:00
Marina Glancy
634a5c0b81 MDL-45336 choice: removed unused code 
function prepare_choice_show_results() is never called with the 5th argument,
forming of html has been moved to the renderer in MDL-20508, when function
choice_show_results() was transformed into prepare_choice_show_results() but
not all code was deleted from the funciton.
 2014-09-24 01:22:58 +02:00
Marina Glancy
3a58e7ebc5 MDL-45336 backup: moved the string from quiz to core 
AMOS BEGIN
 CPY [timetaken,mod_quiz],[timetaken,backup]
AMOS END
 2014-09-24 01:22:58 +02:00
Eloy Lafuente (stronk7)
011ff9f8fb MDL-47180 qformat_webct: whitespace cleanup 2014-09-24 00:56:40 +02:00
Eloy Lafuente (stronk7)
d50a73309b Merge branch 'MDL-47180' of git://github.com/jmvedrine/moodle 2014-09-24 00:40:40 +02:00
AMOS bot
54e7d715d2 Automatically generated installer lang files 2014-09-24 00:05:53 +08:00
Jean-Michel Vedrine
129f3c5190 MDL-47180 qformat_webct: Import of calculated questions broken 2014-09-23 14:45:07 +02:00
Dan Poltawski
4bcf64b053 Merge branch 'MDL-47240-master' of https://github.com/sammarshallou/moodle 2014-09-23 10:57:00 +01:00
Paul Nicholls
cb4987f858 MDL-39190 Javascript: Pop-up calendar days of week wrong 
The YUI2 calendar widget (still used via 2in3) uses midnight as the time
component of its Date objects, which triggers a Safari bug resulting in
11pm Saturday being returned instead of midnight Sunday when subtracting
days to get the last few days of the previous month.  This shows up ONLY
on the month after DST begins, if DST begins on the last Sunday of a given
month (and the Calendar widget is set to Sunday as the first day of the
week).  The fix/workaround of using noon instead of midnight is employed
by YUI3 and others.
 2014-09-23 16:50:58 +12:00
Sam Hemelryk
4356012960 Merge branch 'MDL-46811-master' of git://github.com/danpoltawski/moodle 2014-09-23 16:36:05 +12:00
Sam Hemelryk
7fca0ced0a Merge branch 'MDL-47244-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/responsive.less
	theme/bootstrapbase/style/moodle.css
 2014-09-23 16:32:09 +12:00
Sam Hemelryk
b32e1778bb Merge branch 'wip-MDL-46937-master' of git://github.com/marinaglancy/moodle 2014-09-23 15:26:06 +12:00
Dave Cooper
12cf8140a2 MDL-47252 mod_forum: Ensure guest users can't subscribe to discussions 2014-09-23 10:52:55 +08:00
Jonathan Harker
81ba2632ed MDL-47316 mod_forum: Fix course overview performance 
make more efficient use of mod_info cache by processing courses
 sequentially.

Change-Id: I03b808c8a7efc42879ec2689fbd2a9fe7a8f1103
 2014-09-23 12:58:29 +12:00
Sam Hemelryk
be91dff8bb Merge branch 'MDL-47242-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-23 12:23:08 +12:00
Eloy Lafuente (stronk7)
db6c48bfc1 Merge branch 'MDL-47182-master' of git://github.com/danpoltawski/moodle 2014-09-23 01:52:10 +02:00
Eloy Lafuente (stronk7)
ec2ee188fc Merge branch 'MDL-46313-master' of git://github.com/andrewnicols/moodle 2014-09-23 01:48:21 +02:00
Eloy Lafuente (stronk7)
4922a1d46a Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle 2014-09-23 01:40:50 +02:00
Eloy Lafuente (stronk7)
da483a72c8 Merge branch 'MDL-47269_master' of https://github.com/nadavkav/moodle 2014-09-23 01:28:29 +02:00
Eloy Lafuente (stronk7)
44af6d53a7 Merge branch 'MDL-47266' of git://github.com/timhunt/moodle 2014-09-23 01:12:16 +02:00
Tim Hunt
358f31672b MDL-37998 quiz settings: disableif rules should account for overrides. 
Some form fields are disabled if only one attempt is allowed. However,
there may be an override allowing some students more attempts. We need
to account for that possiblity when setting up the disabled if rules.

Note the disabledIf is good for usability on this complex form, which is
why I don't just want to get rid of them.
 2014-09-22 16:23:38 +01:00
Dan Poltawski
546acfbf67 Merge branch 'MDL-47238_guest' of https://github.com/andyjdavis/moodle 2014-09-22 16:13:20 +01:00