Commit graph

57825 commits

Author SHA1 Message Date
Aparup Banerjee
ce84cbacb7 Merge branch 'MDL-36777-master' of git://github.com/FMCorz/moodle 2012-12-03 14:59:15 +08:00
Dan Poltawski
e1c93ed97b Merge branch 'MDL-36914-master' of git://github.com/damyon/moodle 2012-12-03 14:45:04 +08:00
Frederic Massart
197b314f46 MDL-36860 theme: Readme for MyMobile hack 2012-12-03 14:18:35 +08:00
Dan Poltawski
7d1c3abe88 Merge branch 'MDL-36883-master' of git://github.com/FMCorz/moodle 2012-12-03 14:08:25 +08:00
Dan Poltawski
7eebac6c77 Merge branch 'MDL-36860-master' of git://github.com/FMCorz/moodle 2012-12-03 13:56:21 +08:00
Dan Poltawski
72647f09f1 Merge branch 'MDL-36944-master' of git://github.com/FMCorz/moodle 2012-12-03 13:41:02 +08:00
Dan Poltawski
539cc4061d Merge branch 'MDL-36949-master' of git://github.com/FMCorz/moodle 2012-12-03 13:28:12 +08:00
Dan Poltawski
4a67095710 Merge branch 'MDL-36884-master' of git://github.com/FMCorz/moodle 2012-12-03 13:23:21 +08:00
Dan Poltawski
c62c77c0e8 Merge branch 'wip-MDL-36888-m24' of git://github.com/samhemelryk/moodle 2012-12-03 12:55:42 +08:00
Dan Poltawski
f92340ed3f Merge branch 'MDL-36948-master' of git://github.com/FMCorz/moodle 2012-12-03 11:59:01 +08:00
Dan Poltawski
28ef36f018 Merge branch 'MDL-36618-master' of git://github.com/FMCorz/moodle 2012-12-03 10:36:16 +08:00
Sam Hemelryk
383b89a1e2 MDL-36888 theme: allow the use of SVG in CSS background images. 2012-12-03 09:20:06 +13:00
David Mudrák
333048e06b MDL-36903 Add a link to Moodle documentation from mdeploy error pages 2012-11-30 16:09:58 +01:00
David Mudrák
e428b5e0ae MDL-36903 Make mdeploy.php use the custom CA certificate if it exists 2012-11-30 16:09:58 +01:00
David Mudrák
30e2682756 MDL-36903 Pre-check the ZIP download before executing the mdeploy.php utility
This patch makes Moodle call HTTP HEAD method via cURL to see if the ZIP
is expected to be downloadable by mdeploy.php. This is mainly intended
for SSL certificates check.
2012-11-30 16:09:58 +01:00
David Mudrák
4785c45dd8 MDL-36903 Verify the SSL certificate of available updates provider
From now on, Moodle verifies the available updates provider server. To
make it work, either there must be a valid CA certificate available in
the operating system, or the administrator has to upload the valid CA
certificate to moodledata/moodleorgca.crt (PEM format) file manually.
2012-11-30 16:09:58 +01:00
Frederic Massart
d75130a1a5 MDL-36949 usability: Use new icons for unused icons 2012-11-30 20:46:13 +08:00
Eloy Lafuente (stronk7)
47dfbd9eb3 on-demand release 2.4rc1 2012-11-30 13:26:57 +01:00
Eloy Lafuente (stronk7)
e433207d98 ie9 svg compatibility fixes 2012-11-30 13:19:44 +01:00
Frederic Massart
c2e10ac08a MDL-36948 usability: Styling for new reload icon 2012-11-30 20:19:16 +08:00
Barbara Ramiro
fd7653aa27 MDL-36948 usability: New reload icon 2012-11-30 20:18:58 +08:00
Eloy Lafuente (stronk7)
089b283b8a Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-11-30 12:48:01 +01:00
Frederic Massart
01686636ce MDL-36884 usability: Deprecated icons fallback on most corresponding new icons 2012-11-30 19:32:14 +08:00
Frederic Massart
c7859a51b7 MDL-36944 usability: New version of switchrole icon 2012-11-30 19:28:19 +08:00
Barbara Ramiro
cfd17b5da7 MDL-36618 usability: New icons for permissions risks 2012-11-30 19:17:59 +08:00
Frederic Massart
d9f95015f5 MDL-36777 usability: Theming fixes on backup steps 2012-11-30 16:53:39 +08:00
Barbara Ramiro
f9f8a6af6e MDL-36777 usability: New icons for backup 2012-11-30 16:53:39 +08:00
Frederic Massart
851d3b7a97 MDL-36830 usability: Glossary and database small design improvements 2012-11-30 16:48:46 +08:00
Aparup Banerjee
2d74d1aea3 Merge branch 'MDL-36632-master' of git://github.com/FMCorz/moodle 2012-11-30 15:44:50 +08:00
Frederic Massart
501380a96d MDL-36632 usability: Grading methods icons and CSS 2012-11-30 15:42:39 +08:00
Aparup Banerjee
12995ef7d0 Merge branch 'MDL-36774-master' of git://github.com/FMCorz/moodle 2012-11-30 15:32:15 +08:00
Aparup Banerjee
7b1c485911 Merge branch 'MDL-36765-master' of git://github.com/FMCorz/moodle 2012-11-30 15:21:05 +08:00
Aparup Banerjee
5bd84c3fde Merge branch 'MDL-36869-master' of git://github.com/FMCorz/moodle 2012-11-30 15:05:41 +08:00
Frederic Massart
41058f0a19 MDL-36860 theme: Fix MyMobile theme CSS 2012-11-30 13:21:52 +08:00
Frederic Massart
d81c17f900 MDL-36860 theme: MyMobile jQuery Mobile hack 2012-11-30 13:20:54 +08:00
Eloy Lafuente (stronk7)
663dbbc2e6 MDL-36933 Bump everything to 2012112900
(versions, requires and dependencies)
2012-11-30 03:30:09 +01:00
Eloy Lafuente (stronk7)
08c05956e0 MDL-36933 Prepare main version and backup branch 2012-11-30 03:15:31 +01:00
Dan Poltawski
6b003f12eb Merge branch 'wip-MDL-36937-m24' of git://github.com/samhemelryk/moodle 2012-11-30 09:48:36 +08:00
Sam Hemelryk
b870426ab6 MDL-36937 cache: Fixed up typo 2012-11-30 14:29:58 +13:00
Dan Poltawski
b584a35845 Revert "MDL-36838 moodle->mahara mnet SSO failure in FF17"
Firefox have now decided to reverse their UA change (since integration)
and this patch has some minor drawbacks.

This reverts commit 1c65f683dc.
2012-11-30 09:23:17 +08:00
Barbara Ramiro
6d5f93ee28 MDL-36869 usability: Revised icons enrolusers and assignroles 2012-11-29 16:16:16 +08:00
Damyon Wiese
f264499fcf MDL-36914: Assignment upgrade. Clean up patch to include outcomes in the upgrade
Thanks to Nathan Mares for reporting this issue.
2012-11-29 16:10:02 +08:00
Nathan Mares
8131a848dd MDL-36914: Re-associate all grade_item records when upgrading assignments to prevent data loss 2012-11-29 16:10:02 +08:00
Dan Poltawski
e4d7ec6b3b Merge branch 'MDL-36783-master' of git://github.com/FMCorz/moodle 2012-11-29 15:06:19 +08:00
Dan Poltawski
7dd3674708 Merge branch 'MDL-36638-master' of git://github.com/FMCorz/moodle 2012-11-29 14:53:11 +08:00
Dan Poltawski
4f847182e6 Merge branch 'MDL-36839-master' of git://github.com/FMCorz/moodle 2012-11-29 14:43:50 +08:00
Aparup Banerjee
8e1fbc0fe6 Merge branch 'master_MDL-36858' of git://github.com/danmarsden/moodle 2012-11-29 12:53:25 +08:00
Dan Poltawski
88ee671bae Merge branch 'MDL-36718-master' of git://github.com/FMCorz/moodle 2012-11-29 12:51:00 +08:00
Frederic Massart
c384744304 MDL-36638 usability: Core changes for new quiz/question icons 2012-11-29 12:41:29 +08:00
Barbara Ramiro
5644415789 MDL-36638 usability: New quiz/question related icons 2012-11-29 12:40:09 +08:00