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

68220 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
7936ca2c54 MDL-45273 quiz: whitespace fix 2014-05-01 12:19:49 +08:00
Marina Glancy
ea50fe37c8 Merge branch 'MDL-45273' of git://github.com/timhunt/moodle 2014-05-01 12:16:48 +08:00
Dan Poltawski
8d863216d8 Merge branch 'MDL-44815-master' of git://github.com/andrewnicols/moodle 2014-05-01 12:06:32 +08:00
Marina Glancy
f1251b7730 Merge branch 'MDL-45314_resize' of git://github.com/andyjdavis/moodle 2014-05-01 12:04:11 +08:00
Andrew Davis
85b609c938 MDL-45314 core_grade: keep the two grader report scrollbars the same when the table changes width 2014-05-01 11:57:45 +08:00
Andrew Nicols
5b932559ce MDL-44815 theme: Make chooser icons the standard 16px 
The only exception to this rule is the activity chooser which is allowed
24px.
 2014-05-01 11:54:26 +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
Marina Glancy
a608d3f40b Merge branch 'MDL-45292-master' of git://github.com/jethac/moodle 2014-05-01 11:48:00 +08:00
Marina Glancy
2027ee89e3 Merge branch 'wip-MDL-45360-master' of git://github.com/abgreeve/moodle 2014-05-01 11:47:51 +08:00
Marina Glancy
64db8b7bcf Merge branch 'MDL-45343-master' of git://github.com/ankitagarwal/moodle 2014-05-01 11:47:40 +08:00
Marina Glancy
8505550532 Merge branch 'MDL-45258-master' of git://github.com/ankitagarwal/moodle 2014-05-01 11:47:27 +08:00
Andrew Nicols
f12f34166d MDL-45329 admin_task: Allow scheduled task change prevention 
Some hosting providers have a requirement to prevent users making
modifications to the configuration of scheduled tasks as doing so may have
a negative impact not only on their own site, but also on the performance
of other sites (depending on host configuration). For example, if the
statistics or automated backup tasks were run every minute, this could have
a negative impact for other users).
 2014-05-01 11:40:25 +08:00
Dan Poltawski
0024400788 Merge branch 'MDL-45167-master' of git://github.com/andrewnicols/moodle 2014-05-01 11:37:13 +08:00
Marina Glancy
d2d4a49091 Merge branch 'wip-MDL-45348-master' of git://github.com/abgreeve/moodle 2014-05-01 11:22:54 +08:00
Adrian Greeve
ae63d3e11e MDL-45348 report_eventlist: Removed duplicate list link in plugins > report. 
I also fixed up a spelling mistake in the language pack (relatedobservers).
 2014-05-01 11:12:39 +08:00
Andrew Nicols
395e5e5304 MDL-45167 install: Improve styling of installation process 2014-05-01 10:43:21 +08:00
Dan Poltawski
c37257151b Merge branch 'MDL-45283-master' of git://github.com/FMCorz/moodle 2014-05-01 10:40:14 +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
Adrian Greeve
780b2e6ccc MDL-45360 report_eventlist: Fixed up css for the Events list detail page. 
When the screen size is reduced the details are moved underneath the headings
prematurely.
 2014-05-01 10:01:55 +08:00
Krister Viirsaar
ecdb94d3e0 MDL-43570 filetypes: Added new filetypes - ddoc, bdoc, cdoc 2014-04-30 13:04:34 +03:00
Ankit Agarwal
c906551fc6 MDL-45343 report_log: Fix missing enddate clause when using date filter 2014-04-30 16:52:29 +08:00
Damyon Wiese
5077d63790 Merge branch 'w19_MDL-45262_m27_choice' of https://github.com/skodak/moodle 2014-04-30 16:37:53 +08:00
Damyon Wiese
954e15bf27 Merge branch 'mdl44575-master' of https://github.com/tlock/moodle 2014-04-30 16:31:41 +08: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
Petr Skoda
8e937d25d0 MDL-45262 remove set_page_detail() leftover from choice report 2014-04-30 15:25:47 +08:00
Damyon Wiese
46a7e1d23b Merge branch 'MDL-45321' of git://github.com/timhunt/moodle 2014-04-30 15:25:22 +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
b649341dab MDL-43557 add missing description to \mod_quiz\event\attempt_becameoverdue 2014-04-30 15:00:03 +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
Frederic Massart
98fed696dc MDL-45283 restore: Prevent failure when user course grade exists 
When we restore a course, the grade that a user has for the
grade item of the course cannot be created twice. If we try
to create it when it already exists, a database exception is
raised because of index duplication.

The safest way to proceed is certainly to ignore the grade
information from the backup, otherwise we could potentially
overwrite existing information. Though, this only applies
to restore as merge, and it does not affect the update of
the course grade.
 2014-04-30 12:09:13 +08:00
Petr Skoda
3373120f60 MDL-43557 fix assertion for course section event description 2014-04-30 11:44:56 +08:00
Dan Poltawski
4b1e2c5fc8 Merge branch 'MDL-44780_mathjax_default' of https://github.com/andyjdavis/moodle 2014-04-30 11:25:02 +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
Petr Skoda
d1c7cf5376 MDL-43557 fix relateduserid in \mod_workshop\event\submission_assessed 
The assessment is related to the original author of submission.
 2014-04-30 11:03:43 +08:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00
Mark Nelson
4d9c1b573e MDL-43557 mod_lesson: removed incorrect usage of snapshots 2014-04-29 19:15:47 -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
Marina Glancy
3f0a5f287a Merge branch 'MDL-45257-master-2nd' of git://github.com/FMCorz/moodle 2014-04-30 10:05:11 +08:00
Marina Glancy
00cb2f0010 Merge branch 'MDL-27459-master' of git://github.com/sammarshallou/moodle 2014-04-30 09:55:25 +08:00
Marina Glancy
8ced50e3da Merge branch 'MDL-45315-master' of git://github.com/danpoltawski/moodle 2014-04-30 09:55:10 +08:00
Krister Viirsaar
c6ac68eead MDL-42635 lesson: Fixed error message 2014-04-30 09:51:10 +08:00