mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 17:03:33 +02:00
Code Issues Projects Releases Wiki Activity
64,643 Commits 36 Branches 529 Tags
Commit Graph

64643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dan Poltawski
e29dcc5a5b Merge branch 'wip-mdl-42556' of https://github.com/rajeshtaneja/moodle 2013-10-29 12:10:44 +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
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
Rajesh Taneja
0d22c24829 MDL-42557 Events: added idnumber to course_deleted event data 2013-10-28 16:16:25 +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
Dan Poltawski
f76bd72234 Merge branch 'MDL-38419' of https://github.com/moodlerooms/moodle 2013-10-28 12:33:39 +08:00
Damyon Wiese
3a33578926 Merge branch 'wip-mdl-30812' of git://github.com/rajeshtaneja/moodle 2013-10-28 12:11:34 +08:00
Dan Poltawski
bdbca0949f Merge branch 'MDL-42538_master' of git://github.com/dmonllao/moodle 2013-10-28 11:35:54 +08:00
Dan Poltawski
96d0198b8a Merge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle 2013-10-28 11:21:26 +08:00
Dan Poltawski
4baf482daa Merge branch 'MDL-41504-master' of git://github.com/andrewnicols/moodle 2013-10-28 11:10:43 +08:00
Andrew Nicols
79ad49af63 MDL-41504 Theme: Remove duplicate width/height which seems to cause issues for WebKit 2013-10-28 11:07:37 +08:00
Andrew Nicols
3fcf3d2e78 MDL-41504 ActionMenu: Adjust position of icons 2013-10-28 11:06:51 +08:00
Andrew Nicols
a65a8f2535 MDL-41504 ActionMenu: Fix block icon sizes 2013-10-28 11:06:51 +08:00
Andrew Nicols
3148fdf0f5 MDL-41504 actionmenu: Only show course actionmenu if enabled 2013-10-28 11:06:51 +08:00
Andrew Nicols
1ecde7e2ac MDL-41504 ActionMenu: Only modify margins if an actionmenu is in use 2013-10-28 11:06:51 +08:00
Sam Hemelryk
ee2d09e430 MDL-41504 course: fixed action icon spacing with JS disabled 2013-10-28 11:06:50 +08:00
Sam Hemelryk
a4f01fe443 MDL-41504 completion: fixed display of completion icon 
This entailed applying a right spacing to the action menu on
the standard theme to accomodate the completion icon when it
is present.
On the clean them I had to apply a trick. The completion icon
is floated right however no other content is floated.
To ensure the completion icon moved in relation to the action
menu I had to reduce its container size to 0 and rely on
natural overflow. I had to counter this my applying spacing
to the activity container in order to accommodate the actual
size of the icon.
 2013-10-28 11:06:49 +08:00
Rajesh Taneja
045d913d11 MDL-42560 Events: Removed use of role->name 
role->name is usually empty or localized, so should not be used in events
 2013-10-28 11:06:47 +08:00
Damyon Wiese
042e6a47fd Merge branch 'MDL-42481-master' of git://github.com/andrewnicols/moodle 2013-10-28 10:52:41 +08:00
Dan Poltawski
92fbc0de26 Merge branch 'MDL-42534-master-int' of git://github.com/FMCorz/moodle 2013-10-28 10:51:44 +08:00
Dan Poltawski
c713639b65 Merge branch 'MDL-42511-master' of git://github.com/FMCorz/moodle 2013-10-28 10:43:07 +08:00
Frederic Massart
fe1361fc9c MDL-42511 portfolio: Debugging from deprecated function in cron 2013-10-28 10:28:10 +08:00
Petr Škoda
6ec361c6bc MDL-42485 add session lock acquire timeout to memcached session driver 
Credit goes to Eric Merrill, thanks!
 2013-10-27 16:05:12 +01:00
Petr Škoda
a635424f88 MDL-42110 use parent directory permissions when installing add-ons 2013-10-25 21:23:40 +02:00
Petr Škoda
302506e03a MDL-42493 revert nasty DB meta caching hack that was trying to work around shutdown issues 
The original problem was resolved via new core shutdown handler support.
 2013-10-25 21:20:06 +02:00
Eloy Lafuente (stronk7)
68291f2d57 on-demand release 2.6beta+ 2013-10-25 13:04:18 +02:00
Dan Poltawski
534c356a87 Merge branch 'wip-mdl-42536' of git://github.com/rajeshtaneja/moodle 2013-10-25 15:55:27 +08:00