Damyon Wiese
e17bac441d
Merge branch 'wip-MDL-40683-master' of git://github.com/abgreeve/moodle
2013-10-29 16:42:48 +08:00
Mark Nelson
2072af6c1d
MDL-42592 mod_chat: passed additional name fields to be used by the fullname function
2013-10-29 16:41:46 +08:00
Rajesh Taneja
aa13929988
MDL-42584 Events: modified get_description in events
...
blog_entry_created - Removed summary field
blog_entry_deleted - Removed summary field and unwanted entry record
blog_entry_updated - Fixed single quotes and removed summary field
course_module_created - Removed subject
course_module_updated - Removed subject
user_deleted - Removed user firstname and last name
course_module_viewed - Fixed description
2013-10-29 15:24:23 +08:00
Dan Poltawski
2dd8e9357f
MDL-42407 upgrade.txt clarify description
2013-10-29 15:15:19 +08:00
Dan Poltawski
576abe8f39
Merge branch 'MDL-42407-master' of git://github.com/phalacee/moodle
2013-10-29 15:08:13 +08:00
Dan Poltawski
c966d2e8c8
Merge branch 'MDL-42528' of https://github.com/merrill-oakland/moodle
2013-10-29 15:03:52 +08:00
Jason Fowler
1389bcd7e6
MDL-42407 Filepicker: generate a smarter zIndex for the filepicker
2013-10-29 14:55:46 +08:00
Dan Poltawski
6cd49ef747
Merge branch 'wip-MDL-42463-master' of git://github.com/marinaglancy/moodle
2013-10-29 14:54:44 +08:00
Dan Poltawski
76aa53f2d8
Merge branch 'MDL-42507-master' of git://github.com/andrewnicols/moodle
2013-10-29 14:48:27 +08:00
Jerome Mouneyrac
07d1a2f349
MDL-41232 revert IE8 fix for solving unspoken filemanager details on View List selection
2013-10-29 14:44:02 +08:00
Dan Poltawski
c426631850
Merge branch 'MDL-42401-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
2013-10-29 14:43:02 +08:00
Dan Poltawski
02b87ac151
MDL-42236 fix trailing whitespace
2013-10-29 14:41:16 +08:00
Michael de Raadt
9f3da4079a
MDL-41092 assign: Fix duplicate key error in assign cron
2013-10-29 14:38:48 +08:00
John Beedell
614bf85a9e
MDL-41473 book: Book html zip import, incorrect url produced for internal linking to other chapters
2013-10-29 14:31:01 +08:00
Jason Fowler
e89c21b2f6
MDL-42236 File Manager - Fixing files and whitespace for UI consistency project
2013-10-29 14:24:37 +08:00
Barbara Ramiro
c38ecee56f
MDL-42149 Usability - Adding new icons for file manager/picker
2013-10-29 14:24:26 +08:00
Jason Fowler
f57697d428
MDL-42236 File Manger/Picker - Matching UI with standard UI
2013-10-29 14:24:04 +08:00
Damyon Wiese
5fb9161b5e
Merge branch 'MDL-40470-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js
2013-10-29 13:57:51 +08:00
Damyon Wiese
afb5f285cd
Merge branch 'm26_MDL-39810_IE_Compatibility_View_Does_Not_Recognize_JSON_RFC4627_MIME_Type' of https://github.com/scara/moodle
2013-10-29 13:44:34 +08:00
Dan Poltawski
d3428bc93a
Merge branch 'w44_MDL-42485_m26_memcachedlocktimeout' of https://github.com/skodak/moodle
2013-10-29 13:42:56 +08:00
Dan Poltawski
7d3cdcc90d
Merge branch 'wip-mdl-42557' of https://github.com/rajeshtaneja/moodle
2013-10-29 13:16:44 +08:00
Dan Poltawski
b6df9f8f55
Merge branch 'wip-mdl-42560' of git://github.com/rajeshtaneja/moodle
2013-10-29 13:09:23 +08:00
Marina Glancy
e58a30f9e8
MDL-42577 mod_url: add redirection delay with edit link
...
only for teachers and in the course format that does not have course view page (Single activity)
2013-10-29 16:08:01 +11:00
Dan Poltawski
e29dcc5a5b
Merge branch 'wip-mdl-42556' of https://github.com/rajeshtaneja/moodle
2013-10-29 12:10:44 +08:00
Adam Olley
eed17976dc
MDL-42587: calendar: Fix regression that stops dates autocorrecting
2013-10-29 14:19:08 +10:30
Jerome Mouneyrac
b9e946f827
MDL-42356 Edit PDF: When no stamps uploaded toolbar looks strange
2013-10-29 11:41:43 +08:00
Dan Poltawski
b0d92c0cec
Merge branch 'wip-mdl-42282' of git://github.com/rajeshtaneja/moodle
2013-10-29 11:31:32 +08:00
Dan Poltawski
0e9b076973
Merge branch 'wip-mdl-42281' of git://github.com/rajeshtaneja/moodle
2013-10-29 11:08:45 +08:00
Andrew Nicols
dd8e6cd932
MDL-40470 JavaScript: Correct issue when checking select change in Firefox
2013-10-29 10:43:47 +08:00
Ankit Agarwal
fb6ce191a6
MDL-42287 behat: Add an autoamted test to test MDLQA-82
2013-10-29 10:38:35 +08:00
Marina Glancy
9b5e2461d5
MDL-28463 grades: use get_course() method
2013-10-29 11:33:55 +11:00
Marina Glancy
b85b9b7c29
MDL-28463 grades: inform conditionlib that grades changed
2013-10-29 11:33:21 +11:00
Marina Glancy
55607effe1
MDL-42463 chat: do not set property of cm_info class
...
MDL-41192 made all properties of class cm_info read-only
2013-10-29 10:27:39 +11:00
Marina Glancy
d61d3163af
MDL-42318 coursecat: show correct courses count
...
courses count should exclude courses that are not visible to the current user
2013-10-29 10:26:56 +11:00
Marina Glancy
9d88b492b1
MDL-42318 coursecat: do not allow to sort if there are invisible children
2013-10-29 10:26:56 +11:00
Matteo Scaramuccia
bc242bbda5
MDL-39810 Files: IE doesn't recognize JSON MIME Type (RFC4627).
...
Affected versions:
- IE 8+, under Compatibility View.
2013-10-28 23:34:35 +01:00
Rajesh Taneja
e21ae3ebdc
MDL-42281 Behat: Automated test for MDLQA-510
...
MDLQA-510: A teacher can set grade conditions to restrict availability
of an activity
2013-10-28 16:48:19 +08:00
Rajesh Taneja
abedc1a84c
MDL-42556 Events: passing modified user info to user_deleted event
...
Deleting user modifies few fields and leave rest as un-modified
So passing modified data to event, to keep it small
2013-10-28 16:37:56 +08:00
Dan Poltawski
4daa024fd4
Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle
2013-10-28 16:31:17 +08:00
Dan Poltawski
c4a8d8e4ca
MDL-42573 skydrive: support non-js login scheme
...
This is actually not especially useful because Microsoft don't currently
support non-JS login. But its possible they could make it work in
future. And at least the user gets an error from MS rather than blank
screen.
2013-10-28 16:23:42 +08:00
Rajesh Taneja
0d22c24829
MDL-42557 Events: added idnumber to course_deleted event data
2013-10-28 16:16:25 +08:00
Ankit Agarwal
a48dcbf604
MDL-42574 blocks: Fix strict standards warning in community block
2013-10-28 15:41:29 +08:00
Dan Poltawski
b1a6c9dc52
Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
login/change_password.php
2013-10-28 15:37:05 +08:00
Dan Poltawski
10ac20830b
Merge branch 'wip-mdl-42283' of git://github.com/rajeshtaneja/moodle
2013-10-28 14:53:21 +08:00
Frederic Massart
be99db5b96
MDL-22669 course: Display section number for orphaned activities
2013-10-28 14:44:08 +08:00
Dan Poltawski
ff1ec8b50f
Merge branch 'MDL-42285-master' of git://github.com/phalacee/moodle
2013-10-28 14:15:27 +08:00
Marina Glancy
5ea6d66e9f
Merge branch 'MDL-42028-master-4' of git://github.com/mouneyrac/moodle
2013-10-28 16:56:45 +11:00
Jerome Mouneyrac
aa3e4bdec7
MDL-42028 EditPDF: replace the loading icon by a progress bar
2013-10-28 13:48:22 +08:00
Rajesh Taneja
726a3be81a
MDL-42557 Events: Removed timemodified hack from course_deleted event
2013-10-28 13:01:14 +08:00
Damyon Wiese
9a84376d4b
Merge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle
2013-10-28 12:39:30 +08:00