Sam Hemelryk [Tue, 19 Nov 2013 01:37:28 +0000 (14:37 +1300)]
Merge branch 'MDL-42905-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 19 Nov 2013 01:31:51 +0000 (14:31 +1300)]
Merge branch 'MDL-42553_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 19 Nov 2013 01:19:20 +0000 (14:19 +1300)]
Merge branch 'wip-MDL-42850-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:28:08 +0000 (12:28 +1300)]
Merge branch 'MDL-41316-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:24:56 +0000 (12:24 +1300)]
Merge branch 'w47_MDL-42612_m27_paypalruble' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:06:29 +0000 (12:06 +1300)]
Merge branch 'MDL-42774-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:03:41 +0000 (12:03 +1300)]
Merge branch 'MDL-42863' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 18 Nov 2013 22:50:44 +0000 (11:50 +1300)]
Merge branch 'MDL-42865' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 18 Nov 2013 22:44:29 +0000 (11:44 +1300)]
MDL-42852 theme_bootstrapbase: fixed whitespace
Sam Hemelryk [Mon, 18 Nov 2013 22:42:25 +0000 (11:42 +1300)]
Merge branch 'wip-MDL-42852_master' of git://github.com/gjb2048/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 18 Nov 2013 21:15:33 +0000 (10:15 +1300)]
Merge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 18 Nov 2013 21:08:45 +0000 (10:08 +1300)]
Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Mon, 18 Nov 2013 08:08:57 +0000 (16:08 +0800)]
Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 18 Nov 2013 07:37:01 +0000 (15:37 +0800)]
Merge branch 'MDL-42880b' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 18 Nov 2013 07:26:52 +0000 (15:26 +0800)]
Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 18 Nov 2013 07:12:56 +0000 (15:12 +0800)]
Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle
Damyon Wiese [Mon, 18 Nov 2013 06:55:18 +0000 (14:55 +0800)]
Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 18 Nov 2013 06:41:06 +0000 (14:41 +0800)]
Merge branch 'MDL-42884_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 18 Nov 2013 06:32:55 +0000 (14:32 +0800)]
Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle
Conflicts:
mod/scorm/db/upgrade.php
Damyon Wiese [Mon, 18 Nov 2013 06:05:17 +0000 (14:05 +0800)]
Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle
Petr Škoda [Wed, 30 Oct 2013 08:50:36 +0000 (09:50 +0100)]
MDL-42612 add support for Russian Ruble in PayPal
Damyon Wiese [Mon, 18 Nov 2013 03:46:40 +0000 (11:46 +0800)]
MDL-42930 Add 2.6.0 upgrade line
Adrian Greeve [Thu, 14 Nov 2013 07:55:00 +0000 (15:55 +0800)]
MDL-42850 administration: Updated bulk user upload errors to be more descriptive.
Dan Marsden [Fri, 8 Nov 2013 00:51:39 +0000 (13:51 +1300)]
MDL-41695 SCORM: allow unlimited decimal places in CMIDecimal
Dan Marsden [Thu, 7 Nov 2013 01:27:25 +0000 (14:27 +1300)]
MDL-40223 SCORM: update scorm->launch param after restore - also check that scorm->launch is valid.
Gareth J Barnard [Sun, 17 Nov 2013 13:33:30 +0000 (13:33 +0000)]
MDL-42852 lib: Blocks disappear in Clean in RTL.
Eloy Lafuente (stronk7) [Sun, 17 Nov 2013 01:32:43 +0000 (02:32 +0100)]
MDL-42929 backup: keep own version & release updated.
Eloy Lafuente (stronk7) [Sat, 16 Nov 2013 22:46:18 +0000 (23:46 +0100)]
weekly back-to-dev release 2.7dev
Eloy Lafuente (stronk7) [Sat, 16 Nov 2013 16:28:07 +0000 (17:28 +0100)]
Moodle release 2.6
Tim Hunt [Fri, 15 Nov 2013 14:41:48 +0000 (14:41 +0000)]
MDL-42880 quiz settings: remove unnecessary disabledif rules.
These rules were causing problems in the case where the form was
sumitted with validation errors. In that case, the During the attempt ->
The attempt checkbox was becoming unset, and hence the other During the
attmept checkboxes became disabled, and the values were not saved.
Thanks to Sam Marshall for suggesting this fix.
Tim Hunt [Wed, 13 Nov 2013 11:34:53 +0000 (11:34 +0000)]
MDL-42865 Make XMLDB foreign key check more robust.
Otherwise, installing one bad add-on can completely break this report.
Tim Hunt [Wed, 13 Nov 2013 11:01:49 +0000 (11:01 +0000)]
MDL-42863 make capabilities overview more fault-tolerant.
Eloy Lafuente (stronk7) [Fri, 15 Nov 2013 15:06:22 +0000 (16:06 +0100)]
Merge branch 'MDL-42926-master' of git://github.com/damyon/moodle
Damyon Wiese [Fri, 15 Nov 2013 14:58:10 +0000 (22:58 +0800)]
MDL-42926 Bootstrap base: Remove 6px spacing between form elements
This was accidentally copied from the css for base. It is only visible when
the form fields are displayed with the label above the field. (less than 1200px).
sam marshall [Tue, 29 Oct 2013 16:47:54 +0000 (16:47 +0000)]
MDL-42582 Availability: Restriction display incorrect for multi-para Labels
When a label has multiple paragraphs, its name (converted to plain text)
contains a line feed. Due to an error in regular expressions that don't
accept the line feed, this caused incorrect display on the course page
when that label is shown as a requirement for accessing another activity.
sam marshall [Thu, 14 Nov 2013 11:52:52 +0000 (11:52 +0000)]
MDL-42905 Backup progress: Pointless line of code should be deleted
Eloy Lafuente (stronk7) [Fri, 15 Nov 2013 12:21:41 +0000 (13:21 +0100)]
Moodle release 2.6rc1
Eloy Lafuente (stronk7) [Fri, 15 Nov 2013 10:18:00 +0000 (11:18 +0100)]
on-demand release 2.6beta+
Eloy Lafuente (stronk7) [Fri, 15 Nov 2013 10:17:55 +0000 (11:17 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Damyon Wiese [Fri, 15 Nov 2013 09:20:57 +0000 (17:20 +0800)]
MDL-42887 Form collapsing CSS fixes.
.fcontainer is not guaranteed to be in the form - we still need something else
for this selector to make it specific enough - so have replaced with #region-main (required).
Also - redid the question edit styles to be specific enough.
Marina Glancy [Fri, 15 Nov 2013 06:27:50 +0000 (17:27 +1100)]
Merge branch 'MDL-42887-master' of git://github.com/damyon/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Thu, 14 Nov 2013 04:17:15 +0000 (12:17 +0800)]
MDL-42887 Forms: Collapse all field elements below their labels on screens less than 1180px
Includes css fixes to make the question type edit screens look OK with this change.
Mark Nelson [Fri, 15 Nov 2013 00:32:35 +0000 (16:32 -0800)]
MDL-42553 core_calendar: third party calendar types can now be uninstalled
Eloy Lafuente (stronk7) [Fri, 15 Nov 2013 01:11:27 +0000 (02:11 +0100)]
Merge branch 'MDL-42447_master' of git://github.com/dmonllao/moodle
David Monllao [Thu, 14 Nov 2013 03:55:03 +0000 (11:55 +0800)]
MDL-42447 performance: New var to add perf. info to redirections
Eloy Lafuente (stronk7) [Fri, 15 Nov 2013 01:04:45 +0000 (02:04 +0100)]
Merge branch 'wip-MDL-42912-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Fri, 15 Nov 2013 00:36:11 +0000 (11:36 +1100)]
MDL-42912 glossary: oracle-compatibility of SQL queries
Eloy Lafuente (stronk7) [Thu, 14 Nov 2013 22:24:20 +0000 (23:24 +0100)]
Merge branch 'MDL-42859-master' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Thu, 14 Nov 2013 22:22:26 +0000 (23:22 +0100)]
Merge branch 'w47_MDL-42860_m26_dbsess' of https://github.com/skodak/moodle
Damyon Wiese [Thu, 14 Nov 2013 09:18:44 +0000 (17:18 +0800)]
Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Aparup Banerjee [Thu, 14 Nov 2013 09:04:09 +0000 (17:04 +0800)]
MDL-42711 theme - css recompiled after RTL fixes.
Barbara Ramiro [Thu, 14 Nov 2013 08:53:29 +0000 (16:53 +0800)]
MDL-42711 RTL fixed to chat.less
Aparup Banerjee [Wed, 13 Nov 2013 09:07:39 +0000 (17:07 +0800)]
MDL-42711 added RTL styles to chat.less .
Jerome Mouneyrac [Thu, 14 Nov 2013 07:16:33 +0000 (15:16 +0800)]
MDL-42859 filepicker: fix dropbox logout warning layout
Frederic Massart [Wed, 13 Nov 2013 09:18:26 +0000 (17:18 +0800)]
MDL-42853 course: Fix edit title icon margin on RTL
Frederic Massart [Wed, 13 Nov 2013 09:06:18 +0000 (17:06 +0800)]
MDL-42853 frontpage: RTL alignment to match LTR
AMOS bot [Thu, 14 Nov 2013 00:45:19 +0000 (00:45 +0000)]
Automatically generated installer lang files
Mark Nelson [Thu, 14 Nov 2013 00:04:34 +0000 (16:04 -0800)]
MDL-42884 core_user: fixed issue when deleting users with invalid emails throws invalidusername exception
Eloy Lafuente (stronk7) [Wed, 13 Nov 2013 22:15:23 +0000 (23:15 +0100)]
Merge branch 'MDL-42768-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 13 Nov 2013 22:09:09 +0000 (23:09 +0100)]
Merge branch 'MDL-42866-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 13 Nov 2013 13:46:44 +0000 (21:46 +0800)]
MDL-42866 EditPDF: Fix bad foreign key in install.xml
Thanks Tim for reporting this!
Petr Škoda [Wed, 13 Nov 2013 09:54:15 +0000 (10:54 +0100)]
MDL-42860 improve db session help string
Aparup Banerjee [Wed, 13 Nov 2013 09:02:54 +0000 (17:02 +0800)]
MDL-42711 added RTL styles to improvements.
Damyon Wiese [Wed, 13 Nov 2013 08:57:34 +0000 (16:57 +0800)]
Merge branch 'MDL-40728-master-2' of git://github.com/mouneyrac/moodle
Jerome Mouneyrac [Wed, 13 Nov 2013 08:34:43 +0000 (16:34 +0800)]
MDL-40728 courseupload: add missing help icons
Ankit Agarwal [Wed, 13 Nov 2013 03:21:58 +0000 (11:21 +0800)]
MDL-41316 tool_spamcleaner: Fix sql queries
AS keyword is not allowed in sql qeries for table alias as Oracle doesn't support it
Thanks to Sara Cenni for suggesting the patch
Aparup Banerjee [Wed, 13 Nov 2013 08:22:34 +0000 (16:22 +0800)]
MDL-42711 made all theme menu strings in chat popup translatable
Mark Nelson [Wed, 13 Nov 2013 08:20:28 +0000 (00:20 -0800)]
MDL-42100 tool_capability: fixed incorrect links
Damyon Wiese [Wed, 13 Nov 2013 07:57:07 +0000 (15:57 +0800)]
Merge branch 'wip-MDL-42833-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 13 Nov 2013 07:24:06 +0000 (18:24 +1100)]
Merge branch 'MDL-42849-master' of git://github.com/andrewnicols/moodle
Frederic Massart [Wed, 13 Nov 2013 03:22:09 +0000 (11:22 +0800)]
MDL-42768 restore: Use sql_compare_text instead for text comparison
Damyon Wiese [Wed, 13 Nov 2013 06:42:32 +0000 (14:42 +0800)]
Merge branch 'MDL-42705-master-nomerge' of git://github.com/mouneyrac/moodle
Aparup Banerjee [Wed, 13 Nov 2013 05:58:51 +0000 (13:58 +0800)]
MDL-42711 consolidated responsive styles into responsive.less
Damyon Wiese [Wed, 13 Nov 2013 05:43:52 +0000 (13:43 +0800)]
Merge branch 'MDL-42598' of git://github.com/timhunt/moodle
Barbara Ramiro [Wed, 13 Nov 2013 05:15:50 +0000 (13:15 +0800)]
MDL-42711 theme bootstrapbase chat.less :Override max-width for chat user picture on chrome and safari
Andrew Nicols [Wed, 13 Nov 2013 01:55:32 +0000 (09:55 +0800)]
MDL-42849 ActionMenu: Tweak selector for filler and padding for edit menu
Damyon Wiese [Wed, 13 Nov 2013 05:26:36 +0000 (13:26 +0800)]
MDL-42684 TinyMCE: Fix bootstrap CSS for putting text editors below labels.
Damyon Wiese [Wed, 13 Nov 2013 05:10:42 +0000 (13:10 +0800)]
Merge branch 'MDL-33536-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 12 Nov 2013 16:23:46 +0000 (00:23 +0800)]
MDL-42684 Forms: Display text editors and file pickers with the label above the field.
This includes the front page description admin field.
Marina Glancy [Wed, 13 Nov 2013 04:43:44 +0000 (15:43 +1100)]
Merge branch 'wip-mdl-42799' of https://github.com/rajeshtaneja/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Damyon Wiese [Wed, 13 Nov 2013 03:50:36 +0000 (11:50 +0800)]
Merge branch 'MDL-41797' of git://github.com/rwijaya/moodle
Aparup Banerjee [Wed, 13 Nov 2013 03:25:12 +0000 (11:25 +0800)]
MDL-42711 theme : final css compiled.
Aparup Banerjee [Wed, 13 Nov 2013 03:20:14 +0000 (11:20 +0800)]
MDL-42711 theme port from LM: fixed up mod_feedback analysis bar heights from auto to 5px
Aparup Banerjee [Wed, 13 Nov 2013 03:07:03 +0000 (11:07 +0800)]
MDL-42711 theme port from LM: Info, Date and Author on the latest News block reordered
This also adds some simple clean style padding fixes for a better look.
Marina Glancy [Wed, 13 Nov 2013 02:28:46 +0000 (13:28 +1100)]
Merge branch 'MDL-42827-master' of git://github.com/andrewnicols/moodle
Barbara Ramiro [Tue, 12 Nov 2013 11:45:02 +0000 (19:45 +0800)]
MDL-42711 theme port from LM: Chat for Clean theme - minimal styling
(this converts colours to suit clean theme more)
Aparup Banerjee [Wed, 13 Nov 2013 02:13:11 +0000 (10:13 +0800)]
MDL-42711 theme port from LM: padded date and footer in upcoming events block (part of commit for MDLSITE-2427)
Damyon Wiese [Wed, 13 Nov 2013 01:59:44 +0000 (09:59 +0800)]
MDL-33536 Navigation: Add missing require_once for safety.
rwijaya [Wed, 13 Nov 2013 01:52:32 +0000 (09:52 +0800)]
MDL-41797 external tools module: fix heading levels.
AMOS BEGIN
CPY [submissions, core_grades], [submissions, mod_lti]
AMOS END
Aparup Banerjee [Wed, 13 Nov 2013 01:51:09 +0000 (09:51 +0800)]
Merge branch 'MDL-42711-master' of github.com:nebgor/moodle into MDL-42711-master
Aparup Banerjee [Wed, 13 Nov 2013 01:48:46 +0000 (17:48 -0800)]
Merge pull request #3 from mudrd8mz/MDL-42711-lmnet-clean-theme-backport
MDL-42711 LMNET clean theme backport
David Mudrák [Wed, 13 Nov 2013 01:32:05 +0000 (02:32 +0100)]
MDL-42711 theme port from LM: vertical alignment of the course icon
When the course name spans over multiple lines, vertically centered icon does
not look nice (or at least our beloved Benevolent Dictator for Life does not
like it ;-). This hack alignes the icon vertically with the first line of the
course name all the time (or at least it tries to).
David Mudrák [Wed, 13 Nov 2013 01:12:45 +0000 (02:12 +0100)]
MDL-42711 theme port from LM: let the course name use the full line width
Marina Glancy [Wed, 13 Nov 2013 01:03:46 +0000 (12:03 +1100)]
MDL-42833 course: correction to navigation path in management interface
David Mudrák [Wed, 13 Nov 2013 01:03:02 +0000 (02:03 +0100)]
MDL-42711 theme port from LM: improve RSS client block styling
This significantly increases the readability of items in the block.
Eloy Lafuente (stronk7) [Wed, 13 Nov 2013 00:55:52 +0000 (01:55 +0100)]
Merge branch '42832-26' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
David Mudrák [Wed, 13 Nov 2013 00:48:05 +0000 (01:48 +0100)]
MDL-42711 theme port from LM: forum layout on small screen devices
This is a backport of MDLSITE-2445. Wrapping the 'Started by' and 'Last post'
texts helps. On smaller device, these two get smaller font too. This is far
from optimal but better than the current (default) behaviour.
AMOS bot [Wed, 13 Nov 2013 00:47:29 +0000 (00:47 +0000)]
Automatically generated installer lang files
David Mudrák [Wed, 13 Nov 2013 00:26:21 +0000 (01:26 +0100)]
MDL-42711 theme port from LM: survey module styling
Backport some Survey module styling from the standard theme to improve the
usability of the interface. The style is originally defined in
theme/standard/styles/modules.css
David Mudrák [Wed, 13 Nov 2013 00:08:35 +0000 (01:08 +0100)]
MDL-42711 theme port from LM: improve the initial bar display