moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69952 commits 37 branches 540 tags 1.3 GiB
Commit graph

19109 commits

Author SHA1 Message Date
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
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
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
Ankit Agarwal
5793538a59 MDL-45409 conditional_activity: Do not iterate over deprecated properties 2014-05-05 16:26:35 +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
Sam Hemelryk
31a8eddc24 MDL-45231 theme_clean: default navbar to absolute when running behat 2014-05-05 08:11:46 +12: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
16c6440dcb MDL-45382 atto_link: Missing context when finding anchors 2014-05-02 12:02:36 +08:00
Damyon Wiese
6e4c18522d Revert "MDL-45239 editor_atto: The editor cannot be active if it is not the active element" 
This reverts commit 05a7f9e749.
 2014-05-01 16:22:41 +08:00
Dan Poltawski
9d39960028 Merge branch 'MDL-43570' of https://github.com/KristerV/moodle 
Conflicts:
	version.php
 2014-05-01 14:43:22 +08:00
Andrew Nicols
0ef60744c3 MDL-45359 JS: Only change mask zIndex on modal dialogues 
When dealing with a non-modal dialogue within a modal dialogue, we should
not update the z-index of the underyling maskNode as it does not belong to
this dialogue.
 2014-05-01 12:33:44 +08:00
Dan Poltawski
8d863216d8 Merge branch 'MDL-44815-master' of git://github.com/andrewnicols/moodle 2014-05-01 12:06:32 +08:00
Andrew Nicols
b76ed36f85 MDL-44815 core: Add chooser type to boundingbox class 2014-05-01 11:54:25 +08:00
Dan Poltawski
9482292af2 Merge branch 'MDL-45254-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
 2014-05-01 11:53:28 +08:00
Dan Poltawski
0024400788 Merge branch 'MDL-45167-master' of git://github.com/andrewnicols/moodle 2014-05-01 11:37:13 +08:00
Andrew Nicols
395e5e5304 MDL-45167 install: Improve styling of installation process 2014-05-01 10:43:21 +08:00
Damyon Wiese
45b4f8734a Merge branch 'MDL-44867-m2' of git://github.com/andrewnicols/moodle 2014-05-01 10:29:42 +08:00
Andrew Nicols
241836683a MDL-44867 atto_equation: Adjust the help string describing cursor info 2014-05-01 10:18:03 +08:00
Krister Viirsaar
ecdb94d3e0 MDL-43570 filetypes: Added new filetypes - ddoc, bdoc, cdoc 2014-04-30 13:04:34 +03:00
Dan Poltawski
da916029ba Merge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle 2014-04-30 15:48:17 +08:00
Damyon Wiese
1b3f9ea1ba Merge branch 'MDL-44867-master' of git://github.com/andrewnicols/moodle 2014-04-30 15:40:36 +08:00
Frederic Massart
8cf55094af MDL-45256 portfolio: Adding missing global in testcase 2014-04-30 15:32:23 +08:00
Marina Glancy
6776b3ffa0 Merge branch 'w19_MDL-43557_m27_cleanup' of git://github.com/skodak/moodle 2014-04-30 15:12:56 +08:00
Marina Glancy
6032ae0f13 Merge branch 'MDL-43557_master' of git://github.com/markn86/moodle 2014-04-30 15:12:31 +08:00
Petr Skoda
8b233bdacd MDL-43557 fix BC issue in \core\event\course_completed and incorrect description 2014-04-30 14:59:45 +08:00
Dan Poltawski
63c6df66c3 Merge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle 2014-04-30 14:58:56 +08:00
Dan Poltawski
4df8bbfc87 Merge branch 'MDL-45298-master' of git://github.com/FMCorz/moodle 2014-04-30 14:15:40 +08:00
Damyon Wiese
da8a720d75 Merge branch 'MDL-45239-master' of git://github.com/andrewnicols/moodle 2014-04-30 12:13:49 +08:00
Andrew Nicols
d8e2dc99b7 MDL-44867 atto_equation: Switch to the Downarrow for cursor position 
The \square macro is not available in standard MimeTeX.
 2014-04-30 11:14:36 +08:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00
Mark Nelson
f3d981897e MDL-43557 events: renamed event class names 
1) The core 'item_tagged' class was renamed to 'tag_added'.
2) The core 'item_untagged' class was renamed to 'tag_removed'.
3) The core 'message_read' class was renamed to 'message_viewed'.
4) The mod_forum 'userreport_viewed' class was renamed to 'user_report_viewed'.
5) The report_outline 'activity_viewed' was renamed to 'activity_report_viewed'.
6) The report_outline 'outline_viewed' was renamed to 'report_viewed'.
 2014-04-29 19:15:47 -07:00
Mark Nelson
e692f58558 MDL-43557 events: removed underscores from event string keys 
AMOS START
 MOV [event_legacy_logged, logstore_legacy],[eventlegacylogged,logstore_legacy]
 MOV [event_cohort_created,cohort],[eventcohortcreated,cohort]
 MOV [event_cohort_deleted,cohort],[eventcohortdeleted,cohort]
 MOV [event_cohort_member_added,cohort],[eventcohortmemberadded,cohort]
 MOV [event_cohort_member_removed,cohort],[eventcohortmemberremoved,cohort]
 MOV [event_cohort_updated,cohort],[eventcohortupdated,cohort]
 MOV [event_group_created,group],[eventgroupcreated,group]
 MOV [event_group_deleted,group],[eventgroupdeleted,group]
 MOV [event_group_member_added,group],[eventgroupmemberadded,group]
 MOV [event_group_member_removed,group],[eventgroupmemberremoved,group]
 MOV [event_group_updated,group],[eventgroupupdated,group]
 MOV [event_grouping_created,group],[eventgroupingcreated,group]
 MOV [event_grouping_deleted,group],[eventgroupingdeleted,group]
 MOV [event_grouping_updated,group],[eventgroupingupdated,group]
 MOV [event_webservice_function_called,webservice],[eventwebservicefunctioncalled,webservice]
 MOV [event_webservice_login_failed,webservice],[eventwebserviceloginfailed,webservice]
 MOV [event_webservice_service_created,webservice],[eventwebserviceservicecreated,webservice]
 MOV [event_webservice_service_deleted,webservice],[eventwebserviceservicedeleted,webservice]
 MOV [event_webservice_service_updated,webservice],[eventwebserviceserviceupdated,webservice]
 MOV [event_webservice_service_user_added,webservice],[eventwebserviceserviceuseradded,webservice]
 MOV [event_webservice_service_user_removed,webservice],[eventwebserviceserviceuserremoved,webservice]
 MOV [event_webservice_token_created,webservice],[eventwebservicetokencreated,webservice]
 MOV [event_webservice_token_sent,webservice],[eventwebservicetokensent,webservice]
 MOV [event_user_loggedin,auth],[eventuserloggedin,auth]
 MOV [event_assessable_uploaded,assignsubmission_file],[eventassessableuploaded,assignsubmission_file]
 MOV [event_assessable_uploaded,assignsubmission_onlinetext],[eventassessableuploaded,assignsubmission_onlinetext]
 MOV [event_chapter_created,mod_book],[eventchaptercreated,mod_book]
 MOV [event_chapter_deleted,mod_book],[eventchapterdeleted,mod_book]
 MOV [event_chapter_updated,mod_book],[eventchapterupdated,mod_book]
 MOV [event_chapter_viewed,mod_book],[eventchapterviewed,mod_book]
 MOV [event_book_exported,booktool_exportimscp],[eventbookexported,booktool_exportimscp]
 MOV [event_book_printed,booktool_print],[eventbookprinted,booktool_print]
 MOV [event_chapter_printed,booktool_print],[eventchapterprinted,booktool_print]
 MOV [event_message_sent,mod_chat],[eventmessagesent,mod_chat]
 MOV [event_sessions_viewed,mod_chat],[eventsessionsviewed,mod_chat]
 MOV [event_answer_created,mod_choice],[eventanswercreated,mod_choice]
 MOV [event_answer_updated,mod_choice],[eventanswerupdated,mod_choice]
 MOV [event_report_viewed,mod_choice],[eventreportviewed,mod_choice]
 MOV [event_assessable_uploaded,mod_forum],[eventassessableuploaded,mod_forum]
 MOV [event_assessable_uploaded,mod_workshop],[eventassessableuploaded,mod_workshop]
AMOS END
 2014-04-29 19:15:47 -07:00
Andrew Davis
feac5dc7ba MDL-44780 filter_mathjaxloader: mathjax is now at the top of the filter list 2014-04-30 08:29:14 +08:00
Eloy Lafuente (stronk7)
f500ff4e52 MDL-45221 Allow unit tests to pass under any OS 
This commit gets rid of the old lib/tests/other/executable.php
file completely because it was only executable under unix OSs
and moves the check to be performed against some mimetex binaries
that are known to be executable and bundled with every installation.

Note this was discovered because the weekly rolling process changed
the execution permissions of the "fixture" file and, at the end
we decided to get rid of it completely, folowing the plan above.
 2014-04-29 19:22:54 +02:00
Eloy Lafuente (stronk7)
7c02f52a0e NOBUG: Fixed file access permissions 2014-04-29 15:14:21 +02:00
Frederic Massart
89708ffc5f MDL-45256 portfolio: Do not require strict XML when parsing content 2014-04-29 17:43:44 +08:00
Frederic Massart
94545c73f1 MDL-45256 portfolio: Unit tests for rewrite pluginfile urls 2014-04-29 17:43:44 +08:00
Marina Glancy
a8294bd955 Merge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle 2014-04-29 17:27:56 +08:00
Frederic Massart
1cc9c00c3e MDL-45229 event: Adding information about stricter validation 2014-04-29 17:12:43 +08:00
Sam Hemelryk
e0eca9b3e5 Merge branch 'MDL-45312' of git://github.com/timhunt/moodle 2014-04-29 10:24:20 +12:00
Sam Hemelryk
4299dc5bb6 Merge branch 'MDL-45221-master' of git://github.com/andrewnicols/moodle 2014-04-29 09:10:05 +12:00
Tim Hunt
856c2f1404 MDL-45312 qtype_missingtype or qbehaviour_missing cannot be uninstalled. 
They are required by the system.
 2014-04-28 21:45:46 +01:00
Sam Hemelryk
48dba530c6 Merge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle 2014-04-29 08:40:16 +12:00