mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 21:20:02 +01:00
Code Issues Projects Releases Wiki Activity
69,113 Commits 36 Branches 527 Tags
Commit Graph

69113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
fce6c70d41 MDL-44925 fixup default settings in TeX filter 2014-07-22 17:06:02 +01:00
Dan Poltawski
82f88cabe9 MDL-35864 enrol: misc fixups 
* Removed get_config_instance_capabilities() which was from
  older reviewed vrsions of the patch
* Added note to upgrade.txt
* Fixed deprecation note
* Bump versions
 2014-07-22 17:02:21 +01:00
Dan Poltawski
12bdea2eb5 Merge branch 'MDL-35864' of https://github.com/danielneis/moodle 2014-07-22 16:32:26 +01:00
Dan Poltawski
02213adfd0 Merge branch 'MDL-37509-master' of git://github.com/damyon/moodle 2014-07-22 15:56:55 +01:00
Dan Poltawski
afffcb9472 Merge branch 'MDL-44925-master' of https://github.com/dthies/moodle 2014-07-22 14:33:33 +01:00
Dan Poltawski
6442e5c7ed Merge branch 'MDL-34248_master' of https://github.com/markn86/moodle 2014-07-22 12:01:04 +01:00
Dan Poltawski
5f7ab6e949 Merge branch '45828-28' of git://github.com/samhemelryk/moodle 2014-07-22 09:33:01 +01:00
Dan Poltawski
d28d270bca Merge branch '45724-28' of git://github.com/samhemelryk/moodle 2014-07-22 09:07:16 +01:00
Sam Hemelryk
fe43ab9b75 Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle 2014-07-22 11:12:09 +12:00
Sam Hemelryk
3e2af22327 Merge branch 'MDL-43063-master' of git://github.com/lameze/moodle 2014-07-22 09:49:03 +12:00
Dan Poltawski
6188c8ebab Merge branch 'MDL-46386-master' of https://github.com/merrill-oakland/moodle 2014-07-21 14:11:39 +01:00
Eric Merrill
84f74ccff6 MDL-46386 question Whitelist the Atto editor from return blocking 
Prevent the question engine from blocking return/enter key presses
from being sent to the Atto editor.
 2014-07-21 09:08:01 -04:00
Dan Poltawski
c7075c0c91 MDL-46285 coding style fix 
(no double newlines)
 2014-07-21 14:07:39 +01:00
Dan Poltawski
f5fea4019a Merge branch 'MDL-46285-master' of git://github.com/jethac/moodle 2014-07-21 14:03:58 +01:00
Dan Poltawski
992207f75e MDL-46316 notes: coding style fixes 
Line length issues Andrew missed off.
 2014-07-21 12:41:22 +01:00
Dan Poltawski
087e7d8fb1 Merge branch 'MDL-46316_notes2' of https://github.com/andyjdavis/moodle 2014-07-21 12:31:51 +01:00
Dan Poltawski
65f00f063b Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle 2014-07-21 12:09:10 +01:00
Dan Poltawski
724d7abe8b Merge branch 'MDL-43151-master' of git://github.com/damyon/moodle 2014-07-21 10:20:55 +01:00
Dan Poltawski
1d3b11ec48 Merge branch '46335-28' of git://github.com/samhemelryk/moodle 2014-07-21 09:59:04 +01:00
Dan Poltawski
f9075a7888 Merge branch 'MDL-46370_master' of https://github.com/moodlerooms/moodle 2014-07-21 09:54:56 +01:00
Damyon Wiese
ae7638f72a MDL-37509 Assign: Do not put description in calendar before it should be shown to students 2014-07-21 15:54:39 +08:00
Damyon Wiese
3b775a0b8a MDL-43151 Assign: More validation in mod_form. 
Add check to mod_form to prevent "reopen until pass" and "blind marking" both being on
 2014-07-21 13:41:51 +08:00
Damyon Wiese
3db661cdae MDL-43151 assign: Use grade_grade->is_passed 
Do not try and calculate this inside mod_assign - it's a gradebook thing only.
 2014-07-21 13:22:22 +08:00
Simey Lameze
feff774adb MDL-43063 core: fix phpdoc comment codechecker issue. 2014-07-21 10:08:41 +08: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
Sam Hemelryk
915140c9b5 MDL-45724 cache: added cache API warnings to the admin notifications page 2014-07-21 09:48:33 +12:00
Sam Hemelryk
6e247996ea MDL-45828 cache: definitions now sorted in the admin UI 2014-07-21 09:25:22 +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
Andrew Davis
ed6fc2620c MDL-46316 notes: coding style fixes 2014-07-18 13:43:17 +08:00
Mark Nelson
115e8964db MDL-34248 core_backup: used API instead of inserting into the log table directly 2014-07-17 18:11:26 -07:00
Jim Thorpe
18b19ff452 enrol_imsenterprise: MDL-46363 including course lib when create_course is 
used
 2014-07-18 11:28:12 +12:00
Sam Hemelryk
a8266e2f1c MDL-46335 backup: fixed casting issue with setting labels 
The issue was that clean_param took an int and returned a string
and the result was used in an exact comparison.
The type change mean the comparison failed.
The solution was to ensure the param was cast as a string.
 2014-07-18 08:29:55 +12:00
Sam Hemelryk
727c21733e MDL-45724 cache: admin screen now shows store warnings 
Implemented a means by which cache store instance can communicate
warnings due to things such as conflicting configurations etc.
 2014-07-18 08:29:41 +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