mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-08 01:05:48 +02:00
Code Issues Projects Releases Wiki Activity
68,192 Commits 37 Branches 536 Tags
87f7ae9c46
Commit Graph

68192 Commits

Author SHA1 Message Date
Damyon Wiese
87f7ae9c46 Merge branch '45412-27' of git://github.com/samhemelryk/moodle 2014-05-06 12:03:19 +08:00
Dan Poltawski
02c482704b Merge branch 'MDL-45403-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
 2014-05-06 11:48:38 +08:00
Dan Poltawski
73c2ae4bff Merge branch 'MDL-45253-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-05-06 11:34:17 +08:00
Dan Poltawski
63469ab11d Merge branch 'MDL-45338-master' of git://github.com/andrewnicols/moodle 2014-05-06 11:27:41 +08:00
Damyon Wiese
f35bfa2cff Merge branch 'MDL-45290-master-fix' of http://github.com/jethac/moodle 2014-05-06 11:23:39 +08:00
Dan Poltawski
4644e7d067 Merge branch 'MDL-45376-master' of https://github.com/sammarshallou/moodle 2014-05-06 11:16:32 +08:00
Jetha Chan
fe778267f2 MDL-45290 rubric: IE8 and minor fixes, RTL 
Added a fallback style for IE8, adjusted some minor styles, added RTL capability.
 2014-05-06 10:44:59 +08:00
Dan Poltawski
5bf52355ea Merge branch 'MDL-30106' of git://github.com/jleyva/moodle 2014-05-06 10:25:48 +08:00
Dan Poltawski
ba60c47265 Merge branch 'MDL-42956-master' of git://github.com/lameze/moodle 2014-05-06 10:18:44 +08:00
Sam Hemelryk
6deb0813d0 MDL-45412 cachestore_mongodb: added notification of old Mongo version use 2014-05-06 09:30:27 +12:00
Sam Hemelryk
4907a8ed70 MDL-45412 cachestore_mongodb: fixed use of deprecated Mongo class 2014-05-06 09:29:45 +12:00
Juan Leyva
fb8840d291 MDL-30106 forum: get_posts WS fixes in data generator and def. values 2014-05-05 11:56:43 +02:00
Juan Leyva
4ed1546154 MDL-30106 forum: Bump version number (upgrading service and installing new ws) 2014-05-05 11:56:43 +02:00
Juan Leyva
e2ede4262f MDL-30106 forum: New web service mod_forum_get_forum_discussion_posts 2014-05-05 11:55:43 +02:00
Frederic Massart
664c851755 MDL-45403 editor_atto: Change default for tagMarchRequiresAll to true 2014-05-05 17:47:54 +08:00
Frederic Massart
e76ae8077a MDL-45253 editor_atto: Async the highlighting of buttons 2014-05-05 17:46:13 +08:00
Frederic Massart
fafeb5a293 MDL-45253 editor_atto: Check for button highlights on change event 
This will allow a button to be highlighted when a plugin has updated
the content, not only when the selection has changed.
 2014-05-05 17:46:13 +08:00
Frederic Massart
e988383645 MDL-45253 editor_atto: Prevent selection of all nodes when selection is empty 2014-05-05 17:46:13 +08:00
Frederic Massart
d78920bdba MDL-45253 editor_atto: selectionFilterMatches includes parents 2014-05-05 17:46:13 +08:00
Marina Glancy
6df154bd20 Merge branch 'MDL-34904-master' of git://github.com/ankitagarwal/moodle 2014-05-05 17:41:01 +08:00
Damyon Wiese
6d8617bed9 Merge branch 'MDL-45359-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-05-05 17:24:08 +08:00
Marina Glancy
a7c1a5bcb5 Merge branch 'MDL-44174-master' of git://github.com/FMCorz/moodle 2014-05-05 17:18:04 +08:00
Marina Glancy
4cbe8be96d Merge branch 'MDL-45342-master' of git://github.com/ankitagarwal/moodle 2014-05-05 17:17:45 +08:00
Marina Glancy
cbc394fabf Merge branch 'MDL-43319-master' of git://github.com/danpoltawski/moodle 2014-05-05 17:17:30 +08:00
Marina Glancy
d0144cd38e Merge branch 'MDL-44972-master' of git://github.com/damyon/moodle 2014-05-05 17:17:11 +08:00
Marina Glancy
b9c5bae5b1 Merge branch '45231-27-2' of git://github.com/samhemelryk/moodle 2014-05-05 17:16:52 +08:00
Damyon Wiese
c1660772b1 MDL-44972 Atto dialogues: Change M.core.dialogue attribute name to "focusOnShowSelector" 
And some minor cleanups.
 2014-05-05 16:27:36 +08:00
Marina Glancy
16feb870d4 Merge branch 'MDL-45357_master' of git://github.com/markn86/moodle 2014-05-05 16:09:53 +08:00
Mark Nelson
c5cfb3ca98 MDL-45357 events: changed event descriptions to ensure consistency in core 2014-05-05 00:55:50 -07:00
Damyon Wiese
e5ddec38cd MDL-44972 Atto: Focus on the first input field in forms in dialogues. 2014-05-05 15:21:11 +08:00
Damyon Wiese
2372366f58 MDL-44224: outdent plugin - handle divs that have been silently switched for ps 
Also - fix a shifter warning.
 2014-05-05 14:07:02 +08:00
Sam Hemelryk
b16c2ec5c8 MDL-44224 atto_indent: converts blockquotes to div indents 2014-05-05 14:07:01 +08:00
Damyon Wiese
3917871e90 Merge branch 'MDL-45290-master' of git://github.com/jethac/moodle 2014-05-05 10:43:15 +08:00
Damyon Wiese
7da3113b7b Merge branch 'MDL-45382-master' of git://github.com/FMCorz/moodle 2014-05-05 10:35:28 +08:00
Marina Glancy
a128a24fca Merge branch 'wip-MDL-45127-master' of git://github.com/abgreeve/moodle 2014-05-05 10:18:03 +08:00
Sam Hemelryk
31a8eddc24 MDL-45231 theme_clean: default navbar to absolute when running behat 2014-05-05 08:11:46 +12:00
Dan Poltawski
0401143193 Moodle release 2.7rc1 v2.7.0-rc1 2014-05-02 17:41:54 +08:00
Dan Poltawski
94d5dc0b98 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-05-02 17:41:51 +08:00
Adrian Greeve
028f535fd9 MDL-45127 mod_lesson: Behat test for reviewing a lesson. 2014-05-02 16:09:06 +08:00
Adrian Greeve
0aec842e58 MDL-45127 mod_lesson: Fixed reviewing lesson answers changing the lesson grade. 2014-05-02 16:09:06 +08:00
Adrian Greeve
20685b287d MDL-45127 mod_lesson: Updated question edit screen with more help text. 
Unless the custom scores is selected in the lesson settings the score section
in the question settings will be disabled. A help link has been added with
a description similar to this one.
 2014-05-02 16:09:05 +08:00
Dan Poltawski
f25e8c4133 Merge branch 'MDL-45054-master' of https://github.com/sammarshallou/moodle 2014-05-02 14:59:25 +08:00
Jetha Chan
73eb9f4339 MDL-45290 rubric: visual fixups 
Fixed up visual issues with rubric editor on Clean.
 2014-05-02 14:27:14 +08:00
Ankit Agarwal
200aeda661 MDL-34904 lti: Fix notice while using lti in frontpage 2014-05-02 14:05:13 +08:00
Andrew Nicols
e30506416b MDL-45338 editor_atto: Check for selection changes on touch-based devices too 2014-05-02 14:03:16 +08:00
Frederic Massart
ad9353be73 MDL-44174 theme_clean: Updating information in readme file 2014-05-02 12:56:00 +08:00
Ankit Agarwal
f20ae2c5d6 MDL-45342 book: Automate MDLQA-2423 - A teacher can create book chapters and subchapters 2014-05-02 12:13:42 +08:00
Frederic Massart
16c6440dcb MDL-45382 atto_link: Missing context when finding anchors 2014-05-02 12:02:36 +08:00
Andrew Davis
08b90682e4 MDL-45314 core_grade: a JS fix for the grader report 2014-05-02 11:13:45 +08:00
Marina Glancy
e2c3c3e080 Merge branch 'MDL-45237-master' of git://github.com/danpoltawski/moodle 2014-05-02 11:13:06 +08:00