mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
57,477 Commits 36 Branches 519 Tags
Commit Graph

13050 Commits

Author SHA1 Message Date
Dan Poltawski
cbb0459962 Merge branch 'MDL-36561-master-int' of git://github.com/FMCorz/moodle 2012-11-14 14:29:48 +08:00
Dan Poltawski
cc94106b71 Merge branch 'MDL-36565-master-int' of git://github.com/FMCorz/moodle 2012-11-14 14:16:30 +08:00
Dan Poltawski
1720550b5d Merge branch 'MDL-36575_modLtiGenerator' of git://github.com/moodlerooms/moodle 2012-11-14 12:22:54 +08:00
Frederic Massart
81063d1fe6 MDL-36565 mod_url: The default activity icon is the module icon 2012-11-14 12:21:57 +08:00
Frederic Massart
bb128107e3 MDL-36449 usability: Normalising icons on course page 2012-11-14 11:38:06 +08:00
Dan Poltawski
124b3fcef7 Merge branch 'MDL-35358' of git://github.com/rwijaya/moodle 2012-11-14 11:16:47 +08:00
Amy Groshek
b1dd41de86 MDL-36540 - Survey language pack typo 2012-11-14 09:45:42 +08:00
Dan Poltawski
762c6c4fee Merge branch 'master_MDL-36467' of git://github.com/danmarsden/moodle 2012-11-14 09:30:59 +08:00
Mark Nielsen
18b10b8721 MDL-36575: Adding mod_lti_generator 
This adds the hook for LTI module generation
for unit tests.
 2012-11-13 10:15:24 -08:00
Frederic Massart
69bc92160f MDL-36561 chat: Chat does not use calendar icons 2012-11-13 17:40:04 +08:00
Dan Poltawski
b0ba493cd0 Merge branch 'MDL-30545' of git://github.com/timhunt/moodle 2012-11-13 13:21:50 +08:00
Damyon Wiese
61cf325300 MDL-36509: Assignment grading table rownum offset is wrong by one. 2012-11-13 09:58:08 +08:00
Dan Marsden
a82c1ad05a MDL-36467 SCORM: remove old debugging superceded by full scorm debugger 2012-11-13 09:02:43 +13:00
Dan Poltawski
05f2bdea31 Merge branch 'MDL-35422-workshop-submit-button' of git://github.com/mudrd8mz/moodle 2012-11-12 10:36:16 +08:00
Dan Poltawski
aa289da834 Merge branch 'MDL-36051_24' of git://github.com/rlorenzo/moodle 2012-11-08 15:09:59 +08:00
Rex Lorenzo
00917ec682 MDL-36051 - Quick Grading in Assignment module does not turn on in some circumstances 
* Fixed bug with quick grading when file submission is turned off
 2012-11-07 16:26:26 -08:00
Mark Nelson
3774324174 MDL-33791 Portfolio: Fixed security issue with passing file paths. 2012-11-08 00:26:13 +01:00
Sam Hemelryk
24f4515576 Merge branch 'MDL-36271_master' of https://github.com/markn86/moodle 2012-11-08 11:07:15 +13:00
Sam Hemelryk
9a0e6f147d Merge branch 'WIP-MDL-35249-master' of git://github.com/nadavkav/moodle 
Conflicts:
	mod/assign/gradingtable.php
 2012-11-08 10:57:52 +13:00
Adrian Greeve
e2c5f38605 MDL-35558 mod_data: Show only own entries while there are required pending. 2012-11-07 19:43:42 +01:00
Dan Poltawski
63fc21b4e5 Merge branch 'MDL-26349-workshop-grades-display' of git://github.com/mudrd8mz/moodle 2012-11-07 16:32:43 +08:00
David Mudrák
3cb4ce45c7 MDL-26349 Display the workshop final grades to participants when the activity is closed 2012-11-07 09:08:38 +01:00
Dan Poltawski
defcb763fe Merge branch 'MDL-36209-workshop-assess-while-evaluating' of git://github.com/mudrd8mz/moodle 2012-11-07 15:30:38 +08:00
Dan Poltawski
092977fb0b Merge branch 'wip-MDL-36112-master' of git://github.com/abgreeve/moodle 2012-11-07 15:06:36 +08:00
Dan Poltawski
7451baff70 Merge branch 'wip-MDL-35961-master' of git://github.com/abgreeve/moodle 2012-11-07 11:12:45 +08:00
Martin Dougiamas
72225e18e7 MDL-36390 - Make sure resource icons are 24px to match activities 2012-11-06 15:59:32 +08:00
Dan Poltawski
90a23f067c Merge branch 'wip-MDL-36277-master' of git://github.com/barbararamiro/moodle 
Conflicts:
	theme/standard/style/course.css
 2012-11-06 14:58:49 +08:00
Dan Poltawski
e6acc052fb Merge branch 'MDL-36037' of git://github.com/netspotau/moodle-mod_assign 2012-11-06 12:32:41 +08:00
Dan Poltawski
915fc9b96c Merge branch 'MDL-35421-conclusion' of git://github.com/mudrd8mz/moodle 2012-11-06 11:17:44 +08:00
Dan Poltawski
eb5fc2a7d5 Merge branch 'MDL-36347' of git://github.com/timhunt/moodle 2012-11-06 09:41:56 +08:00
Sam Hemelryk
02adb1e30d Merge branch 'wip-mdl-29689' of git://github.com/rajeshtaneja/moodle 2012-11-06 10:34:06 +13:00
Barbara Ramiro
2df53c3ed8 MDL-36277 Usability: New Activity icons in SVG and PNG formats 2012-11-06 00:02:31 +08:00
Dan Poltawski
ec0a080a07 MDL-34527 - fix trailing whitespace 2012-11-05 13:28:16 +08:00
Dan Poltawski
2c333485c4 Merge branch 'wip-MDL-34527-m24' of git://github.com/samhemelryk/moodle 2012-11-05 13:25:10 +08:00
Sam Hemelryk
544c455357 Merge branch 'MDL-21625_b' of git://github.com/rwijaya/moodle 2012-11-05 16:27:43 +13:00
Sam Hemelryk
1385f1d8fb Merge branch 'MDL-36107b' of git://github.com/srynot4sale/moodle 2012-11-05 15:07:21 +13:00
David Mudrák
4affa7242e MDL-36209 Allow teachers to assess submissions during the grading evaluation phase 2012-11-04 08:47:21 +01:00
Tim Hunt
b5488ffdaa MDL-36347 quiz: formchangechecker should not obstruct auto-submit. 
When the quiz time limit runs out, the quiz should be submitted
automatically, withouth formchangechecker popping up a dialogue.
 2012-11-03 18:36:13 +11:00
Sam Hemelryk
b3def15507 MDL-34527 forum: Fixed up a couple of SQL queries causing issues in Oracle. 2012-11-02 10:49:50 +13:00
David Mudrák
54abf6df70 MDL-35421 Support the new conclusion field in backup and restore 2012-11-01 17:36:40 +01:00
David Mudrák
4c61fcd825 MDL-35421 Display the conclusion when the workshop is closed 
There is a new task implemented for the teachers so they are expected to
provide the conclusion at the end of the assessment phase.
 2012-11-01 17:36:40 +01:00
David Mudrák
5a49f825bd MDL-35421 Make the new conclusion field editable via mod_form 2012-11-01 17:36:40 +01:00
David Mudrák
d898206247 MDL-35421 Add conclusion text fields into the workshop table 2012-11-01 17:36:40 +01:00
Adrian Greeve
24054bb28a MDL-36112 - mod/data: Importing URLs no longer generates php warnings. 
Also included a slight alteration of the URL field class to display the Choose a link button next to the right input area.

Made an alteration to the url field class
 2012-11-01 16:47:38 +08:00
Adrian Greeve
eb6e0c613d MDL-35961 - mod/data: Removed duplicate data_content join in simple searches. Thanks to Patrick Pollet (patrick.pollet@insa-lyon.fr) for his patch 2012-11-01 16:28:19 +08:00
Mark Nelson
fdd375e1a4 MDL-36271 feedback: Fixed variable typo 2012-11-01 15:46:25 +08:00
Eloy Lafuente (stronk7)
ed24620d0c MDL-36304 - Left align "marked out of" in RTL Q preview 
Credit goes to Nadav Kavalerchik for fixing it @ MDL-36033
 2012-10-31 19:32:47 +01:00
Aparup Banerjee
9b18e58bcb Merge branch 'MDL-36130' of git://github.com/aolley/moodle 2012-10-31 14:51:16 +08:00
Rajesh Taneja
7482a71401 MDL-34777 Accessibility: Add proper id to select input 2012-10-31 11:35:43 +08:00
Aparup Banerjee
07e3b0f17d Merge branch 'MDL-31708-master' of git://github.com/StudiUM/moodle 2012-10-31 10:04:56 +08:00