mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-02 06:05:31 +02:00
Code Issues Projects Releases Wiki Activity
69,076 Commits 37 Branches 536 Tags
Commit Graph

69076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
f9075a7888 Merge branch 'MDL-46370_master' of https://github.com/moodlerooms/moodle 2014-07-21 09:54:56 +01:00
Sam Hemelryk
584539c0fc MDL-42909 course: fixed whitespace 2014-07-21 11:42:52 +12:00
Sam Hemelryk
d90b055ab1 Merge branch 'MDL-42909-master' of git://github.com/phalacee/moodle 2014-07-21 11:35:47 +12:00
Sam Hemelryk
424033b780 Merge branch 'MDL40479_Grading_alert_colour' of https://github.com/Dave-B/moodle 2014-07-21 11:32:09 +12:00
Sam Hemelryk
ce3d7d5da9 Merge branch 'm28_MDL-46406' of https://github.com/totara/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-07-21 11:14:30 +12:00
Sam Hemelryk
365e80ba76 Merge branch 'mdl-46427-master' of git://github.com/deraadt/moodle 2014-07-21 11:12:05 +12:00
Sam Hemelryk
ce61d62c5e Merge branch 'MDL-46159-wip' of https://github.com/willylee/moodle 2014-07-21 10:55:08 +12:00
Sam Hemelryk
8d3a4d7597 Merge branch 'MDL-45339-master' of git://github.com/xow/moodle 2014-07-21 10:49:25 +12:00
Sam Hemelryk
69286e3b49 Merge branch 'master_MDL-46363' of https://github.com/danmarsden/moodle 2014-07-21 10:45:33 +12:00
Michael de Raadt
846abed55f MDL-46427 Course: Correcting dimmed course link class on profile pages. 2014-07-18 15:30:33 +08:00
Jason Fowler
33b6b8c93e MDL-42909 Course: Fix title for move-targets 2014-07-18 14:42:00 +08:00
Jim Thorpe
18b19ff452 enrol_imsenterprise: MDL-46363 including course lib when create_course is 
used
 2014-07-18 11:28:12 +12:00
John Okely
08b51dd06b MDL-45339 Libraries: Add a note to docblock of get_config, set_config, and unset_config to note they are used in lib/db/upgrade.php 2014-07-17 16:42:42 +08:00
Dan Poltawski
ec36fafc0f weekly release 2.8dev 2014-07-17 09:22:43 +01:00
Dan Poltawski
fcc7e4d9b3 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-07-17 09:22:40 +01:00
Sam Hemelryk
e6330e5ba8 Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle 
Conflicts:
	mod/quiz/lib.php
	mod/quiz/mod_form.php
	mod/quiz/tests/behat/completion_condition_passing_grade.feature
 2014-07-17 15:16:07 +12:00
Brian Barnes
22f8a34998 MDL-46406 core_auth: Placed remember username before submit login form 2014-07-17 14:03:50 +12:00
Sam Hemelryk
68b1e63080 Revert "MDL-46226 core: pix_icon no longer sets title to the alt text" 
This reverts commit 40ebfaeefd0940049ce2ef6e481546d90f19b9af.
 2014-07-17 13:57:29 +12:00
Sam Hemelryk
4ae7774d03 Revert "MDL-46226 fix unit tests" 
This reverts commit ffd17daf0a438fa63a32d3c1ba08218e16def46c.
 2014-07-17 13:57:01 +12:00
AMOS bot
92141ef5a2 Automatically generated installer lang files 2014-07-17 00:52:42 +00:00
AMOS bot
bf2fc356ba Automatically generated installer lang files 2014-07-17 00:52:42 +00:00
Ray Morris
349c930343 MDL-37993 Quiz: completion upon all passing grade or attempts exhausted 
This patch adds completion options to Quiz similar to what is available in scorm.
One can have the quiz marked complete when either a passing grade is achieved or
all attempts are used up. This will allow a quiz to complete when the user "passes
or fails".  (Where "fail" means "using up all attempts without passing".)
 2014-07-16 19:17:57 -05:00
Sam Chaffee
0f5e439e4b MDL-46370 Ajax and Javascript - Fixes docked blocks not expanding when using dock on right 2014-07-16 12:06:35 -06:00
David Balch
d9bfe3c5c1 MDL-40479 mod_assign PHPDoc: Fix error, improve consistency. 2014-07-16 08:58:21 +01:00
David Balch
153510ead8 MDL-40479 mod_assign: Fix the colour of grading success messages. 2014-07-16 08:57:48 +01:00
Eloy Lafuente (stronk7)
743960d3ab Merge branch 'wip-mdl-30431' of https://github.com/rajeshtaneja/moodle 2014-07-16 09:18:03 +02:00
Eloy Lafuente (stronk7)
9a363a1cd2 Merge branch 'MDL-35870' of git://github.com/nobelium/moodle 2014-07-16 09:04:55 +02:00
Nobelium
6f850a51a4 MDL-35870 mod_scorm: Fixing undefined scoid for popup mode 2014-07-16 11:51:03 +00:00
Rajesh Taneja
52f061db3e MDL-30431 behat: Use table id for wiki comments in behat 2014-07-16 14:56:08 +08:00
Eloy Lafuente (stronk7)
b4b53e2ab0 Merge branch 'wip-mdl-44523' of https://github.com/rajeshtaneja/moodle 2014-07-16 08:52:28 +02:00
Rajesh Taneja
f466584f69 MDL-30431 behat: Fixed wiki behat 2014-07-16 14:52:13 +08:00
Rajesh Taneja
5544234afc MDL-44523 Behat: Fixed event filter test with change in edulevel 2014-07-16 14:05:42 +08:00
Eloy Lafuente (stronk7)
248cae7600 MDL-30431 mod_wiki: whitespace fix 2014-07-16 01:19:45 +02:00
Eloy Lafuente (stronk7)
5b00ae7442 Merge branch 'MDL-30431_wiki_comments' of https://github.com/andyjdavis/moodle 2014-07-16 01:16:04 +02:00
Eloy Lafuente (stronk7)
83988eb1f7 MDL-46290 Completion: document the deprecation 2014-07-16 01:06:23 +02:00
Eloy Lafuente (stronk7)
ffc2728203 Merge branch 'MDL-46290_remove_unused_get_incomplete_criteria' of https://github.com/MorrisR2/moodle 2014-07-16 00:57:47 +02:00
Sam Hemelryk
9a97cac457 Merge branch 'wip-mdl-45991' of https://github.com/rajeshtaneja/moodle 2014-07-16 09:04:01 +12:00
Eloy Lafuente (stronk7)
c5e0735569 Merge branch 'MDL-35870' of git://github.com/nobelium/moodle 2014-07-15 18:30:29 +02:00
Nobelium
76c8fa4190 MDL-35870 mod_scorm : fix for debug.js.php not found error 2014-07-15 16:05:40 +00:00
Rajesh Taneja
2ced0cc53e MDL-45991 behat: fixed deprecated behat steps used 2014-07-15 16:10:29 +08:00
Sam Hemelryk
6a91c41a49 Merge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle 2014-07-15 12:07:05 +12:00
Eloy Lafuente (stronk7)
3b674f5d0a MDL-35870 mod_scorm : Bump version 2014-07-15 01:45:23 +02:00
Eloy Lafuente (stronk7)
714b25d07d MDL-35870 mod_scorm : whitespace fixes 2014-07-15 01:41:07 +02:00
Eloy Lafuente (stronk7)
857449d769 Merge branch 'MDL-35870' of git://github.com/nobelium/moodle 2014-07-15 01:06:53 +02:00
Sam Hemelryk
2c3d6f240f Merge branch 'MDL-46346_blog' of https://github.com/andyjdavis/moodle 2014-07-15 10:33:13 +12:00
Eloy Lafuente (stronk7)
d1d9e833d8 Merge branch 'MDL-46080' of https://github.com/jonof/moodle 2014-07-14 23:29:07 +02:00
Sam Hemelryk
3c94f90cde MDL-37993 mod_quiz: fixed deprecated behat step 2014-07-15 09:10:17 +12:00
Sam Hemelryk
9b3b730c62 Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle 2014-07-15 08:48:55 +12:00
Sam Hemelryk
5c9ba23a68 Merge branch 'MDL-42179-003-master' of https://github.com/dbezborodovrp/moodle 2014-07-15 08:39:37 +12:00
Eloy Lafuente (stronk7)
8d0703d643 Merge branch 'master_MDL-31366' of git://github.com/danmarsden/moodle 2014-07-14 18:13:18 +02:00