mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
64,617 Commits 36 Branches 519 Tags
Commit Graph

64617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Dan Poltawski
3e2b1a15aa Merge branch 'MDL-42514-master' of git://github.com/FMCorz/moodle 2013-10-25 15:27:48 +08:00
Dan Poltawski
d62cddc569 Merge branch 'MDL-42535-master-int' of git://github.com/FMCorz/moodle 2013-10-25 13:47:00 +08:00
Marina Glancy
10b44ec93d Merge branch 'w43_MDL-42207_m26_messageformat' of https://github.com/skodak/moodle 2013-10-25 16:16:31 +11:00
Petr Škoda
4048f5b39c MDL-42207 standardise message text formatting 2013-10-25 07:08:34 +02:00
Dan Poltawski
b2d08cad46 Merge branch 'MDL-42220-master' of git://github.com/ankitagarwal/moodle 2013-10-25 12:42:38 +08:00
Dan Poltawski
cf49c1b642 Merge branch 'MDL-42219-master' of git://github.com/ankitagarwal/moodle 2013-10-25 12:39:37 +08:00
Marina Glancy
a2f56679f9 Merge branch 'MDL-31938-master' of git://github.com/danpoltawski/moodle 2013-10-25 14:56:31 +11:00
Thijs Kinkhorst
9953966213 MDL-31938: fix syntax error in db upgrade & update plugin version 
Also correct language class name.
 2013-10-25 11:51:30 +08:00
Iñaki Arenaza
02a9e4a7f3 MDL-31938, MDL-36138 auth_cas: upgrade phpCAS library 
Proxy mode changes testing still pending (we don't have such a setup).
 2013-10-25 11:51:23 +08:00
Frederic Massart
268bd2fe77 MDL-42534 mod_forum: Fix issue because cm_info is read only 2013-10-25 11:34:10 +08:00
Dan Poltawski
6356be73d0 Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle 2013-10-25 11:33:19 +08:00
Rajesh Taneja
ca85839fd3 MDl-42261 My Home: Fixed string key to show all courses 2013-10-25 11:26:58 +08:00
David Monllao
a068887e3d MDL-42538 behat: Fixing wrong number of users 2013-10-25 11:22:34 +08:00
Rajesh Taneja
735c3a7b4f MDL-42536 enrol_self: Added groups/lib.php required file 2013-10-25 11:09:43 +08:00
Frederic Massart
c58d1e0c24 MDL-42535 report_outline: Notice set_url() was not called 2013-10-25 10:20:11 +08:00
Dan Poltawski
eb04bc4a86 Merge branch 'w43_MDL-42381_m26_ole' of https://github.com/skodak/moodle 2013-10-25 10:05:55 +08:00
Michael de Raadt
a6989aa6e9 MDL-42491 libraries: add exception for IE11 (and hopefully later versions) 2013-10-25 09:24:47 +08:00
Frederic Massart
40bbce2499 MDL-42514 groups: Importing groups created unnamed groupings 2013-10-25 08:14:33 +08:00
Eloy Lafuente (stronk7)
27ee4c13a5 Merge branch 'MDL-42377_master' of https://github.com/markn86/moodle 2013-10-25 01:14:04 +02:00
Eloy Lafuente (stronk7)
7419751a4c Merge branch 'MDL-41966-master' of git://github.com/ankitagarwal/moodle 2013-10-25 01:09:25 +02:00
Eloy Lafuente (stronk7)
20ddc0c9cf Merge branch 'MDL-42410-master' of git://github.com/danpoltawski/moodle 2013-10-24 23:35:24 +02:00
Eloy Lafuente (stronk7)
c783a415dc Merge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle 2013-10-24 23:33:42 +02:00
Eloy Lafuente (stronk7)
d0285a0d91 Merge branch 'w43_MDL-42206_m26_metaedit' of https://github.com/skodak/moodle 2013-10-24 23:27:11 +02:00
Dan Poltawski
e36f72414d Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle 2013-10-24 16:57:47 +08:00