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

67591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
1b9a1e8128 Merge branch 'MDL-29572_master' of https://github.com/jrchamp/moodle 2014-04-09 11:38:42 +08:00
Damyon Wiese
48dc9f0175 MDL-44927 Atto: Table editor typo that prevents creation of new tables. 2014-04-09 11:31:26 +08:00
Dan Poltawski
020af1058d Merge branch 'MDL-39740_grade_item_idnumber_fix' of git://github.com/ashleyholman/moodle 2014-04-09 11:12:55 +08:00
Marina Glancy
47a1315f02 Merge branch '44944-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-09 09:48:41 +08:00
Sam Hemelryk
e97b942223 Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle 2014-04-09 11:26:33 +12:00
Sam Hemelryk
6a90bc5e05 Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle 2014-04-09 10:37:05 +12:00
Sam Hemelryk
b983a5d869 Merge branch 'MDL-44765-master' of git://github.com/phalacee/moodle 2014-04-09 10:26:33 +12:00
Sam Hemelryk
6ef3728805 Merge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalyst/moodle 2014-04-09 10:15:50 +12:00
Sam Hemelryk
0a293483e8 MDL-39833 format: tidied up API improvement to allow for future backport 2014-04-09 10:09:44 +12:00
Sam Hemelryk
da98185a58 Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle 2014-04-09 10:09:02 +12:00
Damyon Wiese
86bd7af5be MDL-42195 Bootstrap - put border and vertical-align back in the reset for all images 2014-04-08 17:04:43 +08:00
Marina Glancy
d175d25adc Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-08 16:55:49 +08:00
Jason Fowler
0d5bfb9c65 MDL-44881 Filepicker: Fix alignment and padding on file-select dialog 2014-04-08 14:44:50 +08:00
Damyon Wiese
0610d2ca92 Merge branch 'MDL-44131-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-debug.js
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button.js
	lib/editor/atto/plugins/equation/yui/src/button/js/button.js
 2014-04-08 14:18:50 +08:00
Dan Poltawski
a5cd92574d Merge branch 'MDL-42462-Feedback-Fix-for-WCAG-2-0-issue-with-Informational-and-Error-Content-Displayed-in-red' of https://github.com/michael-milette/moodle 2014-04-08 14:11:59 +08:00
Frederic Massart
050159dc9f MDL-44131 atto_equation: Equation library groups are aria toolbars 2014-04-08 14:08:54 +08:00
Damyon Wiese
48395a9cdb Merge branch 'wip-MDL-40907-master' of git://github.com/marinaglancy/moodle 2014-04-08 14:01:34 +08:00
Dan Poltawski
052d51b15f Merge branch 'MDL-44241-master' of git://github.com/andrewnicols/moodle 2014-04-08 13:53:19 +08:00
Damyon Wiese
392cb4577a MDL-44070 Conditional availability - white space fix 2014-04-08 13:49:15 +08:00
Marina Glancy
158379e173 MDL-40907 events: additional legacy logging for module update/add events" 2014-04-08 13:45:13 +08:00
Marina Glancy
957944dca8 MDL-40907 events: view list of resources in course 2014-04-08 13:45:09 +08:00
Marina Glancy
c3ba899abd MDL-40907 events: Allow one event write several entries to the legacy log table 2014-04-08 13:44:57 +08:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
 2014-04-08 13:30:41 +08:00
Damyon Wiese
594a5c8c02 Merge branch 'MDL-44235-master' of git://github.com/FMCorz/moodle 2014-04-08 12:32:49 +08:00
Damyon Wiese
19346e06cb Merge branch 'wip-MDL-44340-master' of git://github.com/abgreeve/moodle 2014-04-08 12:16:42 +08:00
Dan Poltawski
822b055c61 Merge branch 'MDL-44784-master' of git://github.com/FMCorz/moodle 2014-04-08 12:12:01 +08:00
Damyon Wiese
9a6c091f1c MDL-44342 message_airnotifier: Fix shifter warnings in JS 2014-04-08 12:11:36 +08:00
Dan Poltawski
d0a3cec564 Merge branch 'MDL-44806-master' of git://github.com/phalacee/moodle 2014-04-08 12:07:15 +08:00
Dan Poltawski
9a59ebaa6c Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-08 12:04:41 +08:00
Dan Poltawski
a0c2ac6b86 MDL-43682 report_loglive: commit built yui files 2014-04-08 12:03:37 +08:00
Sam Hemelryk
2891559fd5 MDL-43682 report_loglive: fixed lint warning in fetchlogs JS 2014-04-08 15:41:54 +12:00
Dan Poltawski
23cc5bbdc0 Merge branch 'MDL-44868-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-08 11:37:25 +08:00
Dan Poltawski
95ce54f060 Merge branch 'MDL-44869-master' of git://github.com/FMCorz/moodle 2014-04-08 11:27:59 +08:00
Marina Glancy
39b70b23b7 Merge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle 2014-04-08 11:14:52 +08:00
Marina Glancy
593fc9d8d6 Merge branch 'MDL-44948' of git://github.com/timhunt/moodle 2014-04-08 11:13:43 +08:00
Marina Glancy
aaba0d56e2 Merge branch 'MDL-44891-master' of git://github.com/sammarshallou/moodle 2014-04-08 11:13:17 +08:00
Damyon Wiese
1786388680 MDL-44342 message_airnotifier: Fix for unit tests. 2014-04-08 10:55:33 +08:00
Damyon Wiese
1e16a58525 Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle 2014-04-08 10:09:21 +08:00
Sam Hemelryk
e2a486837f Merge branch 'MDL-43975-master' of https://github.com/sammarshallou/moodle 2014-04-08 13:46:28 +12:00
Dan Poltawski
36e051dab4 Merge branch 'wip-MDL-18598-master' of git://github.com/marinaglancy/moodle 2014-04-08 09:45:07 +08:00
Damyon Wiese
9f7e101fc7 Merge branch 'MDL-44342' of git://github.com/jleyva/moodle 2014-04-08 09:27:48 +08:00
Dan Poltawski
3a047312b6 Merge branch '42317-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-08 09:22:38 +08:00
Marina Glancy
72c0f16889 Merge branch 'master_MDL-44938' of git://github.com/danmarsden/moodle 2014-04-08 08:53:58 +08:00
Marina Glancy
08cf1d787e Merge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle 2014-04-08 08:53:49 +08:00
Marina Glancy
0f4fc5a878 Merge branch 'MDL-42195-master' of git://github.com/damyon/moodle 2014-04-08 08:53:35 +08:00
Marina Glancy
efa6ee356b Merge branch 'MDL-44954' of git://github.com/jleyva/moodle 2014-04-08 08:34:24 +08:00
Sam Hemelryk
17c37406b5 Merge branch 'MDL-44408' of git://github.com/jleyva/moodle 2014-04-08 11:44:21 +12:00
Sam Hemelryk
3fb4d8fa88 Merge branch 'MDL-44912-master-core' of git://github.com/FMCorz/moodle 2014-04-08 11:42:29 +12:00
Sam Hemelryk
2e718bc4bd Merge branch 'MDL-44933-master' of git://github.com/FMCorz/moodle 2014-04-08 11:38:13 +12:00
Sam Hemelryk
c1229656db Merge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle 2014-04-08 11:35:34 +12:00