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

66225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
9a170849d7 MDL-39756 qtype_essay : Make defaults match upgrade (and php) for responserequired field 2014-01-20 17:24:04 +08:00
Damyon Wiese
4177d6a097 Merge branch 'MDL-43632-master' of https://github.com/lucisgit/moodle 2014-01-20 17:10:38 +08:00
Damyon Wiese
ae69bab27f Merge branch 'MDL-39756-essay' of https://github.com/ktemkin/moodle 2014-01-20 16:20:15 +08:00
Damyon Wiese
3a96e8b4c3 Merge branch 'MDL-32523' of git://github.com/timhunt/moodle 2014-01-20 16:02:54 +08:00
Dan Poltawski
1db62f7ff4 Merge branch 'wip-MDL-41062-master' of git://github.com/marinaglancy/moodle 2014-01-20 15:29:15 +08:00
Dan Poltawski
8e57617654 Merge branch '42682-27' of git://github.com/samhemelryk/moodle 2014-01-20 15:25:46 +08:00
Dan Poltawski
395333abe9 Merge branch 'MDL-43690' of git://github.com/timhunt/moodle 2014-01-20 14:24:38 +08:00
Rossiani Wijaya
e4a25e6ff1 MDL-42955: Removed scrollbar from block's action menu 2014-01-20 14:00:29 +08:00
Damyon Wiese
e0ebe681e0 MDL-43760 Potential fix for fletcher scott issues with fullname. 2014-01-20 13:37:51 +08:00
Damyon Wiese
ac97a7ed53 Merge branch 'MDL-42495-m' of git://github.com/micaherne/moodle 2014-01-20 13:21:58 +08:00
Dan Poltawski
3ab0a93347 Merge branch 'MDL-42980' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-20 12:56:17 +08:00
Marina Glancy
b35ef82f33 MDL-41062 gradebook: corrections to grade_item upgrade script, more tests 2014-01-20 12:26:14 +08:00
Damyon Wiese
6d7d401711 Merge branch 'MDL-39683-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-20 11:27:07 +08:00
Damyon Wiese
b34f6f5f5c MDL-40051 Add mnet test folder to phpunit.xml.dist 2014-01-20 11:22:27 +08:00
Damyon Wiese
c8bfabd267 Merge branch '43675-27' of git://github.com/samhemelryk/moodle 2014-01-20 10:57:30 +08:00
Dan Poltawski
fa8861964a Merge branch 'MDL-43671_message' of https://github.com/andyjdavis/moodle 2014-01-20 10:53:50 +08:00
Damyon Wiese
12c0236385 Merge branch 'MDL-40051_master' of https://github.com/markn86/moodle 2014-01-20 10:41:36 +08:00
Dan Poltawski
67deeb244d Merge branch 'MDL-40139-master' of git://github.com/FMCorz/moodle 2014-01-20 10:33:36 +08:00
Mark Nelson
362b9a0465 MDL-40051 core_lib: replaced add_to_log call when failing to send email with an event 2014-01-19 18:30:40 -08:00
Mark Nelson
0b7422f366 MDL-40051 core_mnet: replaced add_to_log calls with events 2014-01-19 18:30:40 -08:00
Ankit Agarwal
32323a1e44 MDL-43725 report_loglive: Fixing undefined variable error 
AMOS BEGIN
 CPY [page,report_log],[page,report_loglive]
AMOS END
 2014-01-20 10:14:11 +08:00
Damyon Wiese
b72aa1adcb Merge branch 'MDL-43733' of git://github.com/timhunt/moodle 2014-01-20 10:02:40 +08:00
Dan Poltawski
e6fbca9f65 Merge branch 'wip-mdl-43306-m' of git://github.com/rajeshtaneja/moodle 2014-01-20 09:45:43 +08:00
David Monllao
a77adc602a MDL-43743 mod_scorm: Adding package disclaimer 
As the package is licensed under CC 3.0 we should
be compliant with attribution.
 2014-01-20 09:30:44 +08:00
Dan Poltawski
34e91c304c Merge branch 'MDL-40752-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-20 09:24:53 +08:00
AMOS bot
72f30e581e Automatically generated installer lang files 2014-01-20 00:41:21 +00:00
AMOS bot
14fc79164a Automatically generated installer lang files 2014-01-19 00:41:55 +00:00
Tim Hunt
3d96b4945a MDL-43733 use any auto-saved responses when questions are finished. 
Before this, autosave was only working to save data when a student went
back in to continue an attempt. If the student, having crashed out,
never went back in and continued the attempt, their auto-saved responses
were not used when the attempt was automatically finished. That was a
rather bad oversight, which should now be fixed.
 2014-01-17 16:58:13 +00:00
Tim Hunt
7051f3a882 MDL-43690 quiz_question_tostring missing s(). 
This meant that the edit quiz page sometimes had invalid HTML.
 2014-01-17 10:56:27 +00:00
Tim Hunt
dc4a3ea1ee MDL-43670 quiz_question_instances to match coding guidelines. 
Some columns needed to be renamed:
* quiz     -> quizid
* question -> questionid
* grade    -> maxmark

Then all the places that refer to those needed to be fixed.
 2014-01-17 10:56:07 +00:00
Tim Hunt
d7ddbc8297 MDL-32523 question behat tests: distinctive question names 
This means that, if you are watching the tests run, it is easier to see
which test is currently being executed.
 2014-01-17 10:54:13 +00:00
M Kassaei
e0c41591e1 MDL-32523 Duplicate questions in question bank 2014-01-17 10:54:12 +00:00
David Monllao
ef6ac9b0d5 MDL-43743 behat: Lightweight scorm package 
The previous used package were adding a second iframe
inside the scorm iframe and was slow loading it;
this patch replaces it for a simple one without any
extra iframe.
 2014-01-17 17:39:25 +08:00
Dan Poltawski
2a9d7a42aa MDL-41062 gradebook: remove sortorder duplicates 
* Upgrade function to remove duplicates from the grade item duplicates
  column. Duplicates were causing sorting to fail in some cases.
* Add some unit tests which simulate sort order duplicate data and
  verify that they have been removed.
 2014-01-17 17:31:21 +08:00
Marina Glancy
0c74b33fbf MDL-43333 blocks: move activity icon in social and main menu 2014-01-17 17:29:47 +08:00
Marina Glancy
fc630b2b01 MDL-43211 blocks: style edit icons in main menu and social activities 2014-01-17 17:29:22 +08:00
Marina Glancy
639d990431 MDL-43211 course: do not return indent icon if not needed 2014-01-17 17:29:21 +08:00
rwijaya
f3f180863f MDL-42980 clean theme: fixed add/cancel buttons position for safari on iPhone with ios7. 2014-01-17 16:12:26 +08:00
Adrian Greeve
b481cc2e8f MDL-43294 mod_lesson: Unit test for essay_assessed event. 2014-01-17 15:38:03 +08:00
Adrian Greeve
f577148266 MDL-43294 events: New Event for essay submission in lesson. 2014-01-17 15:38:02 +08:00
David Monllao
561e9bb92e MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert 2014-01-17 10:41:37 +08:00
David Monllao
81ad5438c7 MDL-43480 behat: Removing @_only_local tags from steps where it is not necessary 2014-01-17 10:41:37 +08:00
David Monllao
8ef423433d MDL-43717 behat: Replacing 2050 for a date eariler than the max timestamp 32bit limit 
All credit goes to Michael de Raadt.
 2014-01-17 10:37:59 +08:00
AMOS bot
ee14a652dd Automatically generated installer lang files 2014-01-17 00:48:05 +00:00
Andrew Davis
811c0c8523 MDL-43671 message: removed an overly cautious check 2014-01-17 07:32:12 +08:00
Sam Hemelryk
8496ddd7c6 MDL-43714 blocks: fixed coding style of ajax/blocks.php 2014-01-17 10:50:18 +13:00
Sam Hemelryk
efd556f77b MDL-43714 blocks: fixed notice when moving to an empty region 2014-01-17 10:45:23 +13:00
Sam Hemelryk
956e2e8a8c MDL-43675 navigation: courses branch is now recognised as expandable 2014-01-17 10:27:10 +13:00
Sam Hemelryk
35620f63f0 MDL-42682 theme_bootstrapbase: fixed styling of discussion selector 2014-01-17 10:25:36 +13:00
Sam Hemelryk
bfaee803af MDL-42682 theme_bootstrapbase: fixed forum search alignment 2014-01-17 10:25:33 +13:00